fix(packages): Ruby class should not affect document language

sile-typesetter · Jul 8, 2020 · c94f3b6 · c94f3b6
1 parent 0a9bc4a
commit c94f3b6
Show file tree

Hide file tree

Showing 3 changed files with 77 additions and 1 deletion.
diff --git a/packages/ruby.lua b/packages/ruby.lua
@@ -1,5 +1,5 @@
 -- Japaneese language support defines units which are useful here
-SILE.call("language", { main = "ja" }, {})
+SILE.languageSupport.loadLanguage("ja")
 
 SILE.registerCommand("ruby:font", function (_, _)
   SILE.call("font", { size = "0.6zw", weight = 800 })

diff --git a/tests/bug-926.expected b/tests/bug-926.expected
@@ -0,0 +1,62 @@
+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
+T	20220	(日)
+Mx 	30.7039
+T	20758	(本)
+Mx 	36.7039
+T	37860	(語)
+Mx 	24.7039
+My 	56.9652
+Mx 	28.7039
+Set font 	Noto Sans CJK JP;10;400;;normal;;LTR
+T	29078	(私)
+Mx 	42.7039
+My 	46.9652
+Set font 	Noto Sans CJK JP;6;800;;normal;;LTR
+T	45 66 85 74 79	(Latin)
+My 	56.9652
+Mx 	44.7689
+Set font 	Noto Sans CJK JP;10;400;;normal;;LTR
+T	29078	(私)
+Mx 	24.7039
+My 	63.9652
+Set font 	Noto Sans CJK JP;6;800;;normal;;LTR
+T	45 66 85 74 79	(Latin)
+My 	73.9652
+Mx 	26.7689
+Set font 	Noto Sans CJK JP;10;400;;normal;;LTR
+T	29078	(私)
+Mx 	38.8339
+My 	63.9652
+Set font 	Noto Sans CJK JP;6;800;;normal;;LTR
+T	20220	(日)
+Mx 	44.8339
+T	20758	(本)
+Mx 	50.8339
+T	37860	(語)
+Mx 	38.8339
+My 	73.9652
+Mx 	42.8339
+Set font 	Noto Sans CJK JP;10;400;;normal;;LTR
+T	29078	(私)
+Mx 	24.7039
+My 	80.9652
+Set font 	Noto Sans CJK JP;6;800;;normal;;LTR
+T	45 66 85 74 79	(Latin)
+My 	90.9652
+Mx 	26.7689
+Set font 	Noto Sans CJK JP;10;400;;normal;;LTR
+T	29078	(私)
+Mx 	41.3339
+My 	80.9652
+Set font 	Noto Sans CJK JP;6;800;;normal;;LTR
+T	45 66 85 74 79	(Latin)
+My 	90.9652
+Mx 	43.3989
+Set font 	Noto Sans CJK JP;10;400;;normal;;LTR
+T	29078	(私)
+End page
+Finish
diff --git a/tests/bug-926.sil b/tests/bug-926.sil
@@ -0,0 +1,14 @@
+\begin[class=jplain,papersize=a6]{document}
+\nofolios
+\set[parameter=document.parindent,value=0pt]
+\font[family=Noto Sans CJK JP]
+\language[main=en]
+\script[src=packages/ruby]
+\ruby[reading=日本語]{私}\ruby[reading=Latin]{私}
+
+\ruby[reading=Latin]{私}\ruby[reading=日本語]{私}
+
+\ruby[reading=Latin]{私}\ruby[reading=Latin]{私}
+\script{assert(SILE.settings.get("document.language") == "en")}
+
+\end{document}