Skip to content

Commit

Permalink
Merge pull request #74 from henryso/fix-716
Browse files Browse the repository at this point in the history
Updated tests and expectations for ledger line heuristic changes.
  • Loading branch information
henryso committed Dec 28, 2015
2 parents 400ae1b + b51f6f4 commit c4a7d25
Show file tree
Hide file tree
Showing 16 changed files with 2,665 additions and 66 deletions.
2,561 changes: 2,561 additions & 0 deletions tests/gabc-dump/episema_with_ledger_line.dump

Large diffs are not rendered by default.

31 changes: 31 additions & 0 deletions tests/gabc-dump/episema_with_ledger_line.gabc
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: episema with ledger line;
%%
(c3) k_(k_) c_0(c_0) (:)
l/k_(l/k_) b/c_0(b/c_0) (:)
k_/l(k_/l) c_0/b(c_0/b) (:)
m/k_(m/k_) a/c_0(a/c_0) (:)
k_/m(k_/m) c_0/a(c_0/a) (::)
k_j_(k_j_) c_0!d_0(c_0!d_0) (:)
l/k_j_(l/k_j_) b/c_0!d_0(b/c_0!d_0) (:)
k_j_/l(k_j_/l) c_0!d_0/b(c_0!d_0/b) (:)
k_j_i_(k_j_i_) c_0!d_0!e_0(c_0!d_0!e_0) (:)
l/k_j_i_(l/k_j_i_) b/c_0!d_0!e_0(b/c_0!d_0!e_0) (:)
k_j_i_/l(k_j_i_/l) c_0!d_0!e_0/b(c_0!d_0!e_0/b) (:)
j_jk_(j_jk_) c_0c_0d(c_0c_0d) (:)
l/j_jk_(l/j_jk_) b/c_0c_0d(b/c_0c_0d) (:)
j_jk_/l(j_jk_/l) c_0c_0d/b(c_0c_0d/b) (::)
k<v>[</v>hl:1<v>]</v>_(k[hl:1]_)
c<v>[</v>ll:1<v>]</v>_0(c[ll:1]_0) (:)
l/k<v>[</v>hl:0<v>]</v>_(l/k[hl:0]_)
b/c<v>[</v>ll:0<v>]</v>_0(b/c[ll:0]_0) (:)
k<v>[</v>hl:0<v>]</v>_/l(k[hl:0]_/l)
c<v>[</v>ll:0<v>]</v>_0/b(c[ll:0]_0/b) (::)
l/m_0(l/m_0) b/a_(b/a_) (:)
m_0/l(m_0/l) a_/b(a_/b) (:)
l/m_0m_0(l/m_0m_0) b/a_a_(b/a_a_) (:)
m_0m_0/l(m_0m_0/l) a_a_/b(a_a_/b) (::)
k_kl(k_kl) a_ab(a_ab) (:)
k_km(k_km) a_ab(a_ac) (:)
j_jk(j_jk) c_cd(c_cd) (:)
k_jl(k_jl) k_jk(k_jk) b_ac(b_ac) (:)
k_j_l(k_j_l) k_j_k(k_j_k) b_a_c(b_a_c) (::)
4 changes: 4 additions & 0 deletions tests/gabc-gabc/episema_with_ledger_line.exp
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
name: episema with ledger line;
generated-by: gregorio 4.0.0-fix-716-9c77af6-2824;
%%
(c3)k_(k_) c_0(c_0) (:) l/k_(l/k_) b/c_0(b/c_0) (:) k_/l(k_/l) c_0/b(c_0/b) (:) m/k_(m/k_) a/c_0(a/c_0) (:) k_/m(k_/m) c_0/a(c_0/a) (::) k_j_(k_j_) c_0!d_0(c_0!d_0) (:) l/k_j_(l/k_j_) b/c_0!d_0(b/c_0!d_0) (:) k_j_/l(k_j_/l) c_0!d_0/b(c_0!d_0/b) (:) k_j_i_(k_j_i_) c_0!d_0!e_0(c_0!d_0!e_0) (:) l/k_j_i_(l/k_j_i_) b/c_0!d_0!e_0(b/c_0!d_0!e_0) (:) k_j_i_/l(k_j_i_/l) c_0!d_0!e_0/b(c_0!d_0!e_0/b) (:) j_jk_(j_jk_) c_0c_0d(c_0c_0d) (:) l/j_jk_(l/j_jk_) b/c_0c_0d(b/c_0c_0d) (:) j_jk_/l(j_jk_/l) c_0c_0d/b(c_0c_0d/b) (::) k<v>[</v>hl:1<v>]</v>_(k_[hl:1]) c<v>[</v>ll:1<v>]</v>_0(c_0[ll:1]) (:) l/k<v>[</v>hl:0<v>]</v>_(l/k_[hl:0]) b/c<v>[</v>ll:0<v>]</v>_0(b/c_0[ll:0]) (:) k<v>[</v>hl:0<v>]</v>_/l(k_[hl:0]/l) c<v>[</v>ll:0<v>]</v>_0/b(c_0[ll:0]/b) (::) l/m_0(l/m_0) b/a_(b/a_) (:) m_0/l(m_0/l) a_/b(a_/b) (:) l/m_0m_0(l/m_0m_0) b/a_a_(b/a_a_) (:) m_0m_0/l(m_0m_0/l) a_a_/b(a_a_/b) (::) k_kl(k_kl) a_ab(a_ab) (:) k_km(k_km) a_ab(a_ac) (:) j_jk(j_jk) c_cd(c_cd) (:) k_jl(k_jl) k_jk(k_jk) b_ac(b_ac) (:) k_j_l(k_j_l) k_j_k(k_j_k) b_a_c(b_a_c) (::)
1 change: 1 addition & 0 deletions tests/gabc-gabc/episema_with_ledger_line.gabc
24 changes: 12 additions & 12 deletions tests/gabc-gtex/PopulusSion.tex
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
% File generated by gregorio 4.0.0-rc1
\GregorioTeXAPIVersion{4.0.0-rc1}%
% File generated by gregorio 4.0.0-fix-716-12761c2-2823
\GregorioTeXAPIVersion{4.0.0}%
% Name: Pópulus Sion
\GreBeginScore{b52ba4353d665f3533412f22193fa4f9414db56d}{13}{7}{0}{0}{}%
\GreBeginScore{c9bc4514cd1033d1e89e901fa2034872f7ba613c}{13}{7}{0}{0}{}%
\GreScoreOpening{%
}{%
\GreSetInitialClef{c}{3}{3}%
Expand Down Expand Up @@ -157,9 +157,9 @@
{%
\GreGlyphHeights{9}{7}%
}{%
\GreHEpisema{9}{\GreOCaseInitialPunctum}{0}{0}{f}{9}%
\GreHEpisema{9}{\GreOCasePenultBeforePunctumOne}{0}{0}{f}{9}%
\GreHEpisema{9}{\GreOCaseFinalPunctum}{0}{0}{f}{9}%
\GreHEpisema{9}{\GreOCaseInitialPunctum}{0}{0}{f}{9}{}%
\GreHEpisema{9}{\GreOCasePenultBeforePunctumOne}{0}{0}{f}{9}{}%
\GreHEpisema{9}{\GreOCaseFinalPunctum}{0}{0}{f}{9}{}%
}{}%
}%
\GreSyllable{\GreSetThisSyllable{t}{e}{s}{t}{es}}{}{\GreUnstyled}{1}{\GreSetNextSyllable{}{:}{}{:}{}}{}{11}{}{%
Expand Down Expand Up @@ -331,9 +331,9 @@
{%
\GreGlyphHeights{13}{11}%
}{%
\GreHEpisema{13}{\GreOCaseInitialPunctum}{0}{0}{f}{13}%
\GreHEpisema{13}{\GreOCasePenultBeforePunctumOne}{0}{0}{f}{13}%
\GreHEpisema{13}{\GreOCaseFinalPunctum}{0}{0}{f}{13}%
\GreHEpisema{13}{\GreOCaseInitialPunctum}{0}{0}{f}{13}{}%
\GreHEpisema{13}{\GreOCasePenultBeforePunctumOne}{0}{0}{f}{13}{}%
\GreHEpisema{13}{\GreOCaseFinalPunctum}{0}{0}{f}{13}{}%
}{}%
}%
\GreSyllable{\GreSetThisSyllable{}{æ}{,}{æ}{,}}{}{\GreUnstyled}{1}{\GreSetNextSyllable{}{}{}{}{}}{}{11}{}{%
Expand Down Expand Up @@ -443,9 +443,9 @@
{%
\GreGlyphHeights{9}{7}%
}{%
\GreHEpisema{9}{\GreOCaseInitialPunctum}{0}{0}{f}{9}%
\GreHEpisema{9}{\GreOCasePenultBeforePunctumOne}{0}{0}{f}{9}%
\GreHEpisema{9}{\GreOCaseFinalPunctum}{0}{0}{f}{9}%
\GreHEpisema{9}{\GreOCaseInitialPunctum}{0}{0}{f}{9}{}%
\GreHEpisema{9}{\GreOCasePenultBeforePunctumOne}{0}{0}{f}{9}{}%
\GreHEpisema{9}{\GreOCaseFinalPunctum}{0}{0}{f}{9}{}%
}{}%
}%
\GreSyllable{\GreSetThisSyllable{str}{i}{.}{s}{tri.}}{}{\GreUnstyled}{1}{\GreSetNextSyllable{}{Ps.}{}{P}{s.}}{}{12}{}{%
Expand Down
62 changes: 31 additions & 31 deletions tests/gabc-gtex/fusion.tex
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
% File generated by gregorio 4.0.0-develop-e7913c6-2820
% File generated by gregorio 4.0.0-fix-716-12761c2-2823
\GregorioTeXAPIVersion{4.0.0}%
% Name: fusion
\GreBeginScore{e635972d718d4f1dd78ed5bf43d418c2012fb709}{13}{5}{0}{0}{}%
\GreBeginScore{567c22d8b2179015fc6902cfe177cf131360eb04}{13}{5}{0}{0}{}%
\GreScoreOpening{%
}{%
\GreSetInitialClef{c}{3}{3}%
Expand Down Expand Up @@ -132,7 +132,7 @@
{%
\GreGlyphHeights{11}{7}%
}{%
\GreHEpisema{11}{\GreOCaseInitialVirga}{0}{0}{f}{11}%
\GreHEpisema{11}{\GreOCaseInitialVirga}{0}{0}{f}{11}{}%
}{}%
}%
%
Expand All @@ -158,7 +158,7 @@
{%
\GreGlyphHeights{11}{10}%
}{%
\GreHEpisema{10}{\GreOCaseFinalQuilisma}{0}{1}{f}{10}%
\GreHEpisema{10}{\GreOCaseFinalQuilisma}{0}{1}{f}{10}{}%
}{}%
\GreEndOfGlyph{1}%
\GreFuse\GreGlyph{\GreCPFlexusNobarOneOneUp}{12}{12}{8}%
Expand Down Expand Up @@ -187,15 +187,15 @@
{%
\GreGlyphHeights{13}{11}%
}{%
\GreHEpisemaBridge{13}{0}{-1}%
\GreHEpisema{13}{\GreOCaseFinalQuilisma}{0}{0}{f}{13}%
\GreHEpisemaBridge{13}{0}{-1}{}%
\GreHEpisema{13}{\GreOCaseFinalQuilisma}{0}{0}{f}{13}{}%
}{}%
\GreEndOfGlyph{1}%
\GreFuse\GreGlyph{\GreCPFlexusNobarOneOneUp}{12}{12}{8}%
{%
\GreGlyphHeights{13}{11}%
}{%
\GreHEpisema{13}{\GreOCasePorrAuctusInitialAny}{0}{0}{f}{13}%
\GreHEpisema{13}{\GreOCasePorrAuctusInitialAny}{0}{0}{f}{13}{}%
}{}%
\GreEndOfGlyph{1}%
\GreFuse\GreGlyph{\GreCPPunctumOneDown}{12}{11}{0}%
Expand All @@ -219,15 +219,15 @@
{%
\GreGlyphHeights{13}{11}%
}{%
\GreHEpisemaBridge{13}{0}{-1}%
\GreHEpisema{13}{\GreOCaseFinalQuilisma}{0}{0}{f}{13}%
\GreHEpisemaBridge{13}{0}{-1}{}%
\GreHEpisema{13}{\GreOCaseFinalQuilisma}{0}{0}{f}{13}{}%
}{}%
\GreEndOfGlyph{1}%
\GreFuse\GreGlyph{\GreCPFlexusNobarOneOneUp}{12}{12}{8}%
{%
\GreGlyphHeights{13}{11}%
}{%
\GreHEpisema{13}{\GreOCasePorrAuctusInitialAny}{1}{0}{f}{13}%
\GreHEpisema{13}{\GreOCasePorrAuctusInitialAny}{1}{0}{f}{13}{}%
}{}%
\GreEndOfGlyph{1}%
\GreFuse\GreGlyph{\GreCPPunctumOneDown}{12}{11}{0}%
Expand All @@ -251,23 +251,23 @@
{%
\GreGlyphHeights{13}{10}%
}{%
\GreHEpisemaBridge{13}{0}{-1}%
\GreHEpisema{13}{\GreOCaseFinalQuilisma}{0}{0}{f}{13}%
\GreHEpisemaBridge{13}{0}{-1}{}%
\GreHEpisema{13}{\GreOCaseFinalQuilisma}{0}{0}{f}{13}{}%
\GreVEpisema{10}{\GreOCaseFinalQuilisma}%
}{}%
\GreEndOfGlyph{1}%
\GreFuse\GreGlyph{\GreCPFlexusNobarOneOneUp}{12}{12}{8}%
{%
\GreGlyphHeights{13}{11}%
}{%
\GreHEpisema{13}{\GreOCasePorrAuctusInitialAny}{1}{0}{f}{13}%
\GreHEpisema{13}{\GreOCasePorrAuctusInitialAny}{1}{0}{f}{13}{}%
}{}%
\GreEndOfGlyph{1}%
\GreFuse\GreGlyph{\GreCPPunctumOneDown}{12}{11}{0}%
{%
\GreGlyphHeights{13}{12}%
}{%
\GreHEpisema{13}{\GreOCaseFinalPunctum}{0}{0}{f}{13}%
\GreHEpisema{13}{\GreOCaseFinalPunctum}{0}{0}{f}{13}{}%
}{}%
\GreEndOfGlyph{1}%
\GreFuse\GreGlyph{\GreCPFlexusNobarOneDeminutus}{11}{10}{9}%
Expand Down Expand Up @@ -305,7 +305,7 @@
{%
\GreGlyphHeights{12}{9}%
}{%
\GreHEpisema{12}{\GreOCasePorrAuctusInitialAny}{0}{0}{f}{12}%
\GreHEpisema{12}{\GreOCasePorrAuctusInitialAny}{0}{0}{f}{12}{}%
}{}%
\GreEndOfGlyph{1}%
\GreFuse\GreGlyph{\GreCPUpperPesOneNothing}{12}{12}{0}%
Expand All @@ -324,7 +324,7 @@
{%
\GreGlyphHeights{11}{8}%
}{%
\GreHEpisema{8}{\GreOCaseFinalPunctum}{0}{1}{f}{8}%
\GreHEpisema{8}{\GreOCaseFinalPunctum}{0}{1}{f}{8}{}%
}{}%
\GreEndOfGlyph{1}%
\GreFuse\GreGlyph{\GreCPUpperPesOneDeminutus}{12}{12}{0}%
Expand All @@ -343,14 +343,14 @@
{%
\GreGlyphHeights{13}{9}%
}{%
\GreHEpisema{13}{\GreOCasePorrAuctusInitialAny}{2}{0}{f}{13}%
\GreHEpisema{13}{\GreOCasePorrAuctusInitialAny}{2}{0}{f}{13}{}%
}{}%
\GreEndOfGlyph{1}%
\GreFuse\GreGlyph{\GreCPUpperFlexusTwoNothing}{12}{8}{1}%
{%
\GreGlyphHeights{13}{10}%
}{%
\GreHEpisema{13}{\GreOCaseInitialConnectedVirga}{0}{0}{f}{13}%
\GreHEpisema{13}{\GreOCaseInitialConnectedVirga}{0}{0}{f}{13}{}%
}{}%
}%
%
Expand Down Expand Up @@ -381,7 +381,7 @@
{%
\GreGlyphHeights{13}{9}%
}{%
\GreHEpisema{13}{\GreOCasePorrAuctusInitialAny}{2}{0}{f}{13}%
\GreHEpisema{13}{\GreOCasePorrAuctusInitialAny}{2}{0}{f}{13}{}%
}{}%
\GreEndOfGlyph{1}%
\GreFuse\GreGlyph{\GreCPUpperPunctumTwoDown}{12}{10}{0}%
Expand Down Expand Up @@ -444,7 +444,7 @@
{%
\GreGlyphHeights{13}{9}%
}{%
\GreHEpisema{13}{\GreOCasePorrAuctusInitialAny}{2}{0}{f}{13}%
\GreHEpisema{13}{\GreOCasePorrAuctusInitialAny}{2}{0}{f}{13}{}%
}{}%
\GreEndOfGlyph{1}%
\GreFuse\GreGlyph{\GreCPUpperPunctumTwoDown}{12}{10}{0}%
Expand Down Expand Up @@ -485,7 +485,7 @@
{%
\GreGlyphHeights{8}{6}%
}{%
\GreHEpisema{6}{\GreOCaseLeadingPunctum}{0}{1}{f}{6}%
\GreHEpisema{6}{\GreOCaseLeadingPunctum}{0}{1}{f}{6}{}%
\GreVEpisema{7}{\GreOCaseLeadingPunctum}%
}{}%
\GreEndOfGlyph{1}%
Expand All @@ -500,7 +500,7 @@
{%
\GreGlyphHeights{8}{7}%
}{%
\GreHEpisema{7}{\GreOCaseLeadingPunctum}{0}{1}{f}{7}%
\GreHEpisema{7}{\GreOCaseLeadingPunctum}{0}{1}{f}{7}{}%
}{}%
\GreEndOfGlyph{1}%
\GreFuse\GreGlyph{\GreCPFlexusNobarThreeOneUp}{11}{9}{1}%
Expand All @@ -526,15 +526,15 @@
{%
\GreGlyphHeights{12}{9}%
}{%
\GreHEpisemaBridge{12}{0}{-1}%
\GreHEpisema{12}{\GreOCaseFinalPunctum}{0}{0}{f}{12}%
\GreHEpisemaBridge{12}{0}{-1}{}%
\GreHEpisema{12}{\GreOCaseFinalPunctum}{0}{0}{f}{12}{}%
}{}%
\GreEndOfGlyph{1}%
\GreFuse\GreGlyph{\GreCPUpperFlexusThreeNothing}{11}{9}{1}%
{%
\GreGlyphHeights{12}{8}%
}{%
\GreHEpisema{12}{\GreOCaseInitialConnectedVirga}{0}{0}{f}{12}%
\GreHEpisema{12}{\GreOCaseInitialConnectedVirga}{0}{0}{f}{12}{}%
}{}%
}%
%
Expand All @@ -543,15 +543,15 @@
{%
\GreGlyphHeights{12}{9}%
}{%
\GreHEpisemaBridge{12}{0}{-1}%
\GreHEpisema{12}{\GreOCaseFinalPunctum}{0}{0}{f}{12}%
\GreHEpisemaBridge{12}{0}{-1}{}%
\GreHEpisema{12}{\GreOCaseFinalPunctum}{0}{0}{f}{12}{}%
}{}%
\GreEndOfGlyph{1}%
\GreFuse\GreGlyph{\GreCPFlexusNobarOneTwoUp}{10}{11}{8}%
{%
\GreGlyphHeights{12}{9}%
}{%
\GreHEpisema{12}{\GreOCasePorrAuctusInitialAny}{1}{0}{f}{12}%
\GreHEpisema{12}{\GreOCasePorrAuctusInitialAny}{1}{0}{f}{12}{}%
}{}%
\GreEndOfGlyph{1}%
\GreFuse\GreGlyph{\GreCPUpperFlexusThreeNothing}{11}{9}{1}%
Expand All @@ -570,7 +570,7 @@
{%
\GreGlyphHeights{12}{9}%
}{%
\GreHEpisema{12}{\GreOCasePorrAuctusInitialAny}{1}{0}{f}{12}%
\GreHEpisema{12}{\GreOCasePorrAuctusInitialAny}{1}{0}{f}{12}{}%
}{}%
\GreEndOfGlyph{1}%
\GreFuse\GreGlyph{\GreCPUpperFlexusThreeNothing}{11}{9}{1}%
Expand All @@ -589,8 +589,8 @@
{%
\GreGlyphHeights{12}{9}%
}{%
\GreHEpisema{12}{\GreOCaseInitialVirga}{0}{0}{f}{12}%
\GreHEpisema{12}{\GreOCaseFinalPunctum}{0}{0}{f}{12}%
\GreHEpisema{12}{\GreOCaseInitialVirga}{0}{0}{f}{12}{}%
\GreHEpisema{12}{\GreOCaseFinalPunctum}{0}{0}{f}{12}{}%
}{}%
\GreEndOfGlyph{1}%
\GreGlyph{\GreCPFlexusNobarThreeNothing}{11}{8}{1}%
Expand Down
Loading

0 comments on commit c4a7d25

Please sign in to comment.