Merge pull request #1932 from alerque/default-parindent

sile-typesetter · Jan 10, 2024 · 3ca0244 · 3ca0244
2 parents 28738fe + 0164b8d
commit 3ca0244
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 9 deletions.
diff --git a/core/settings.lua b/core/settings.lua
@@ -21,7 +21,7 @@ function settings:_init()
   self:declare({
     parameter = "document.parindent",
     type = "glue",
-    default = SILE.nodefactory.glue("20pt"),
+    default = SILE.nodefactory.glue("1bs"),
     help = "Glue at start of paragraph"
   })
 

diff --git a/packages/retrograde/init.lua b/packages/retrograde/init.lua
@@ -14,6 +14,7 @@ end
 package.default_settings = {
    ["0.15.0"] = {
       ["shaper.spaceenlargementfactor"] = 1.2,
+      ["document.parindent"] = "20pt",
    },
    ["0.9.5"] = {
       ["font.family"] = "Gentium Basic",

diff --git a/tests/absmin.expected b/tests/absmin.expected
@@ -1,6 +1,6 @@
 Set paper size 	595.275597	841.8897729
 Begin page
-Mx 	49.7638
+Mx 	41.7638
 My 	48.3445
 Set font 	Gentium Plus;10;400;;normal;;;LTR
 T	87 72 86 87 w=15.3662	(test)

diff --git a/tests/bug-1699.sil b/tests/bug-1699.sil
@@ -1,4 +1,5 @@
 \begin[class=plain,papersize=a7]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \nofolios
 % Both "bar" entries should have parindent applied
 \noindent

diff --git a/tests/bug-244.expected b/tests/bug-244.expected
@@ -1,12 +1,12 @@
 Set paper size 	595.275597	841.8897729
 Begin page
 Mx 	541.9479
-My 	117.7637
+My 	117.7638
 Set font 	Noto Sans CJK JP;10;400;;normal;;;LTR
 T	41 70 77 77 80 w=24.5800	(Hello)
-My 	145.0785
+My 	144.6306
 T	88 80 83 77 69 w=26.9700	(world)
-My 	172.0485
+My 	171.6006
 T	15 w=2.7800	(.)
 Mx 	298.1329
 My 	781.8786

diff --git a/tests/bug-244.sil b/tests/bug-244.sil
@@ -1,4 +1,3 @@
 \begin[papersize=a4,class=jplain,layout=tate]{document}
-\use[module=packages.retrograde,target=v0.15.0]
 \latin-in-tate{Hello world.}
 \end{document}
diff --git a/tests/bug-522.sil b/tests/bug-522.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a5,class=book]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \show-multilevel-counter[id=foo]
 
 \increment-multilevel-counter[id=foo,level=3]
@@ -10,4 +11,4 @@
 \increment-multilevel-counter[id=foo,level=2]
 \show-multilevel-counter[id=foo]
 
-\end{document}
+\end{document}
diff --git a/tests/bug-892.sil b/tests/bug-892.sil
@@ -1,4 +1,5 @@
 \begin{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \define[command=micro]{}
 \define[command=macro]{\process}
 \begin{script}

diff --git a/tests/crash.sil b/tests/crash.sil
@@ -1,3 +1,4 @@
 \begin[papersize=a5]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 verylongwordverylongwordverylongwordverylongwordveryverylongwordveryverylongwordveryverylongwordveryverylongwordveryverylongwordveryverylongwordveryverylongwordverylongwordverylongwordverylongwordverylongwordverylongwordverylongwordverylongwordverylongwordverylongwordvery
 \end{document}
diff --git a/tests/hyph-except.sil b/tests/hyph-except.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a6]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \nofolios
 \language[main=tr]
 \script{SILE.typesetter:typeset(SILE.showHyphenationPoints("rab'bin", "tr"))}

diff --git a/tests/italic.sil b/tests/italic.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a6]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \nofolios
 \font[style=italic]{Italic?}
 \end{document}
diff --git a/tests/parallel.sil b/tests/parallel.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a6]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \nofolios
 \begin{script}
 local class = SILE.documentState.documentClass

diff --git a/tests/vertical.expected b/tests/vertical.expected
@@ -4,7 +4,7 @@ Mx 	528.4079
 My 	107.6592
 Set font 	Noto Sans CJK JP;24;400;;normal;;;TTB
 T	20220 w=24.0000	(日)
-My 	131.9203
+My 	131.9210
 T	20758 w=24.0000	(本)
 End page
 Finish
diff --git a/tests/vertical.sil b/tests/vertical.sil
@@ -1,5 +1,4 @@
 \begin[class=jplain,layout=tate]{document}
-\use[module=packages.retrograde,target=v0.15.0]
 \nofolios
 % Note: differences between Noto font versions make adding more characters to
 % this test brittle. For example 日本は昔からruns into trouble when the height