Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Goes with #1608 #364

Merged
merged 3 commits into from
Feb 10, 2025
Merged
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 modified tests/gabc-dump/glyphs/high-bars-2-lines.pdf
Binary file not shown.
Binary file modified tests/gabc-dump/glyphs/high-bars-3-lines.pdf
Binary file not shown.
Binary file modified tests/gabc-dump/glyphs/high-bars-5-lines.pdf
Binary file not shown.
Binary file modified tests/gabc-dump/glyphs/high-bars.pdf
Binary file not shown.
Binary file modified tests/tex-output/bugs/fix-1139/fix-1139.pdf
Binary file not shown.
Binary file modified tests/tex-output/bugs/fix-1141/fix-1141.pdf
Binary file not shown.
Binary file modified tests/tex-output/hyphenation/hyphenation.pdf
Binary file not shown.
Binary file modified tests/tex-output/illumination/illumination.pdf
Binary file not shown.
26 changes: 26 additions & 0 deletions tests/tex-output/multi-line-initials/PopulusSion.gabc
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
% !TEX TS-program = gregorio
% !TEX encoding = UTF-8

% The first part of the score is called the header, you can input some useful informations here:

name: Pópulus Sion;
office-part: Introitus;
occasion: Dominica II Adventus;
date: 2006;
transcriber: Elie Roux;
transcription-date: 2006;
style: modern;

% Then, when gregorio encounters the following line (%%), it switches to the score, where you input the notes

%%

% The syntax in this part is called gabc. Please refer to http://home.gna.org/gregorio/gabc/#basis

