Skip to content

Commit

Permalink
Added and updated tests for adjustable low note spacing.
Browse files Browse the repository at this point in the history
  • Loading branch information
henryso committed Jan 17, 2017
1 parent d9ae90d commit 35eb815
Show file tree
Hide file tree
Showing 29 changed files with 60 additions and 23 deletions.
Binary file modified tests/gabc-dump/glyphs/brackets.pdf
Binary file not shown.
Binary file modified tests/gabc-dump/glyphs/fusion.pdf
Binary file not shown.
Binary file modified tests/gabc-dump/glyphs/horizontal_episemus_bridges.pdf
Binary file not shown.
Binary file modified tests/gabc-dump/glyphs/ledger_lines.pdf
Binary file not shown.
Binary file modified tests/gabc-dump/glyphs/limits.pdf
Binary file not shown.
Binary file modified tests/gabc-dump/glyphs/nocustos.pdf
Binary file not shown.
Binary file modified tests/gabc-dump/glyphs/punctum-inclinatum.pdf
Binary file not shown.
Binary file modified tests/gabc-dump/glyphs/shapes.pdf
Binary file not shown.
12 changes: 6 additions & 6 deletions tests/gabc-gtex/PopulusSion.tex
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
% File generated by gregorio 4.2.0-develop-6c46cbd-4063
% File generated by gregorio 4.2.0-fix-1125-hg:4209:062bfa470f5d
\GregorioTeXAPIVersion{4.2.0}%
% Name: Pópulus Sion
\GreBeginHeaders %
Expand All @@ -10,7 +10,7 @@
\GreHeader{transcription-date}{2006}%
\GreHeader{style}{modern}%
\GreEndHeaders %
\GreBeginScore{22c160f094046f2b409414cdb489c075286b7df2}{13}{7}{0}{0}{}{4}{\GreInitialClefPosition{3}{0}}%
\GreBeginScore{ff2c446d4187a81b04cac3a94b3d45b891513e9b}{13}{7}{0}{0}{}{4}{\GreInitialClefPosition{3}{0}}%
\GreSetLargestClef{c}{3}{3}{c}{0}{3}%
\GreScoreOpening{%
}{%
Expand Down Expand Up @@ -149,7 +149,7 @@
\GreSyllableNoteCount{4}%
\GreGlyph{\GreCPVirga}{11}{\GreNextCustos{10}{}}{0}%
{%
\GreGlyphHeights{11}{11}%
\GreGlyphHeights{11}{10}%
}{%
\GrePunctumMora{11}{0}{0}{0}%
}{}%
Expand Down Expand Up @@ -283,7 +283,7 @@
\GreSyllableNoteCount{5}%
\GreGlyph{\GreCPVirga}{11}{\GreNextCustos{10}{}}{0}%
{%
\GreGlyphHeights{11}{11}%
\GreGlyphHeights{11}{10}%
}{%
\GrePunctumMora{11}{0}{0}{0}%
}{}%
Expand Down Expand Up @@ -332,7 +332,7 @@
\GreEndOfGlyph{1}%
\GreGlyph{\GreCPVirga}{13}{\GreNextCustos{12}{}}{0}%
{%
\GreGlyphHeights{13}{13}%
\GreGlyphHeights{13}{12}%
}{}{}%
\GreEndOfGlyph{9}%
\GreGlyph{\GreCPDescendensPunctumInclinatum}{12}{\GreNextCustos{11}{}}{6}%
Expand Down Expand Up @@ -446,7 +446,7 @@
\GreEndOfGlyph{1}%
\GreGlyph{\GreCPVirgaReversaLongqueue}{12}{\GreNextCustos{12}{}}{0}%
{%
\GreGlyphHeights{12}{12}%
\GreGlyphHeights{12}{11}%
}{}{}%
\GreEndOfGlyph{0}%
\GreGlyph{\GreCPFlexusLongqueueOneNothing}{12}{\GreNextCustos{9}{}}{8}%
Expand Down
8 changes: 4 additions & 4 deletions tests/gabc-gtex/bugs/fix-740.tex
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
% File generated by gregorio 4.2.0-fix-931-87f406c-4006
% File generated by gregorio 4.2.0-fix-1125-hg:4209:062bfa470f5d
\GregorioTeXAPIVersion{4.2.0}%
% Name: fix-740
\GreBeginHeaders %
\GreHeader{name}{fix-740}%
\GreEndHeaders %
\GreBeginScore{867287521fd287a77dc9624b2bec4564c5624c58}{11}{5}{0}{0}{}{4}{\GreInitialClefPosition{3}{0}}%
\GreBeginScore{af47108feccfdf346aea9a886252caa7e6604ce2}{11}{5}{0}{0}{}{4}{\GreInitialClefPosition{3}{0}}%
\GreSetLargestClef{c}{3}{3}{c}{0}{3}%
\GreScoreOpening{%
}{%
Expand Down Expand Up @@ -47,7 +47,7 @@
\GreEndOfElement{0}{0}{6}%
\GreGlyph{\GreCPVirgaLongqueue}{8}{\GreNextCustos{6}{}}{0}%
{%
\GreGlyphHeights{11}{8}%
\GreGlyphHeights{11}{7}%
}{%
\GreHEpisema{11}{\GreOCaseInitialVirga}{0}{0}{f}{11}{}{}{0}%
}{}%
Expand All @@ -70,7 +70,7 @@
\GreEndOfElement{0}{0}{9}%
\GreGlyph{\GreCPVirgaLongqueue}{8}{\GreNextCustos{6}{}}{0}%
{%
\GreGlyphHeights{9}{8}%
\GreGlyphHeights{9}{7}%
}{%
\GreHEpisemaBridge{9}{0}{-1}{}{}{0}%
\GreHEpisema{9}{\GreOCaseInitialVirga}{0}{0}{f}{9}{}{}{0}%
Expand Down
20 changes: 10 additions & 10 deletions tests/gabc-gtex/fusion.tex
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
% File generated by gregorio 4.2.0-develop-6c46cbd-4063
% File generated by gregorio 4.2.0-fix-1125-hg:4209:062bfa470f5d
\GregorioTeXAPIVersion{4.2.0}%
% Name: fusion
\GreBeginHeaders %
\GreHeader{name}{fusion}%
\GreEndHeaders %
\GreBeginScore{ad2c3a18d6b789abb1cd37c059bd302329e41bab}{13}{4}{0}{0}{}{4}{\GreInitialClefPosition{3}{0}}%
\GreBeginScore{b9bc46c293b4958ca34a07decbfb78d12dc0a65a}{13}{4}{0}{0}{}{4}{\GreInitialClefPosition{3}{0}}%
\GreSetLargestClef{c}{3}{3}{c}{0}{3}%
\GreScoreOpening{%
}{%
Expand Down Expand Up @@ -873,7 +873,7 @@
\GreSyllableNoteCount{3}%
\GreGlyph{\GreCPVirgaReversaLongqueueTwoDown}{10}{\GreNextCustos{8}{}}{0}%
{%
\GreGlyphHeights{10}{10}%
\GreGlyphHeights{10}{9}%
}{}{}%
\GreEndOfGlyph{1}%
\GreFuse\GreGlyph{\GreCPLowerFlexusOneNothing}{8}{\GreNextCustos{10}{}}{8}%
Expand All @@ -886,7 +886,7 @@
\GreSyllableNoteCount{3}%
\GreGlyph{\GreCPVirgaLongqueue}{10}{\GreNextCustos{8}{}}{0}%
{%
\GreGlyphHeights{10}{10}%
\GreGlyphHeights{10}{9}%
}{}{}%
\GreEndOfGlyph{1}%
\GreGlyph{\GreCPFlexusNobarOneNothing}{8}{\GreNextCustos{8}{}}{8}%
Expand All @@ -899,7 +899,7 @@
\GreSyllableNoteCount{3}%
\GreGlyph{\GreCPVirgaReversaLongqueue}{8}{\GreNextCustos{10}{}}{0}%
{%
\GreGlyphHeights{8}{8}%
\GreGlyphHeights{8}{7}%
}{}{}%
\GreEndOfGlyph{1}%
\GreGlyph{\GreCPPesOneNothing}{10}{\GreNextCustos{8}{}}{0}%
Expand All @@ -912,7 +912,7 @@
\GreSyllableNoteCount{3}%
\GreGlyph{\GreCPVirgaLongqueue}{8}{\GreNextCustos{10}{}}{0}%
{%
\GreGlyphHeights{8}{8}%
\GreGlyphHeights{8}{7}%
}{}{}%
\GreEndOfGlyph{1}%
\GreGlyph{\GreCPPesOneNothing}{10}{\GreNextCustos{7}{}}{0}%
Expand Down Expand Up @@ -992,7 +992,7 @@
\GreSyllableNoteCount{3}%
\GreGlyph{\GreCPVirgaReversaLongqueueOneDown}{10}{\GreNextCustos{9}{}}{0}%
{%
\GreGlyphHeights{10}{10}%
\GreGlyphHeights{10}{9}%
}{}{}%
\GreEndOfGlyph{1}%
\GreFuse\GreGlyph{\GreCPPunctumTwoDown}{9}{\GreNextCustos{7}{}}{0}%
Expand All @@ -1010,7 +1010,7 @@
\GreSyllableNoteCount{3}%
\GreGlyph{\GreCPVirgaReversaOneDown}{7}{\GreNextCustos{6}{}}{0}%
{%
\GreGlyphHeights{7}{7}%
\GreGlyphHeights{7}{6}%
\GreAdditionalLine{\GreOCaseInitialVirga}{0}{3}%
}{}{}%
\GreEndOfGlyph{1}%
Expand All @@ -1031,7 +1031,7 @@
\GreSyllableNoteCount{3}%
\GreGlyph{\GreCPVirgaReversaOneDown}{9}{\GreNextCustos{8}{}}{0}%
{%
\GreGlyphHeights{9}{9}%
\GreGlyphHeights{9}{8}%
}{}{}%
\GreEndOfGlyph{1}%
\GreFuse\GreGlyph{\GreCPPunctumTwoDown}{8}{\GreNextCustos{6}{}}{0}%
Expand Down Expand Up @@ -1085,7 +1085,7 @@
\GreSyllableNoteCount{3}%
\GreGlyph{\GreCPVirgaReversaTwoDown}{9}{\GreNextCustos{7}{}}{0}%
{%
\GreGlyphHeights{9}{9}%
\GreGlyphHeights{9}{8}%
}{}{}%
\GreEndOfGlyph{1}%
\GreFuse\GreGlyph{\GreCPLowerPesTwoDeminutus}{7}{\GreNextCustos{9}{}}{0}%
Expand Down
6 changes: 3 additions & 3 deletions tests/gabc-gtex/signs/46-55.tex
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
% File generated by gregorio 4.2.0-fix-931-87f406c-4006
% File generated by gregorio 4.2.0-fix-1125-hg:4209:062bfa470f5d
\GregorioTeXAPIVersion{4.2.0}%
% Name: test-signs-46-55
\GreBeginHeaders %
\GreHeader{name}{test-signs-46-55}%
\GreEndHeaders %
\GreBeginScore{79f34dbd5347fb64bd8c4789c52e5e69b6ead660}{12}{5}{0}{0}{}{4}{\GreInitialClefPosition{3}{0}}%
\GreBeginScore{47f6b8e1e66162cb61c9b9cdb1efdaa6256a3cc2}{12}{5}{0}{0}{}{4}{\GreInitialClefPosition{3}{0}}%
\GreSetLargestClef{c}{3}{3}{c}{0}{3}%
\GreScoreOpening{%
}{%
Expand Down Expand Up @@ -174,7 +174,7 @@
\GreSyllableNoteCount{1}%
\GreGlyph{\GreCPVirgaReversaDescendens}{9}{\GreNextCustos{9}{}}{0}%
{%
\GreGlyphHeights{10}{8}%
\GreGlyphHeights{10}{7}%
}{%
\GreHEpisema{10}{\GreOCaseFinalVirgaAuctus}{0}{0}{f}{10}{}{}{0}%
\GreVEpisema{8}{\GreOCaseFinalVirgaAuctus}%
Expand Down
Binary file modified tests/gabc-output/Dominican-plicae.pdf
Binary file not shown.
Binary file modified tests/gabc-output/bugs/fix-1215.pdf
Binary file not shown.
Binary file modified tests/gabc-output/bugs/fix-790.pdf
Binary file not shown.
Binary file modified tests/gabc-output/episema_with_ledger_line.pdf
Binary file not shown.
Binary file modified tests/gabc-output/heights.pdf
Binary file not shown.
Binary file modified tests/gabc-output/lines/2-lines.pdf
Binary file not shown.
Binary file modified tests/gabc-output/lines/3-lines.pdf
Binary file not shown.
Binary file modified tests/gabc-output/lines/5-lines.pdf
Binary file not shown.
Binary file modified tests/gabc-output/queuelength.pdf
Binary file not shown.
Binary file modified tests/gabc-output/queuelength2.pdf
Binary file not shown.
Binary file modified tests/tex-output/Dominican-neumes/Dominican-neumes.pdf
Binary file not shown.
Binary file modified tests/tex-output/SalveReginaOP/SalveReginaOP.pdf
Binary file not shown.
Binary file modified tests/tex-output/bugs/fix-60/fix-60.pdf
Binary file not shown.
Binary file not shown.
37 changes: 37 additions & 0 deletions tests/tex-output/per-line-counts/per-line-counts.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
\documentclass[11pt]{article} % use larger type; default would be 10pt

% usual packages loading:
\usepackage{fontspec}
\usepackage{graphicx} % support the \includegraphics command and options
\usepackage{geometry} % See geometry.pdf to learn the layout options. There are lots.
\geometry{a4paper} % or letterpaper (US) or a5paper or....
\usepackage[allowdeprecated=false]{gregoriotex} % for gregorio score inclusion
\usepackage{fullpage} % to reduce the margins
\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
\begin{document}

\gresetinitiallines{0}

\gabcsnippet{(c4) a'(a'Z) a'(a'Z) a'(a')}

\vspace{2cm}

\grechangenextscorelinecount{2}{noteadditionalspacelinestextthreshold}{10}

\gabcsnippet{(c4) a'(a'Z) a'(a'Z) a'(a')}

\end{document}
Binary file modified tests/tex-output/snippet/snippet.pdf
Binary file not shown.
Binary file modified tests/tex-output/variable-height/variable-height.pdf
Binary file not shown.

0 comments on commit 35eb815

Please sign in to comment.