Merge pull request #1933 from alerque/default-space

sile-typesetter · Dec 16, 2023 · ad5f09a · ad5f09a
2 parents cd9ba57 + e5b42ae
commit ad5f09a
Show file tree

Hide file tree

Showing 117 changed files with 133 additions and 14 deletions.
diff --git a/packages/retrograde/init.lua b/packages/retrograde/init.lua
@@ -12,6 +12,9 @@ end
 
 -- Default settings that have gone out of fashion
 package.default_settings = {
+   ["0.15.0"] = {
+      ["shaper.spaceenlargementfactor"] = 1.2,
+   },
 }
 
 function package:_init (options)

diff --git a/shapers/base.lua b/shapers/base.lua
@@ -5,7 +5,7 @@
 -- end
 
 SILE.settings:declare({ parameter = "shaper.variablespaces", type = "boolean", default = true })
-SILE.settings:declare({ parameter = "shaper.spaceenlargementfactor", type = "number or integer", default = 1.2 })
+SILE.settings:declare({ parameter = "shaper.spaceenlargementfactor", type = "number or integer", default = 1 })
 SILE.settings:declare({ parameter = "shaper.spacestretchfactor", type = "number or integer", default = 1/2 })
 SILE.settings:declare({ parameter = "shaper.spaceshrinkfactor", type = "number or integer", default = 1/3 })
 

diff --git a/tests/alignment.sil b/tests/alignment.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a6]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \nofolios
 \use[module=packages.lorem]
 \font[family=Libertinus Serif]

diff --git a/tests/amharic.sil b/tests/amharic.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a5]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \font[family=Noto Sans Ethiopic,language=am]
 የሰው፡ልጅ፡ሁሉ፡ሲወለድ፡ነጻና፡በክብርና፡በመብትም፡እኩልነት፡ያለው፡ነው።፡የተፈጥሮ፡ማስተዋልና፡ሕሊና፡ስላለው፡አንዱ፡ሌላውን፡በወንድማማችነት፡መንፈስ፡መመልከት፡ይገባዋል።
 

diff --git a/tests/arabic-scripts.sil b/tests/arabic-scripts.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a6]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \nofolios
 \use[module=packages.bidi]
 \font[family=LateefGR,size=16pt,language=en]

diff --git a/tests/bibtex.sil b/tests/bibtex.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a6]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \neverindent
 \nofolios
 \use[module=packages.bibtex]

diff --git a/tests/bidi.sil b/tests/bidi.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a5]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \font[family=SBL Hebrew,language=he]
 \font[size=25pt]
 \set[parameter=document.baselineskip,value=29pt]

diff --git a/tests/bug-1044.sil b/tests/bug-1044.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a6]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \nofolios
 \neverindent
 \font[family=Libertinus Serif]{Ta of}

diff --git a/tests/bug-1101.sil b/tests/bug-1101.sil
@@ -1,4 +1,5 @@
 \begin[class=jplain,layout=tate,papersize=a4]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \neverindent
 \nofolios
 

diff --git a/tests/bug-117.sil b/tests/bug-117.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a5]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 %nice script from SILE book
 \begin{script}
 for i=1,10 do

diff --git a/tests/bug-1259.sil b/tests/bug-1259.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a5]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \neverindent
 \nofolios
 \use[module=packages.rules]

diff --git a/tests/bug-1280.sil b/tests/bug-1280.sil
@@ -1,4 +1,5 @@
 \begin[papersize=15cm x 6cm]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \font[filename=.fonts/NotoSerifCJK-Regular.ttc]
 \nofolios
 \neverindent

diff --git a/tests/bug-1297-hyph-fr-ca.sil b/tests/bug-1297-hyph-fr-ca.sil
@@ -1,4 +1,5 @@
 \begin[papersize=6in x 9in]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \nofolios
 \language[main=fr]
 

diff --git a/tests/bug-1317.sil b/tests/bug-1317.sil
@@ -1,4 +1,5 @@
 \begin[direction=RTL,papersize=a7]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \font[family=Amiri,size=30pt]
 \nofolios
 \neverindent

diff --git a/tests/bug-1320.sil b/tests/bug-1320.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a6]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \neverindent
 \nofolios
 \use[module=packages.rules]

diff --git a/tests/bug-1343-dotfill-stretch.sil b/tests/bug-1343-dotfill-stretch.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a5]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \nofolios
 \use[module=packages.leaders]
 \use[module=packages.lorem]

diff --git a/tests/bug-1359.sil b/tests/bug-1359.sil
@@ -1,4 +1,5 @@
 \begin[papersize=6in x 9in]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \nofolios
 \neverindent
 \language[main=fr]

diff --git a/tests/bug-1362.sil b/tests/bug-1362.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a5]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \neverindent
 \nofolios
 \language[main=en]

