diff --git a/output/tex-output/nabc-alignment/nabc-alignment-two-voices.pdf b/output/tex-output/nabc-alignment/nabc-alignment-two-voices.pdf new file mode 100644 index 00000000..b865236c Binary files /dev/null and b/output/tex-output/nabc-alignment/nabc-alignment-two-voices.pdf differ diff --git a/output/tex-output/nabc-alignment/nabc-alignment.pdf b/output/tex-output/nabc-alignment/nabc-alignment.pdf new file mode 100644 index 00000000..b71342f0 Binary files /dev/null and b/output/tex-output/nabc-alignment/nabc-alignment.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..b865236c 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-two-voices.tex b/tests/tex-output/nabc-alignment/nabc-alignment-two-voices.tex index 7087c468..76d03da1 100644 --- a/tests/tex-output/nabc-alignment/nabc-alignment-two-voices.tex +++ b/tests/tex-output/nabc-alignment/nabc-alignment-two-voices.tex @@ -4,6 +4,8 @@ % Test for \gresetnabcalignment with two NABC lines: % Voice 1 (above staff): grelaon, with Tironian notes (lt) % Voice 2 (below staff): gregall, with significative letters (ls) +% Covers both vertical (full/neume) and horizontal (left/center) alignment, +% including per-voice and global configurations. \documentclass[11pt]{article} \usepackage{fontspec} @@ -35,29 +37,51 @@ \listfiles \begin{document} -% 1) Default: full complex glyph descriptor alignment -\section*{full (default) -- two voices} -\gresetnabcalignment{full} +% 1) full + left (default) -- both voices +\section*{full, left (default) -- two voices} +\gresetnabcalignment{full}{left} \gregorioscore[a]{nabc-alignment-two-voices} -% 2) neume alignment for both voices -\section*{neume -- two voices} -\gresetnabcalignment{neume} +% 2) full + center -- both voices +\section*{full, center -- two voices} +\gresetnabcalignment{full}{center} \gregorioscore[a]{nabc-alignment-two-voices} -% 3) Per-voice: neume for voice 1 (above), full for voice 2 (below) -\section*{voice 1 neume, voice 2 full} -\gresetnabcalignment[1]{neume} -\gresetnabcalignment[2]{full} +% 3) neume + left -- both voices +\section*{neume, left -- two voices} +\gresetnabcalignment{neume}{left} \gregorioscore[a]{nabc-alignment-two-voices} -% 4) Per-voice: full for voice 1 (above), neume for voice 2 (below) -\section*{voice 1 full, voice 2 neume} -\gresetnabcalignment[1]{full} -\gresetnabcalignment[2]{neume} +% 4) neume + center -- both voices +\section*{neume, center -- two voices} +\gresetnabcalignment{neume}{center} +\gregorioscore[a]{nabc-alignment-two-voices} + +% 5) Per-voice: voice 1 neume+left, voice 2 full+left +\section*{voice 1 neume+left, voice 2 full+left} +\gresetnabcalignment[1]{neume}{left} +\gresetnabcalignment[2]{full}{left} +\gregorioscore[a]{nabc-alignment-two-voices} + +% 6) Per-voice: voice 1 full+left, voice 2 neume+left +\section*{voice 1 full+left, voice 2 neume+left} +\gresetnabcalignment[1]{full}{left} +\gresetnabcalignment[2]{neume}{left} +\gregorioscore[a]{nabc-alignment-two-voices} + +% 7) Per-voice: voice 1 full+center, voice 2 neume+left +\section*{voice 1 full+center, voice 2 neume+left} +\gresetnabcalignment[1]{full}{center} +\gresetnabcalignment[2]{neume}{left} +\gregorioscore[a]{nabc-alignment-two-voices} + +% 8) Per-voice: voice 1 neume+center, voice 2 full+center +\section*{voice 1 neume+center, voice 2 full+center} +\gresetnabcalignment[1]{neume}{center} +\gresetnabcalignment[2]{full}{center} \gregorioscore[a]{nabc-alignment-two-voices} % Reset to global default for any subsequent tests -\gresetnabcalignment{full} +\gresetnabcalignment{full}{left} \end{document} diff --git a/tests/tex-output/nabc-alignment/nabc-alignment.pdf b/tests/tex-output/nabc-alignment/nabc-alignment.pdf index a5e19d54..b71342f0 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-alignment/nabc-alignment.tex b/tests/tex-output/nabc-alignment/nabc-alignment.tex index 515c7d0b..f6346b62 100644 --- a/tests/tex-output/nabc-alignment/nabc-alignment.tex +++ b/tests/tex-output/nabc-alignment/nabc-alignment.tex @@ -1,7 +1,9 @@ % !TEX TS-program = LuaLaTeX+se % !TEX encoding = UTF-8 -% Test for \gresetnabcalignment options: neume, full +% Test for \gresetnabcalignment options: +% Vertical alignment: full, neume +% Horizontal alignment (optional 2nd arg): left, center \documentclass[11pt]{article} \usepackage{fontspec} @@ -26,14 +28,32 @@ \listfiles \begin{document} -% 1) Default: full complex glyph descriptor alignment -\section*{full (default)} -\gresetnabcalignment{full} +% 1) full + left (default behavior) +\section*{full, left (default)} +\gresetnabcalignment{full}{left} +\gregorioscore[a]{nabc-alignment} + +% 2) full + center +\section*{full, center} +\gresetnabcalignment{full}{center} +\gregorioscore[a]{nabc-alignment} + +% 3) neume + left +\section*{neume, left} +\gresetnabcalignment{neume}{left} \gregorioscore[a]{nabc-alignment} -% 2) neume alignment (ignore significative letters) -\section*{neume} -\gresetnabcalignment{neume} +% 4) neume + center +\section*{neume, center} +\gresetnabcalignment{neume}{center} \gregorioscore[a]{nabc-alignment} +% 5) Backward compat: single argument only (halign unchanged from previous) +\section*{full only (halign stays center from previous)} +\gresetnabcalignment{full} +\gregorioscore[a]{nabc-alignment} + +% Reset to default +\gresetnabcalignment{full}{left} + \end{document}