Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use OpenType +ruby feature for ruby, toggle with setting #1891

Merged
merged 4 commits into from
Nov 21, 2023
Merged

Use OpenType +ruby feature for ruby, toggle with setting #1891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
624e3a8
feat(packages)!: Use OpenType +ruby feature for ruby, toggle with set…
alerque Oct 11, 2023
1e603fc
Merge branch 'develop' into ot-tate
alerque Nov 21, 2023
433fcdc
test(packages): Update tests to reflect lack of +ruby feature in font
alerque Nov 21, 2023
c6559b5
test(packages): Add test covering OT +ruby feature
alerque Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Makefile-fonts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ TESTFONTFILES = $(DOCSFONTFILES)
TESTFONTFILES += Amiri-Regular.ttf
TESTFONTFILES += AmiriQuran.ttf
TESTFONTFILES += AwamiNastaliq-Regular.ttf
TESTFONTFILES += FRBTaiwaneseKana.otf
TESTFONTFILES += LibertinusSans-Bold.otf
TESTFONTFILES += NotoNaskhArabic-Regular.ttf
TESTFONTFILES += NotoSansKannada-Regular.ttf
Expand Down Expand Up @@ -73,6 +74,10 @@ notobase = $(shell echo $(notdir $1) | sed -e 's/-.*//')
.fonts/TwemojiMozilla.ttf: | .fonts
$(CURL) -fsSL https://github.com/mozilla/twemoji-colr/releases/download/v0.5.1/$(notdir $@) -o $@

.fonts/FRBTaiwaneseKana.otf: | .fonts
: $(CURL) -fsSL https://github.com/ctrlcctrlv/FRBTaiwaneseKana/releases/download/v1.1/$(notdir $@) -o $@
$(CURL) -fsSL https://raw.githubusercontent.com/ctrlcctrlv/FRBTaiwaneseKana/5c367e9ee5aefd54b5c9c9e996705f0561fe3d15/$(notdir $@) -o $@

# Tell make how to download font file bundles (when not downloadable individually)

.sources/AwamiNastaliq-2.200.zip: | .sources
Expand Down
13 changes: 12 additions & 1 deletion packages/ruby/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,23 @@ function package.declareSettings (_)
help = "Glue added between consecutive Latin ruby"
})

SILE.settings:declare({
parameter = "ruby.opentype",
type = "boolean",
default = true,
help = "Use OpenType tate feature instead of of a bold weight"
})

end

function package:registerCommands ()

self:registerCommand("ruby:font", function (_, _)
SILE.call("font", { size = "0.6zw", weight = 800 })
if SILE.settings:get("ruby.opentype") then
SILE.call("font", { size = "0.6zw", features = "+ruby" })
else
SILE.call("font", { size = "0.6zw", weight = 700 })
end
end)

