Skip to content

Commit

Permalink
Merge pull request #287 from henryso/fix-1272
Browse files Browse the repository at this point in the history 
Added a test for orientable pes oriscus.
  • Loading branch information
@henryso
henryso authored Jan 6, 2017
2 parents 91d0d08 + b384d72 commit bd313e8
Show file tree
Hide file tree
Showing 8 changed files with 205 additions and 19 deletions.
8 changes: 4 additions & 4 deletions tests/gabc-dump/glyphs/broken_shapes.dump
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ because they move in the opposite direction
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 15 (S_QUILISMA)
shape 16 (S_QUILISMA)
---------------------------------------------------------------------
type 3 (GRE_ELEMENT)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Expand Down Expand Up @@ -94,15 +94,15 @@ because they move in the opposite direction
type 3 (GRE_ELEMENT)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
type 2 (GRE_GLYPH)
glyph_type 40 (G_VIRGA_STRATA)
glyph_type 41 (G_PES_DESCENDENS_ORISCUS)
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 1 (S_PUNCTUM)
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch h
shape 14 (S_ORISCUS_SCAPUS_DESCENDENS)
shape 15 (S_ORISCUS_SCAPUS_DESCENDENS)
---------------------------------------------------------------------
type 3 (GRE_ELEMENT)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Expand Down Expand Up @@ -141,7 +141,7 @@ because they move in the opposite direction
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch h
shape 13 (S_ORISCUS_SCAPUS_ASCENDENS)
shape 14 (S_ORISCUS_SCAPUS_ASCENDENS)
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch i
Expand Down
183 changes: 183 additions & 0 deletions tests/gabc-dump/glyphs/oriscus.dump
View file
Original file line number Diff line number Diff line change
Expand Up @@ -375,4 +375,187 @@
type 1 (GRE_NOTE)
pitch e
shape 1 (S_PUNCTUM)
---------------------------------------------------------------------
type 5 (GRE_END_OF_LINE)
ragged true
=====================================================================
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
character d
---------------------------------------------------------------------
character f
---------------------------------------------------------------------
beginning of style ST_CENTER
---------------------------------------------------------------------
character O
---------------------------------------------------------------------
end of style ST_CENTER
---------------------------------------------------------------------
character /
---------------------------------------------------------------------
character /
---------------------------------------------------------------------
character e
---------------------------------------------------------------------
type 3 (GRE_ELEMENT)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
type 2 (GRE_GLYPH)
glyph_type 41 (G_PES_DESCENDENS_ORISCUS)
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch d
shape 1 (S_PUNCTUM)
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch f
shape 15 (S_ORISCUS_SCAPUS_DESCENDENS)
---------------------------------------------------------------------
type 6 (GRE_SPACE)
space 7 (SP_LARGER_SPACE)
---------------------------------------------------------------------
type 3 (GRE_ELEMENT)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
type 2 (GRE_GLYPH)
glyph_type 15 (G_PUNCTUM)
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch e
shape 1 (S_PUNCTUM)
=====================================================================
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
character d
---------------------------------------------------------------------
character f
---------------------------------------------------------------------
beginning of style ST_CENTER
---------------------------------------------------------------------
character O
---------------------------------------------------------------------
end of style ST_CENTER
---------------------------------------------------------------------
character /
---------------------------------------------------------------------
character /
---------------------------------------------------------------------
character g
---------------------------------------------------------------------
type 3 (GRE_ELEMENT)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
type 2 (GRE_GLYPH)
glyph_type 40 (G_PES_ASCENDENS_ORISCUS)
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch d
shape 1 (S_PUNCTUM)
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch f
shape 14 (S_ORISCUS_SCAPUS_ASCENDENS)
---------------------------------------------------------------------
type 6 (GRE_SPACE)
space 7 (SP_LARGER_SPACE)
---------------------------------------------------------------------
type 3 (GRE_ELEMENT)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
type 2 (GRE_GLYPH)
glyph_type 15 (G_PUNCTUM)
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 1 (S_PUNCTUM)
=====================================================================
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
character d
---------------------------------------------------------------------
character f
---------------------------------------------------------------------
beginning of style ST_CENTER
---------------------------------------------------------------------
character O
---------------------------------------------------------------------
end of style ST_CENTER
---------------------------------------------------------------------
character 1
---------------------------------------------------------------------
character /
---------------------------------------------------------------------
character /
---------------------------------------------------------------------
character e
---------------------------------------------------------------------
type 3 (GRE_ELEMENT)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
type 2 (GRE_GLYPH)
glyph_type 40 (G_PES_ASCENDENS_ORISCUS)
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch d
shape 1 (S_PUNCTUM)
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch f
shape 14 (S_ORISCUS_SCAPUS_ASCENDENS)
---------------------------------------------------------------------
type 6 (GRE_SPACE)
space 7 (SP_LARGER_SPACE)
---------------------------------------------------------------------
type 3 (GRE_ELEMENT)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
type 2 (GRE_GLYPH)
glyph_type 15 (G_PUNCTUM)
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch e
shape 1 (S_PUNCTUM)
=====================================================================
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
character d
---------------------------------------------------------------------
character f
---------------------------------------------------------------------
beginning of style ST_CENTER
---------------------------------------------------------------------
character O
---------------------------------------------------------------------
end of style ST_CENTER
---------------------------------------------------------------------
character 0
---------------------------------------------------------------------
character /
---------------------------------------------------------------------
character /
---------------------------------------------------------------------
character g
---------------------------------------------------------------------
type 3 (GRE_ELEMENT)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
type 2 (GRE_GLYPH)
glyph_type 41 (G_PES_DESCENDENS_ORISCUS)
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch d
shape 1 (S_PUNCTUM)
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch f
shape 15 (S_ORISCUS_SCAPUS_DESCENDENS)
---------------------------------------------------------------------
type 6 (GRE_SPACE)
space 7 (SP_LARGER_SPACE)
---------------------------------------------------------------------
type 3 (GRE_ELEMENT)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
type 2 (GRE_GLYPH)
glyph_type 15 (G_PUNCTUM)
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 1 (S_PUNCTUM)
=====================================================================
5 changes: 3 additions & 2 deletions tests/gabc-dump/glyphs/oriscus.exp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
name: oriscus;
generated-by: gregorio 4.2.0-rc2-release-4.2-cd7f78a-3869;
generated-by: gregorio 4.2.0-fix-1272-d0e5f47-4064;
%%
(c3)go(go0) goh(go1h) gof(go0f) go0(go0) ho1(ho1) go(go0) go<sp>~</sp>(go~Z)
fo(fo1) hof<sp>~</sp>(ho0f~) eOg(eO1g) go0i(go0i) go1e(go1e) gO0i(gO0i) gO1e(gO1e)
fo(fo1) hof<sp>~</sp>(ho0f~) eOg(eO1g) go0i(go0i) go1e(go1e) gO0i(gO0i) gO1e(gO1eZ)
dfO//e(dfO0//e) dfO//g(dfO1//g) dfO1//e(dfO1//e) dfO0//g(dfO0//g)
4 changes: 3 additions & 1 deletion tests/gabc-dump/glyphs/oriscus.gabc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,6 @@ name: oriscus;
go(go) goh(goh) gof(gof) go0(go0) ho1(ho1) go(go) go<sp>~</sp>(go~Z)
fo(fo) hof<sp>~</sp>(hof~) eOg(eOg)
go0i(go0i) go1e(go1e)
gO0i(gO0i) gO1e(gO1e)
gO0i(gO0i) gO1e(gO1eZ)
dfO//e(dfO//e) dfO//g(dfO//g)
dfO1//e(dfO1//e) dfO0//g(dfO0//g)
Binary file modified tests/gabc-dump/glyphs/oriscus.pdf
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion tests/gabc-dump/glyphs/stemmed_oriscus.dump
View file
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@
type 3 (GRE_ELEMENT)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
type 2 (GRE_GLYPH)
glyph_type 40 (G_VIRGA_STRATA)
glyph_type 41 (G_PES_DESCENDENS_ORISCUS)
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch e
Expand Down
14 changes: 7 additions & 7 deletions tests/gabc-gtex/PopulusSion.tex
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
% File generated by gregorio 4.2.0-fix-931-87f406c-4006
% File generated by gregorio 4.2.0-develop-6c46cbd-4063
\GregorioTeXAPIVersion{4.2.0}%
% Name: Pópulus Sion
\GreBeginHeaders %
Expand All @@ -10,7 +10,7 @@
\GreHeader{transcription-date}{2006}%
\GreHeader{style}{modern}%
\GreEndHeaders %
\GreBeginScore{f168a706fdbce1fa2a053f674b58f3d4967151b3}{13}{7}{0}{0}{}{4}{\GreInitialClefPosition{3}{0}}%
\GreBeginScore{22c160f094046f2b409414cdb489c075286b7df2}{13}{7}{0}{0}{}{4}{\GreInitialClefPosition{3}{0}}%
\GreSetLargestClef{c}{3}{3}{c}{0}{3}%
\GreScoreOpening{%
}{%
Expand Down Expand Up @@ -86,7 +86,7 @@
\GrePunctumMora{7}{1}{1}{0}%
}{}%
\GreEndOfGlyph{1}%
\GreGlyph{\GreCPPesQuilismaOneNothing}{9}{\GreNextCustos{10}{}}{4}%
\GreGlyph{\GreCPQuilismaPesOneNothing}{9}{\GreNextCustos{10}{}}{4}%
{%
\GreGlyphHeights{10}{9}%
}{}{}%
Expand Down Expand Up @@ -362,7 +362,7 @@
\GrePunctumMora{12}{3}{0}{0}%
}{}%
\GreEndOfGlyph{1}%
\GreGlyph{\GreCPPesQuilismaOneNothing}{12}{\GreNextCustos{12}{}}{4}%
\GreGlyph{\GreCPQuilismaPesOneNothing}{12}{\GreNextCustos{12}{}}{4}%
{%
\GreGlyphHeights{13}{12}%
}{}{}%
Expand Down Expand Up @@ -491,7 +491,7 @@
\GreGlyphHeights{10}{8}%
}{}{}%
\GreEndOfGlyph{1}%
\GreGlyph{\GreCPPesQuilismaOneNothing}{9}{\GreNextCustos{7}{}}{4}%
\GreGlyph{\GreCPQuilismaPesOneNothing}{9}{\GreNextCustos{7}{}}{4}%
{%
\GreGlyphHeights{10}{9}%
}{}{}%
Expand Down Expand Up @@ -639,7 +639,7 @@
\GreGlyphHeights{11}{11}%
}{}{}%
\GreEndOfGlyph{1}%
\GreGlyph{\GreCPPesQuilismaOneNothing}{12}{\GreNextCustos{11}{}}{4}%
\GreGlyph{\GreCPQuilismaPesOneNothing}{12}{\GreNextCustos{11}{}}{4}%
{%
\GreGlyphHeights{13}{12}%
}{}{}%
Expand Down Expand Up @@ -751,7 +751,7 @@
\GreGlyphHeights{11}{11}%
}{}{}%
\GreEndOfGlyph{1}%
\GreGlyph{\GreCPPesQuilismaOneNothing}{12}{\GreNextCustos{11}{}}{4}%
\GreGlyph{\GreCPQuilismaPesOneNothing}{12}{\GreNextCustos{11}{}}{4}%
{%
\GreGlyphHeights{13}{12}%
}{}{}%
Expand Down
8 changes: 4 additions & 4 deletions tests/gabc-gtex/fusion.tex
View file
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-develop-6c46cbd-4063
\GregorioTeXAPIVersion{4.2.0}%
% Name: fusion
\GreBeginHeaders %
\GreHeader{name}{fusion}%
\GreEndHeaders %
\GreBeginScore{82740d762575a321ca4006a670524c2c9021c5f4}{13}{4}{0}{0}{}{4}{\GreInitialClefPosition{3}{0}}%
\GreBeginScore{ad2c3a18d6b789abb1cd37c059bd302329e41bab}{13}{4}{0}{0}{}{4}{\GreInitialClefPosition{3}{0}}%
\GreSetLargestClef{c}{3}{3}{c}{0}{3}%
\GreScoreOpening{%
}{%
Expand Down Expand Up @@ -636,7 +636,7 @@
\GreGlyphHeights{8}{8}%
}{}{}%
\GreEndOfGlyph{1}%
\GreGlyph{\GreCPPesQuilismaOneNothing}{9}{\GreNextCustos{7}{}}{4}%
\GreGlyph{\GreCPQuilismaPesOneNothing}{9}{\GreNextCustos{7}{}}{4}%
{%
\GreGlyphHeights{10}{9}%
}{}{}%
Expand All @@ -649,7 +649,7 @@
\GreGlyphHeights{7}{7}%
}{}{}%
\GreEndOfGlyph{1}%
\GreGlyph{\GreCPPesQuilismaTwoNothing}{9}{\GreNextCustos{8}{}}{4}%
\GreGlyph{\GreCPQuilismaPesTwoNothing}{9}{\GreNextCustos{8}{}}{4}%
{%
\GreGlyphHeights{11}{9}%
}{}{}%
Expand Down

0 comments on commit bd313e8

Please sign in to comment.