Merge pull request #2040 from alerque/font-fallback

packages/font-fallback/init.lua

@@ -9,7 +9,7 @@ function package:registerCommands ()
    self:registerCommand("font:clear-fallbacks", function ()
       if SILE.shaper._name == "fallback" and lastShaperType then
          SU.debug("font-fallback", "Clearing fallbacks, switching from fallback enabled back to previous shaper")
-         SILE.shapers:clearFallbacks()
+         SILE.shaper:clearFallbacks()
          SILE.typesetter:leaveHmode(true)
          SILE.shapers[lastShaperType]:cast(SILE.shaper)
          lastShaperType = nil

tests/font-fallback-empty.expected

@@ -1,8 +1,13 @@
 Set paper size 	297.6377985	419.5275636
 Begin page
 Mx 	14.8819
-My 	29.7654
+My 	28.6664
+Set font 	Noto Serif CJK JP;10;400;;normal;;;LTR
+T	1542 w=10.0000	(ん)
+My 	40.6664
 Set font 	Gentium Plus;10;400;;normal;;;LTR
 T	0 w=6.8359	(ん)
+My 	52.6664
+T	0 w=6.8359	(ん)
 End page
 Finish

tests/font-fallback-empty.sil

@@ -1,8 +1,19 @@
 \begin[papersize=a6]{document}
 \nofolios
-\noindent
+\neverindent
 \use[module=packages.font-fallback]
+
+% Adding Noto as a fallback should make this character render
 \font:add-fallback[family=Noto Serif CJK JP]
+ん
+
+% But removing it should give us tofu
 \font:remove-fallback
 ん
+
+% Also clearing all fallbacks should result in tofu
+\font:add-fallback[family=Noto Serif CJK JP]
+\font:clear-fallbacks
+ん
+
 \end{document}