diff --git a/tests/gabc-output/FactusEst.pdf b/tests/gabc-output/FactusEst.pdf index 0f3ca60c..db9607b6 100644 Binary files a/tests/gabc-output/FactusEst.pdf and b/tests/gabc-output/FactusEst.pdf differ diff --git a/tests/gabc-output/bugs/fix-1015.pdf b/tests/gabc-output/bugs/fix-1015.pdf index 906a3a22..11cf47e1 100644 Binary files a/tests/gabc-output/bugs/fix-1015.pdf and b/tests/gabc-output/bugs/fix-1015.pdf differ diff --git a/tests/gabc-output/bugs/fix-1700.pdf b/tests/gabc-output/bugs/fix-1700.pdf index b92f7d28..4bddaafb 100644 Binary files a/tests/gabc-output/bugs/fix-1700.pdf and b/tests/gabc-output/bugs/fix-1700.pdf differ diff --git a/tests/gabc-output/two-nabc.pdf b/tests/gabc-output/two-nabc.pdf index 295f4fd9..25d246ba 100644 Binary files a/tests/gabc-output/two-nabc.pdf and b/tests/gabc-output/two-nabc.pdf differ diff --git a/tests/gabc-output/veni.pdf b/tests/gabc-output/veni.pdf index 879d262a..a611be58 100644 Binary files a/tests/gabc-output/veni.pdf and b/tests/gabc-output/veni.pdf differ diff --git a/tests/tex-output/bugs/fix-1715/puer-natus-mingap-0.pdf b/tests/tex-output/bugs/fix-1715/puer-natus-mingap-0.pdf new file mode 100644 index 00000000..7eb9e58c Binary files /dev/null and b/tests/tex-output/bugs/fix-1715/puer-natus-mingap-0.pdf differ diff --git a/tests/tex-output/bugs/fix-1715/puer-natus-mingap-0.tex b/tests/tex-output/bugs/fix-1715/puer-natus-mingap-0.tex new file mode 100644 index 00000000..23374dc0 --- /dev/null +++ b/tests/tex-output/bugs/fix-1715/puer-natus-mingap-0.tex @@ -0,0 +1,41 @@ +% !TEX TS-program = LuaLaTeX+se +% !TEX encoding = UTF-8 + +% Test for issue #1715: nabcintersyllablemingap = 0pt +% With zero mingap, the overflow model only pushes when NABC physically +% overflows the notes box — no extra minimum separation enforced. + +\documentclass[11pt]{article} +\usepackage{fontspec} +\usepackage{geometry} +\geometry{a4paper} +\usepackage[allowdeprecated=false]{gregoriotex} +\usepackage{fullpage} +\setmainfont[ + Path = ../../../../fonts/ , + Extension = .otf , + UprightFont = *-Regular , + UprightFeatures = { SmallCapsFont = *SC-Regular } , + BoldFont = *-Bold , + BoldFeatures = { SmallCapsFont = *SC-Bold } , + ItalicFont = *-Italic , + ItalicFeatures = { SmallCapsFont = *SC-Italic } , + BoldItalicFont = *-BoldItalic , + BoldItalicFeatures = { SmallCapsFont = *SC-BoldItalic } , + Ligatures = TeX +]{Alegreya} + +\grechangedim{baselineskip}{65pt}{scalable} +\gresetnabcalignment{neume} +\gresetnabcfont[1]{grelaon}{8} + +% Override: disable mingap entirely +\grechangedim{nabcintersyllablemingap}{0pt}{scalable} + +\listfiles +\begin{document} + +\section*{Puer natus est — mingap = 0pt} +\gregorioscore[a]{puer-natus} + +\end{document} diff --git a/tests/tex-output/bugs/fix-1715/puer-natus-mingap-double.pdf b/tests/tex-output/bugs/fix-1715/puer-natus-mingap-double.pdf new file mode 100644 index 00000000..03eab2ec Binary files /dev/null and b/tests/tex-output/bugs/fix-1715/puer-natus-mingap-double.pdf differ diff --git a/tests/tex-output/bugs/fix-1715/puer-natus-mingap-double.tex b/tests/tex-output/bugs/fix-1715/puer-natus-mingap-double.tex new file mode 100644 index 00000000..50ff5100 --- /dev/null +++ b/tests/tex-output/bugs/fix-1715/puer-natus-mingap-double.tex @@ -0,0 +1,41 @@ +% !TEX TS-program = LuaLaTeX+se +% !TEX encoding = UTF-8 + +% Test for issue #1715: nabcintersyllablemingap = 0.12cm (2x default) +% Doubling the mingap should produce visibly wider NABC inter-syllable +% separation compared to the default 0.06cm. + +\documentclass[11pt]{article} +\usepackage{fontspec} +\usepackage{geometry} +\geometry{a4paper} +\usepackage[allowdeprecated=false]{gregoriotex} +\usepackage{fullpage} +\setmainfont[ + Path = ../../../../fonts/ , + Extension = .otf , + UprightFont = *-Regular , + UprightFeatures = { SmallCapsFont = *SC-Regular } , + BoldFont = *-Bold , + BoldFeatures = { SmallCapsFont = *SC-Bold } , + ItalicFont = *-Italic , + ItalicFeatures = { SmallCapsFont = *SC-Italic } , + BoldItalicFont = *-BoldItalic , + BoldItalicFeatures = { SmallCapsFont = *SC-BoldItalic } , + Ligatures = TeX +]{Alegreya} + +\grechangedim{baselineskip}{65pt}{scalable} +\gresetnabcalignment{neume} +\gresetnabcfont[1]{grelaon}{8} + +% Override: double the default mingap (0.06cm -> 0.12cm) +\grechangedim{nabcintersyllablemingap}{0.12cm}{scalable} + +\listfiles +\begin{document} + +\section*{Puer natus est — mingap = 0.12cm} +\gregorioscore[a]{puer-natus} + +\end{document} diff --git a/tests/tex-output/bugs/fix-1715/puer-natus-mingap-extreme.pdf b/tests/tex-output/bugs/fix-1715/puer-natus-mingap-extreme.pdf new file mode 100644 index 00000000..41fb5a30 Binary files /dev/null and b/tests/tex-output/bugs/fix-1715/puer-natus-mingap-extreme.pdf differ diff --git a/tests/tex-output/bugs/fix-1715/puer-natus-mingap-extreme.tex b/tests/tex-output/bugs/fix-1715/puer-natus-mingap-extreme.tex new file mode 100644 index 00000000..186eaff6 --- /dev/null +++ b/tests/tex-output/bugs/fix-1715/puer-natus-mingap-extreme.tex @@ -0,0 +1,42 @@ +% !TEX TS-program = LuaLaTeX+se +% !TEX encoding = UTF-8 + +% Test for issue #1715: nabcintersyllablemingap = 1cm (exaggerated) +% An absurdly large mingap to stress-test the overflow model. The NABC +% glyphs should be pushed far apart, likely causing line breaks and +% visual distortion — confirms the parameter has unbounded effect. + +\documentclass[11pt]{article} +\usepackage{fontspec} +\usepackage{geometry} +\geometry{a4paper} +\usepackage[allowdeprecated=false]{gregoriotex} +\usepackage{fullpage} +\setmainfont[ + Path = ../../../../fonts/ , + Extension = .otf , + UprightFont = *-Regular , + UprightFeatures = { SmallCapsFont = *SC-Regular } , + BoldFont = *-Bold , + BoldFeatures = { SmallCapsFont = *SC-Bold } , + ItalicFont = *-Italic , + ItalicFeatures = { SmallCapsFont = *SC-Italic } , + BoldItalicFont = *-BoldItalic , + BoldItalicFeatures = { SmallCapsFont = *SC-BoldItalic } , + Ligatures = TeX +]{Alegreya} + +\grechangedim{baselineskip}{65pt}{scalable} +\gresetnabcalignment{neume} +\gresetnabcfont[1]{grelaon}{8} + +% Override: absurdly large mingap (stress test) +\grechangedim{nabcintersyllablemingap}{1cm}{scalable} + +\listfiles +\begin{document} + +\section*{Puer natus est — mingap = 1cm (extreme)} +\gregorioscore[a]{puer-natus} + +\end{document} diff --git a/tests/tex-output/bugs/fix-1715/puer-natus-mingap-max.pdf b/tests/tex-output/bugs/fix-1715/puer-natus-mingap-max.pdf new file mode 100644 index 00000000..a2a83106 Binary files /dev/null and b/tests/tex-output/bugs/fix-1715/puer-natus-mingap-max.pdf differ diff --git a/tests/tex-output/bugs/fix-1715/puer-natus-mingap-max.tex b/tests/tex-output/bugs/fix-1715/puer-natus-mingap-max.tex new file mode 100644 index 00000000..0f551c74 --- /dev/null +++ b/tests/tex-output/bugs/fix-1715/puer-natus-mingap-max.tex @@ -0,0 +1,41 @@ +% !TEX TS-program = LuaLaTeX+se +% !TEX encoding = UTF-8 + +% Test for issue #1715: nabcintersyllablemingap = 0.24cm (= intersyllablespacenotes) +% Setting mingap to the full inter-syllable space is an extreme value that +% should produce maximum NABC separation — useful for visual comparison. + +\documentclass[11pt]{article} +\usepackage{fontspec} +\usepackage{geometry} +\geometry{a4paper} +\usepackage[allowdeprecated=false]{gregoriotex} +\usepackage{fullpage} +\setmainfont[ + Path = ../../../../fonts/ , + Extension = .otf , + UprightFont = *-Regular , + UprightFeatures = { SmallCapsFont = *SC-Regular } , + BoldFont = *-Bold , + BoldFeatures = { SmallCapsFont = *SC-Bold } , + ItalicFont = *-Italic , + ItalicFeatures = { SmallCapsFont = *SC-Italic } , + BoldItalicFont = *-BoldItalic , + BoldItalicFeatures = { SmallCapsFont = *SC-BoldItalic } , + Ligatures = TeX +]{Alegreya} + +\grechangedim{baselineskip}{65pt}{scalable} +\gresetnabcalignment{neume} +\gresetnabcfont[1]{grelaon}{8} + +% Override: set mingap to full intersyllablespacenotes value (extreme) +\grechangedim{nabcintersyllablemingap}{0.24cm}{scalable} + +\listfiles +\begin{document} + +\section*{Puer natus est — mingap = 0.24cm} +\gregorioscore[a]{puer-natus} + +\end{document} diff --git a/tests/tex-output/bugs/fix-1715/puer-natus.gabc b/tests/tex-output/bugs/fix-1715/puer-natus.gabc new file mode 100644 index 00000000..bf94da81 --- /dev/null +++ b/tests/tex-output/bugs/fix-1715/puer-natus.gabc @@ -0,0 +1,17 @@ +name: Puer natus est; +annotation: Intr.; +annotation: VII; +nabc-lines: 2; +%% +(c3) Pu(ei|peG|`````tvhl```peSlsm2lsim8)er(i|unhk|vilse4) *() +na(iji|to|tolse4)tus(h|un|ta) est(hhh|ts|ts) +no(ih/ji|pf|pflsl3lsp1lsc1)bis,(i|unlst2|vi) (,) +et(fi~|ta>|ta>lsi7) fí(iji|to|to)li(hf|cl|cllsc3)us(f|un|ta) +da(h|unlst2|vi-|hi|pe|pe)tus(h|un|ta) est(h|un|ta) no(hihh|tr|tr)bis:(efe|ta>``unlsa2|tolst2) (;) cu(e|puhd|talse4)jus(f|pu|vi) im(h|unhh|vi)pé(gi!jk|sclst2vihl|peShjppt2lsi7)ri(ih|cl|cllsc3)um(h|un|ta) (,?) +su(h|un|ta)per(h|un|ta) hú(ih/ji|pf|pflsl3lsm4lsi7)me(hg|clG|cl-lst2)rum(hhh|ts|ts) +e(hf|clGlsa5|cl-lst2|hg/hgf~|po``vi>|pf>lsc2)jus:(gf|clG|cl-) (;) +et(fhg|cl>|tolsc2lsi7) vo(h|un|vi)cá(hji|to|tolse4)bi(h|un|ta)tur(hhh|ts|ts) +no(h|un|ta)men(hhh|ts|ts) e(hih|trlst8`vi>|toS2lssm2lse4|hgf~||cl->)jus,(gf|clG|cl-) (,) +ma(hj|pe>1lsc3ltqm4|pe>1lss4)gni(i|un|vi) +con(fh~|ta>|ta>lsiv8)sí(h|un|vi)lii(hh|tssun1|ds|hf||cl-) +An(fhf!gwh|peG``ql>ppn1ltsj3ltqm3|toSlse4ql>lss3)ge(efe|toGlsa5|toS)lus.(e|un|ta) Ps.(::) Can(hg~||vi>lss6)tá(hi||pe)te(i||vi) Dó(i||vi)mi(i||vi)no(i||vi) cán(ik||pe)ti(j||vi)cum(j||vi) no(ji||cl)vum:(ij||pe) *(:) qui(ig||cl)a(hi||pe) mi(i||vi)ra(i||vi)bí(jwk||qi)li(i||vi)a(h||ta) fe(hhh||ts)cit.(fef||cl-vi-lsim8) (::) \ No newline at end of file diff --git a/tests/tex-output/bugs/fix-1715/puer-natus.pdf b/tests/tex-output/bugs/fix-1715/puer-natus.pdf new file mode 100644 index 00000000..e9c1ccfe Binary files /dev/null and b/tests/tex-output/bugs/fix-1715/puer-natus.pdf differ diff --git a/tests/tex-output/bugs/fix-1715/puer-natus.tex b/tests/tex-output/bugs/fix-1715/puer-natus.tex new file mode 100644 index 00000000..3ad793c8 --- /dev/null +++ b/tests/tex-output/bugs/fix-1715/puer-natus.tex @@ -0,0 +1,42 @@ +% !TEX TS-program = LuaLaTeX+se +% !TEX encoding = UTF-8 + +% Regression test for issue #1715: excessive inter-syllable spacing when NABC +% extends past the notes box (extrakern mechanism). +% +% Puer natus est (Introit, Mode VII) with two NABC voices. +% With the fix, the gap between syllables "Pu" and "er" should be normal +% (no extrakern added, since the natural inter-syllable space already +% prevents NABC overlap). + +\documentclass[11pt]{article} +\usepackage{fontspec} +\usepackage{geometry} +\geometry{a4paper} +\usepackage[allowdeprecated=false]{gregoriotex} +\usepackage{fullpage} +\setmainfont[ + Path = ../../../../fonts/ , + Extension = .otf , + UprightFont = *-Regular , + UprightFeatures = { SmallCapsFont = *SC-Regular } , + BoldFont = *-Bold , + BoldFeatures = { SmallCapsFont = *SC-Bold } , + ItalicFont = *-Italic , + ItalicFeatures = { SmallCapsFont = *SC-Italic } , + BoldItalicFont = *-BoldItalic , + BoldItalicFeatures = { SmallCapsFont = *SC-BoldItalic } , + Ligatures = TeX +]{Alegreya} + +\grechangedim{baselineskip}{65pt}{scalable} +\gresetnabcalignment{neume} +\gresetnabcfont[1]{grelaon}{8} + +\listfiles +\begin{document} + +\section*{Puer natus est — regression test for \#1715} +\gregorioscore[a]{puer-natus} + +\end{document} diff --git a/tests/tex-output/gsptest/gsptest.pdf b/tests/tex-output/gsptest/gsptest.pdf index e742dde2..8f58dd49 100644 Binary files a/tests/tex-output/gsptest/gsptest.pdf and b/tests/tex-output/gsptest/gsptest.pdf differ diff --git a/tests/tex-output/nabc-alignment/nabc-alignment-two-voices.pdf b/tests/tex-output/nabc-alignment/nabc-alignment-two-voices.pdf index 5c253e1a..fd6d4a91 100644 Binary files a/tests/tex-output/nabc-alignment/nabc-alignment-two-voices.pdf and b/tests/tex-output/nabc-alignment/nabc-alignment-two-voices.pdf differ diff --git a/tests/tex-output/nabc-alignment/nabc-alignment.pdf b/tests/tex-output/nabc-alignment/nabc-alignment.pdf index a5e19d54..fd115934 100644 Binary files a/tests/tex-output/nabc-alignment/nabc-alignment.pdf and b/tests/tex-output/nabc-alignment/nabc-alignment.pdf differ diff --git a/tests/tex-output/nabc-skip-alterations/nabc-skip-alterations-two-voices.pdf b/tests/tex-output/nabc-skip-alterations/nabc-skip-alterations-two-voices.pdf index 376f8e49..9202655e 100644 Binary files a/tests/tex-output/nabc-skip-alterations/nabc-skip-alterations-two-voices.pdf and b/tests/tex-output/nabc-skip-alterations/nabc-skip-alterations-two-voices.pdf differ diff --git a/tests/tex-output/nabc-skip-alterations/nabc-skip-alterations.pdf b/tests/tex-output/nabc-skip-alterations/nabc-skip-alterations.pdf index 5f3bce40..c3663d2d 100644 Binary files a/tests/tex-output/nabc-skip-alterations/nabc-skip-alterations.pdf and b/tests/tex-output/nabc-skip-alterations/nabc-skip-alterations.pdf differ diff --git a/tests/tex-output/visibility-controls/visibility-controls-main.pdf b/tests/tex-output/visibility-controls/visibility-controls-main.pdf index 296d0454..3a00e0d5 100644 Binary files a/tests/tex-output/visibility-controls/visibility-controls-main.pdf and b/tests/tex-output/visibility-controls/visibility-controls-main.pdf differ