self:registerCommand("ruby", function (options, content)
Expand Down
17 changes: 17 additions & 0 deletions tests/bug-1047.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
Set paper size 297.6377985 419.5275636
Begin page
Mx 24.7039
My 42.3452
Set font FRB Taiwanese Kana;24;400;;normal;+ruby;;LTR
T 172 w=24.0000 (タ)
Mx 48.7039
T 145 w=24.0000 (イ)
Mx 72.7039
T 122 w=12.0000 (𚿳)
Mx 24.7039
My 82.3452
Mx 34.7039
Set font Noto Serif CJK TC;40;400;;normal;;;LTR
T 34119 w=40.0000 (臺)
End page
Finish
10 changes: 10 additions & 0 deletions tests/bug-1047.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
\begin[class=jplain,papersize=a6]{document}
\nofolios
\neverindent
\language[main=zh]
\use[module=packages.ruby]
\font:remove-fallback
\font:add-fallback[family=Noto Serif CJK TC]
\font[family=FRB Taiwanese Kana,size=40pt]
\ruby[reading=タイ𚿳]{臺}
\end{document}
2 changes: 1 addition & 1 deletion tests/bug-524.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1605,7 +1605,7 @@ Mx 59.5278
T 1506 w=10.0000 (は)
Mx 51.7739
My 129.9592
Set font Noto Sans CJK JP;6;800;;normal;;;LTR
Set font Noto Sans CJK JP;6;700;;normal;;;LTR
T 56 w=5.2680 (W)
Mx 49.4079
My 139.9592
Expand Down
1 change: 1 addition & 0 deletions tests/bug-524.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
\neverindent
\show-hanmen
\use[module=packages.ruby]
\set[parameter=ruby.opentype,value=false]
私は

{}私は
Expand Down
12 changes: 6 additions & 6 deletions tests/bug-525.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Set paper size 297.6377985 419.5275636
Begin page
Mx 24.7039
My 46.9652
Set font Noto Sans CJK JP;6;800;;normal;;;LTR
Set font Noto Sans CJK JP;6;700;;normal;;;LTR
T 20220 w=6.0000 (日)
Mx 30.8207
T 20758 w=6.0000 (本)
Expand All @@ -15,7 +15,7 @@ Set font Noto Sans CJK JP;10;400;;normal;;;LTR
T 29078 w=10.0000 (私)
Mx 42.9375
My 46.9652
Set font Noto Sans CJK JP;6;800;;normal;;;LTR
Set font Noto Sans CJK JP;6;700;;normal;;;LTR
T 45 w=3.2580 (L)
Mx 46.3123
Mx 3.2940
Expand All @@ -33,7 +33,7 @@ Set font Noto Sans CJK JP;10;400;;normal;;;LTR
T 29078 w=10.0000 (私)
Mx 24.7039
My 63.9652
Set font Noto Sans CJK JP;6;800;;normal;;;LTR
Set font Noto Sans CJK JP;6;700;;normal;;;LTR
T 45 w=3.2580 (L)
Mx 28.0787
Mx 3.2940
Expand All @@ -51,7 +51,7 @@ Set font Noto Sans CJK JP;10;400;;normal;;;LTR
T 29078 w=10.0000 (私)
Mx 39.3011
My 63.9652
Set font Noto Sans CJK JP;6;800;;normal;;;LTR
Set font Noto Sans CJK JP;6;700;;normal;;;LTR
T 20220 w=6.0000 (日)
Mx 45.4179
T 20758 w=6.0000 (本)
Expand All @@ -64,7 +64,7 @@ Set font Noto Sans CJK JP;10;400;;normal;;;LTR
T 29078 w=10.0000 (私)
Mx 24.7039
My 80.9652
Set font Noto Sans CJK JP;6;800;;normal;;;LTR
Set font Noto Sans CJK JP;6;700;;normal;;;LTR
T 45 w=3.2580 (L)
Mx 28.0790
Mx 3.2940
Expand All @@ -82,7 +82,7 @@ Set font Noto Sans CJK JP;10;400;;normal;;;LTR
T 29078 w=10.0000 (私)
Mx 41.8022
My 80.9652
Set font Noto Sans CJK JP;6;800;;normal;;;LTR
Set font Noto Sans CJK JP;6;700;;normal;;;LTR
T 45 w=3.2580 (L)
Mx 45.1773
Mx 3.2940
Expand Down
1 change: 1 addition & 0 deletions tests/bug-525.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
\nofolios
\neverindent
\use[module=packages.ruby]
\set[parameter=ruby.opentype,value=false]
\ruby[reading=日本語]{私}\ruby[reading=Latin]{私}

\ruby[reading=Latin]{私}\ruby[reading=日本語]{私}
Expand Down
12 changes: 6 additions & 6 deletions tests/bug-926.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Set paper size 297.6377985 419.5275636
Begin page
Mx 24.7039
My 46.9652
Set font Noto Sans CJK JP;6;800;;normal;;;LTR
Set font Noto Sans CJK JP;6;700;;normal;;;LTR
T 20220 w=6.0000 (日)
Mx 30.7039
T 20758 w=6.0000 (本)
Expand All @@ -15,7 +15,7 @@ Set font Noto Sans CJK JP;10;400;;normal;;;LTR
T 29078 w=10.0000 (私)
Mx 42.7039
My 46.9652
Set font Noto Sans CJK JP;6;800;;normal;;;LTR
Set font Noto Sans CJK JP;6;700;;normal;;;LTR
Mx 3.2580
Mx 3.2940
Mx 2.2620
Expand All @@ -29,7 +29,7 @@ Set font Noto Sans CJK JP;10;400;;normal;;;LTR
T 29078 w=10.0000 (私)
Mx 24.7039
My 63.9652
Set font Noto Sans CJK JP;6;800;;normal;;;LTR
Set font Noto Sans CJK JP;6;700;;normal;;;LTR
Mx 3.2580
Mx 3.2940
Mx 2.2620
Expand All @@ -43,7 +43,7 @@ Set font Noto Sans CJK JP;10;400;;normal;;;LTR
T 29078 w=10.0000 (私)
Mx 38.8339
My 63.9652
Set font Noto Sans CJK JP;6;800;;normal;;;LTR
Set font Noto Sans CJK JP;6;700;;normal;;;LTR
T 20220 w=6.0000 (日)
Mx 44.8339
T 20758 w=6.0000 (本)
Expand All @@ -56,7 +56,7 @@ Set font Noto Sans CJK JP;10;400;;normal;;;LTR
T 29078 w=10.0000 (私)
Mx 24.7039
My 80.9652
Set font Noto Sans CJK JP;6;800;;normal;;;LTR
Set font Noto Sans CJK JP;6;700;;normal;;;LTR
Mx 3.2580
Mx 3.2940
Mx 2.2620
Expand All @@ -70,7 +70,7 @@ Set font Noto Sans CJK JP;10;400;;normal;;;LTR
T 29078 w=10.0000 (私)
Mx 41.3339
My 80.9652
Set font Noto Sans CJK JP;6;800;;normal;;;LTR
Set font Noto Sans CJK JP;6;700;;normal;;;LTR
Mx 3.2580
Mx 3.2940
Mx 2.2620
Expand Down
1 change: 1 addition & 0 deletions tests/bug-926.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
\neverindent
\language[main=en]
\use[module=packages.ruby]
\set[parameter=ruby.opentype,value=false]
\ruby[reading=日本語]{私}\ruby[reading=Latin]{私}

\ruby[reading=Latin]{私}\ruby[reading=日本語]{私}
Expand Down
Loading