diff --git a/tests/bug-1430.sil b/tests/bug-1430.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a6]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \neverindent
 \nofolios
 \use[module=packages.grid,spacing=50pt]

diff --git a/tests/bug-1495-inline-math-layout.sil b/tests/bug-1495-inline-math-layout.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a6]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \nofolios
 \neverindent
 \use[module=packages.math]

diff --git a/tests/bug-1580.sil b/tests/bug-1580.sil
@@ -1,4 +1,5 @@
 \begin[class=plain,papersize=a7]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \neverindent
 \nofolios
 \use[module=packages.masters]

diff --git a/tests/bug-162.sil b/tests/bug-162.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a5]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 Both lines below should end in a period.
 
 \font[language=cs]

diff --git a/tests/bug-1647.sil b/tests/bug-1647.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a7]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \neverindent
 \nofolios
 \set[parameter=document.parskip, value=50pt]

diff --git a/tests/bug-1674.sil b/tests/bug-1674.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a6]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \neverindent
 \nofolios
 \script{SILE.processString("Foo \\em{bar} \\em{baz}", "sil")}

diff --git a/tests/bug-1708.sil b/tests/bug-1708.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a7,class=book]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \neverindent
 \nofolios
 \set[parameter=document.letterspaceglue, value=5pt]
@@ -9,4 +10,4 @@ Lorem ipsum\footnote{test}
 
 Lorem ipsum% Should still have letterspacing at 5pt
 
-\end{document}
+\end{document}
diff --git a/tests/bug-192.sil b/tests/bug-192.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a6]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \nofolios
 \font[family=Noto Naskh Arabic,language=urd,size=18pt]
 \hbox\skip[height=95%fh]

diff --git a/tests/bug-200.sil b/tests/bug-200.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a6]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \nofolios
 \font[family=Gentium Plus,size=16pt,language=en]
 \begin{raggedright}

diff --git a/tests/bug-226.sil b/tests/bug-226.sil
@@ -1,4 +1,5 @@
 \begin{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \hfill Filler content here: Par 1 (One)
 
 \hfill Par 2 (Two)
@@ -8,4 +9,4 @@
 \hfill Out,
 
 \hfill Caleb Maclennan
-\end{document}
+\end{document}
diff --git a/tests/bug-241.sil b/tests/bug-241.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a6]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \nofolios
 \font[family=Gentium Plus,size=9pt]
 \center{TITILE\break{}Then vfill to logo\vfill{}<logo>\par\break}

diff --git a/tests/bug-243.sil b/tests/bug-243.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a5]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \nofolios
 \use[module=packages.leaders]
 \font[size=50pt]

diff --git a/tests/bug-244.sil b/tests/bug-244.sil
@@ -1,3 +1,4 @@
 \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-252.sil b/tests/bug-252.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a7,class=book]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \use[module=packages.frametricks]
 \use[module=packages.lorem]
 This is a test\footnote{What happens to frames?}.

diff --git a/tests/bug-252a.sil b/tests/bug-252a.sil
@@ -1,7 +1,8 @@
 \begin[papersize=a7,class=book]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \use[module=packages.lorem]
 \use[module=packages.rebox]
 \footnote:separator{\skip[height=5pt]}
 \define[command=deepbox]{\rebox[depth=60pt,height=10pt]{x}}
 This is a test\footnote{\deepbox}.
-\end{document}
+\end{document}
diff --git a/tests/bug-254.sil b/tests/bug-254.sil
@@ -1,9 +1,10 @@
 \begin[papersize=a5]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \raggedright{
 \font[weight=600]{This} is a sample of bogus\break
 extra space.
 
 \font[weight=600]{This} does not have\break
 {}extra space.
 }
-\end{document}
+\end{document}
diff --git a/tests/bug-255.sil b/tests/bug-255.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a6]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \use[module=packages.frametricks]
 \script{
   SILE.registerCommand("donothing", function (options, content)

diff --git a/tests/bug-255b.sil b/tests/bug-255b.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a6]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \use[module=packages.frametricks]
 \script{
 SILE.registerCommand("donothing", function(o,c)

diff --git a/tests/bug-262.sil b/tests/bug-262.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a5]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \nofolios
 \use[module=packages.lorem]
 \hbox

diff --git a/tests/bug-264.sil b/tests/bug-264.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a7,class=book]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \nofolios
 Footnote\skip[height=170pt plus 50pt]
 marker.\footnote{Same page\hfill\break as marker?}

diff --git a/tests/bug-264b.sil b/tests/bug-264b.sil
@@ -1,6 +1,7 @@
 \begin[papersize=a5,class=book]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 % Note: The failure case for this involves an infinite loop when it
-% erroniously matched penalty types that aren�t actually page breaks
+% erroneously matched penalty types that aren't actually page breaks
 \use[module=packages.linespacing]
 \set[parameter=linespacing.method,value=fit-font]
 \set[parameter=linespacing.fit-font.extra-space,value=15pt plus 0.5pt minus 0.5pt]

diff --git a/tests/bug-266.sil b/tests/bug-266.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a6]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \nofolios
 
 Word\glue[width=1ex]to the wise