Pó(c3eh)pu(g)lus(h) Si(hi)on,(hgh.) *(;) ec(hihi)ce(e.) Dó(e.f!gwhhi)mi(h){n}us(hz) vé(hi)ni(ig//ih)et(h.) (,) ad(iv./hig) sal(fe)ván(ghg)das(fg) gen(e_f_e_)tes(e.) :(:z)

et(e) au(eh)dí(hhi)tam(i) fá(kjki)ci(i)et(i) Dó(ij)mi(ihi)nus(iv./hiHF) (,z) gló(h!i'j)ri(ji!kvJI)am(ij) vo(j.i!jwk)cis(ji) su(i_j_i_)æ,(i.) (;) in(e) læ(e)tí(e!f'h)ti(h)a(hi!jVji)

cor(gh!ijI'H<)dis(ihhf!gwh) ve(e_f_e_)stri.(e) Ps.(::) Qui(ehg) re(hi)gis(i) I(i)sra(i)el,(hj) in(j)tén(ji)de(ij..) :*(:) qui(ig) de(hi)dú(i)cis(i)

vel(i)ut(i!jwk) o(i')vem(h) Jo(hhh)seph.(fe..) (::) Gló(ehg)ri(hi)a(i) Pa(i)tri.(i) (:) E(i) u(i!jwk) o(i) u(h) a(hhh) e(fe..) (::)
26 changes: 26 additions & 0 deletions tests/tex-output/multi-line-initials/PopulusSion_new.gabc
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
% !TEX TS-program = gregorio
% !TEX encoding = UTF-8

% The first part of the score is called the header, you can input some useful informations here:

name: Pópulus Sion;
office-part: Introitus;
occasion: Dominica II Adventus;
date: 2006;
transcriber: Elie Roux;
transcription-date: 2006;
style: modern;

% Then, when gregorio encounters the following line (%%), it switches to the score, where you input the notes

%%

% The syntax in this part is called gabc. Please refer to http://home.gna.org/gregorio/gabc/#basis

Pó(c3eh)pu(g)lus(h) Si(hi)on,(hgh.) *(;) ec(hihi)ce(e.) Dó(e.f!gwhhi)mi(h){n}us(h) vé(hi)ni(ig//ih)et(h.) (,) ad(iv./hig) sal(fe)ván(ghg)das(fg) gen(e_f_e_)tes(e.) :(:)

et(e) au(eh)dí(hhi)tam(i) fá(kjki)ci(i)et(i) Dó(ij)mi(ihi)nus(iv./hiHF) (,) gló(h!i'j)ri(ji!kvJI)am(ij) vo(j.i!jwk)cis(ji) su(i_j_i_)æ,(i.) (;) in(e) læ(e)tí(e!f'h)ti(h)a(hi!jVji)

cor(gh!ijI'H<)dis(ihhf!gwh) ve(e_f_e_)stri.(e) Ps.(::) Qui(ehg) re(hi)gis(i) I(i)sra(i)el,(hj) in(j)tén(ji)de(ij..) :*(:) qui(ig) de(hi)dú(i)cis(i)

vel(i)ut(i!jwk) o(i')vem(h) Jo(hhh)seph.(fe..) (::) Gló(ehg)ri(hi)a(i) Pa(i)tri.(i) (:) E(i) u(i!jwk) o(i) u(h) a(hhh) e(fe..) (::)
12 changes: 12 additions & 0 deletions tests/tex-output/multi-line-initials/jesu_dulcis.gabc
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name:Jesu dulcis memoria;
office-part:Hymnus;
mode:1;
book:The Liber Usualis, 1961, p. 452 & Liber antiphonarius, 1960, p. 300;
transcriber:Andrew Hinkley;
%%
(c4) JE(h)su(h') dul(h)cis(h) me(d)mó(f')ri(e)a,(d) (,) Dans(h) ve(h')ra(i) cor(g)dis(h) gáu(j')di(i)a :(h.) (;) Sed(h) su(i')per(j) mel(k) et(j) ó(h')mni(j)a,(ivHG') (,) E(h)jus(h') dul(i)cis(g) prae(e)sén(g')ti(h)a.(h.) (::)
%2. Nil(h) cá(h')ni(h)tur(h) su(d)á(f')vi(e)us,(d) (,) Nil(h) au(h')dí(i)tur(g) ju(h)cún(j')di(i)us,(h.) (;) Nil(h) co(i')gi(j)tá(k)tur(j) dúl(h')ci(j)us,(ivHG') (,) Quam(h) Je(h')sus(i) De(g)i(e) Fí(g')li(h)us.(h.) (::)
%3. Je(h)su(h') spes(h) pae(h)ni(d)tén(f')ti(e)bus,(d) (,) Quam(h) pi(h')us(i) es(g) pe(h)tén(j')ti(i)bus!(h.) (;) Quam(h) bo(i')nus(j) te(k) quae(j)rén(h')ti(j)bus!(ivHG') (,) Sed(h) quid(h') in(i)ve(g)ni(e)én(g')ti(h)bus?(h.) (::)
%4. Nec(h) lin(h')gua(h) va(h)let(d) dí(f')ce(e)re,(d) (,) Nec(h) lít(h')te(i)ra(g) ex(h)prí(j')me(i)re :(h.) (;) Ex(h)pér(i')tus(j) pot(k)est(j) cré(h')de(j)re,(ivHG') (,) Quid(h) sit(h') Je(i)sum(g) di(e)lí(g')ge(h)re.(h.) (::)
%5. Sis(h) Je(h')su(h) no(h)strum(d) gáu(f')di(e)um,(d) (,) Qui(h) es(h') fu(i)tú(g)rus(h) praé(j')mi(i)um :(h.) (;) Sit(h) no(i')stra(j) in(k) te(j) gló(h')ri(j)a,(ivHG') (,) Per(h) cun(h')cta(i) sem(g)per(e) saé(g')cu(h)la.(h.) (::)
%A(hih)men.(gh..) (::)
Binary file not shown.
110 changes: 110 additions & 0 deletions tests/tex-output/multi-line-initials/multi-line-initials-2.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
\documentclass{article}
\usepackage[margin=1in]{geometry}
\usepackage{nopageno}
\setlength{\parindent}{0pt}
\usepackage[autocompile,debug]{gregoriotex}
\usepackage{fontspec}
\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}

\begin{document}

\parbox[t]{3in}{%
0 lines

\gresetinitiallines{0}
\gregorioscore{jesu_dulcis}
}
\hfil
\parbox[t]{3in}{%
1 line

\gresetinitiallines{1}
\gregorioscore{jesu_dulcis}
}

\bigskip

\parbox[t]{3in}{%
2 lines, 120pt, align top to top, raise -0.5cm

\gresetinitiallines{2}
\grechangestyle{initial}{\fontsize{120}{120}\selectfont}
\gresetinitialanchor{top}
\gresetinitialposition{firsttop}
\grechangedim{initialraise}{-0.5cm}{scalable}
\gregorioscore{jesu_dulcis}
}
\hfil
\parbox[t]{3in}{%
3 lines, 180pt, align top to top, raise -0.5cm

\gresetinitiallines{3}
\grechangestyle{initial}{\fontsize{180}{180}\selectfont}
\gresetinitialanchor{top}
\gresetinitialposition{firsttop}
\grechangedim{initialraise}{-0.5cm}{scalable}
\gregorioscore{jesu_dulcis}
}

\clearpage

\parbox[t]{3in}{%
3 lines, 120pt, align top to top, raise -0.5cm

\gresetinitialanchor{top}
\gresetinitialposition{firsttop}
\grechangedim{initialraise}{-0.5cm}{scalable}
\gresetinitiallines{3}
\grechangestyle{initial}{\fontsize{120}{120}\selectfont}
\gregorioscore{jesu_dulcis}
}
\hfil
\parbox[t]{3in}{%
3 lines, 120pt, align baseline to first baseline, raise annotation 1.5cm

\gresetinitialanchor{baseline}
\gresetinitialposition{firstbaseline}
\grechangedim{initialraise}{0cm}{scalable}
\grechangedim{annotationraise}{1.5cm}{scalable}
\gresetinitiallines{3}
\grechangestyle{initial}{\fontsize{120}{120}\selectfont}
\gregorioscore{jesu_dulcis}
}

\bigskip

\parbox[t]{3in}{%
3 lines, 120pt, align baseline to last baseline

\gresetinitialanchor{baseline}
\gresetinitialposition{lastbaseline}
\grechangedim{initialraise}{0cm}{scalable}
\gresetinitiallines{3}
\grechangestyle{initial}{\fontsize{120}{120}\selectfont}
\gregorioscore{jesu_dulcis}
}
\hfil
\parbox[t]{3in}{%
3 lines, 120pt, align bottom to bottom

\gresetinitialanchor{bottom}
\gresetinitialposition{lastbottom}
\grechangedim{initialraise}{0cm}{scalable}
\gresetinitiallines{3}
\grechangestyle{initial}{\fontsize{120}{120}\selectfont}
\gregorioscore{jesu_dulcis}
}

\end{document}
Binary file not shown.
71 changes: 71 additions & 0 deletions tests/tex-output/multi-line-initials/multi-line-initials.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
% !TEX TS-program = lualatex
% !TEX encoding = UTF-8

% This is a simple template for a LuaLaTeX document using gregorio scores.

\documentclass[11pt]{article} % use larger type; default would be 10pt

% usual packages loading:
\usepackage{fontspec}
\usepackage{geometry} % See geometry.pdf to learn the layout options. There are lots.
\geometry{a4paper} % or letterpaper (US) or a5paper or....
\usepackage[allowdeprecated=false,autocompile]{gregoriotex} % for gregorio score inclusion
\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}

% here we begin the document
\listfiles
\begin{document}
First a series of scores which have manual line-breaks in them. This demonstrates what happens to scores which were previously typeset under the old system where manual line breaks were necessary for 2-line initials.

\gresetinitiallines{0}
\gregorioscore{PopulusSion.gabc}

\newpage
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut vitae ipsum ultrices ligula dignissim tempor. Nullam id placerat arcu, quis congue odio. Sed eu nunc varius, facilisis est non, dapibus nisl. Suspendisse potenti. Ut dictum massa non semper semper. Sed ligula nisl, viverra sed accumsan eget, tempor vitae mi. Ut tincidunt quam commodo, scelerisque ex a, consequat nunc. Duis suscipit tellus eget leo posuere imperdiet.
\grechangestyle{initial}{\fontsize{40}{40}\selectfont}
\gresetinitiallines{1}
\gregorioscore{PopulusSion.gabc}

\newpage
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut vitae ipsum ultrices ligula dignissim tempor. Nullam id placerat arcu, quis congue odio. Sed eu nunc varius, facilisis est non, dapibus nisl. Suspendisse potenti. Ut dictum massa non semper semper. Sed ligula nisl, viverra sed accumsan eget, tempor vitae mi. Ut tincidunt quam commodo, scelerisque ex a, consequat nunc. Duis suscipit tellus eget leo posuere imperdiet.
\gresetinitiallines{2}
\grechangestyle{initial}{\fontsize{120}{60}\selectfont}
\gregorioscore{PopulusSion.gabc}

\newpage
Now a series of scores with all manual line-breaks removed, demonstrating the power of the new feature
\gresetinitiallines{0}
\gregorioscore{PopulusSion_new.gabc}

\newpage
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut vitae ipsum ultrices ligula dignissim tempor. Nullam id placerat arcu, quis congue odio. Sed eu nunc varius, facilisis est non, dapibus nisl. Suspendisse potenti. Ut dictum massa non semper semper. Sed ligula nisl, viverra sed accumsan eget, tempor vitae mi. Ut tincidunt quam commodo, scelerisque ex a, consequat nunc. Duis suscipit tellus eget leo posuere imperdiet.
\grechangestyle{initial}{\fontsize{40}{40}\selectfont}
\gresetinitiallines{1}
\gregorioscore{PopulusSion_new.gabc}

\newpage
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut vitae ipsum ultrices ligula dignissim tempor. Nullam id placerat arcu, quis congue odio. Sed eu nunc varius, facilisis est non, dapibus nisl. Suspendisse potenti. Ut dictum massa non semper semper. Sed ligula nisl, viverra sed accumsan eget, tempor vitae mi. Ut tincidunt quam commodo, scelerisque ex a, consequat nunc. Duis suscipit tellus eget leo posuere imperdiet.
\grechangestyle{initial}{\fontsize{120}{60}\selectfont}
\gresetinitiallines{2}
\gregorioscore{PopulusSion_new.gabc}

\newpage
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut vitae ipsum ultrices ligula dignissim tempor. Nullam id placerat arcu, quis congue odio. Sed eu nunc varius, facilisis est non, dapibus nisl. Suspendisse potenti. Ut dictum massa non semper semper. Sed ligula nisl, viverra sed accumsan eget, tempor vitae mi. Ut tincidunt quam commodo, scelerisque ex a, consequat nunc. Duis suscipit tellus eget leo posuere imperdiet.
\grechangestyle{initial}{\fontsize{180}{40}\selectfont}
\gresetinitiallines{3}
\gregorioscore{PopulusSion_new.gabc}


\end{document}