Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file not shown.
Binary file not shown.
Binary file modified tests/tex-output/nabc-alignment/nabc-alignment-two-voices.pdf
Binary file not shown.
54 changes: 39 additions & 15 deletions tests/tex-output/nabc-alignment/nabc-alignment-two-voices.tex
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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}
Binary file modified tests/tex-output/nabc-alignment/nabc-alignment.pdf
Binary file not shown.
34 changes: 27 additions & 7 deletions tests/tex-output/nabc-alignment/nabc-alignment.tex
Original file line number Diff line number Diff line change
@@ -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}
Expand All @@ -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}