diff --git a/tests/bug-269.sil b/tests/bug-269.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a6,class=book]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \nofolios
 \font[family=Gentium Plus,size=10.1pt,language=tr]
 \use[module=packages.footnotes]

diff --git a/tests/bug-283.sil b/tests/bug-283.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a6]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \nofolios
 \font[family=Libertinus Serif,size=12.7pt,language=tr]
 \set[parameter=shaper.spacestretchfactor,value=1.2]

diff --git a/tests/bug-284.sil b/tests/bug-284.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a6]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \nofolios
 \set[parameter=document.lskip,value=15pt]
 \set[parameter=document.rskip,value=10pt]

diff --git a/tests/bug-301.sil b/tests/bug-301.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a7,class=book]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \use[module=packages.linespacing]
 \nofolios
 \font[family=Gentium Plus,size=9.5pt]

diff --git a/tests/bug-309.sil b/tests/bug-309.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a6]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \nofolios
 \set[parameter=document.parskip,value=2em plus 1em]
 Test par

diff --git a/tests/bug-317.sil b/tests/bug-317.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a6]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \nofolios
 \use[module=packages.verbatim]
 \define[command=verbatim:font]{\set[parameter=font.family,value=Hack]}

diff --git a/tests/bug-337.sil b/tests/bug-337.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a7,class=book]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \script[src=inc.bug-337]
 \define[command=crop:header]{tests/bug-337.sil}
 \crop:setup[papersize=a6]

diff --git a/tests/bug-344.sil b/tests/bug-344.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a5,class=book]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \nofolios
 \define[command=mwe]{One, two. Buckle my shoe.\smallskip}
 

diff --git a/tests/bug-353.sil b/tests/bug-353.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a5]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \use[module=packages.background]
 \nofolios
 \background[color=#e9d8ba]

diff --git a/tests/bug-355-tr-hyphenation.sil b/tests/bug-355-tr-hyphenation.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a7]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \nofolios
 \neverindent
 \set[parameter=shaper.variablespaces, value=false]

diff --git a/tests/bug-39.sil b/tests/bug-39.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a5,class=book]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \use[module=packages.frametricks]
 \right-running-head{First Line of Header\skip[height=8mm] Second Line of Header}
 \showframe[id=all]

diff --git a/tests/bug-465-a.sil b/tests/bug-465-a.sil
@@ -1,3 +1,4 @@
 \begin[papersize=a5]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 Hello \include[src=bug-465-b.sil].
-\end{document}
+\end{document}
diff --git a/tests/bug-526.sil b/tests/bug-526.sil
@@ -1,4 +1,5 @@
 \begin[class=plain,papersize=a6]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \nofolios
 \use[module=packages.frametricks]
 \use[module=packages.lorem]

diff --git a/tests/bug-530.sil b/tests/bug-530.sil
@@ -1,4 +1,5 @@
 \begin[direction=RTL]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \use[module=packages.lorem]
 
 \lorem
@@ -7,4 +8,4 @@
 
 \lorem
 
-\end{document}
+\end{document}
diff --git a/tests/bug-54.sil b/tests/bug-54.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a6]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \nofolios
 \font[family=Gentium Plus,size=12pt]
 \set[parameter=document.parindent,value=10mm]

diff --git a/tests/bug-583.sil b/tests/bug-583.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a6]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \neverindent
 \nofolios
 \define[command=ah]{\discretionary[prebreak=-, replacement=’]}

diff --git a/tests/bug-61.sil b/tests/bug-61.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a6,class=book]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \use[module=packages.frametricks]
 \begin[first-content-frame=frame1]{pagetemplate}
 \frame[id=frame1,left=left(content),right=right(content),height=18pt,top=top(content),next=frame2]

diff --git a/tests/bug-62.sil b/tests/bug-62.sil
@@ -1,4 +1,5 @@
 \begin[papersize=a5]{document}
+\use[module=packages.retrograde,target=v0.15.0]
 First paragraph %comment
 
 

diff --git a/tests/bug-621.sil b/tests/bug-621.sil
@@ -1,4 +1,5 @@
 \begin{document}
+\use[module=packages.retrograde,target=v0.15.0]
 \font[language=fr, size=15pt]
 La peine de mort est nécessaire, disent les partisans de l’antique et barbare routine ; sans elle il n’est point de frein assez puissant pour le crime. Qui vous l’a dit ? Avez-vous calculé tous les ressorts par lesquels les lois pénales peuvent agir sur la sensibilité humaine ? Hélas ! avant la mort, combien de douleurs physiques et morales l’homme ne peut-il pas endurer !