Skip to content

Commit

Permalink
Merge pull request gregorio-project#265 from henryso/fix-1220
Browse files Browse the repository at this point in the history 
Updated tests for porrectus determination correction.
  • Loading branch information
@eroux
eroux authored Sep 8, 2016
2 parents 3011df7 + 3f963b3 commit 3f43c9e
Show file tree
Hide file tree
Showing 7 changed files with 232 additions and 39 deletions.
75 changes: 40 additions & 35 deletions tests/gabc-dump/glyphs/choral_signs.dump
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
=====================================================================
SCORE
=====================================================================
type 5 (GRE_SYLLABLE)
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
character a
Expand All @@ -42,7 +42,7 @@
shape 1 (S_PUNCTUM)
Choral Sign "c"
=====================================================================
type 5 (GRE_SYLLABLE)
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
beginning of style ST_CENTER
Expand All @@ -68,7 +68,7 @@
shape 1 (S_PUNCTUM)
Choral Sign "t"
=====================================================================
type 5 (GRE_SYLLABLE)
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
beginning of style ST_CENTER
Expand Down Expand Up @@ -98,7 +98,7 @@
auto hepisema size 0 (H_NORMAL)
auto hepisema bridge true
=====================================================================
type 5 (GRE_SYLLABLE)
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
beginning of style ST_CENTER
Expand Down Expand Up @@ -127,7 +127,7 @@
auto hepisema size 0 (H_NORMAL)
auto hepisema bridge true
=====================================================================
type 5 (GRE_SYLLABLE)
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
beginning of style ST_CENTER
Expand Down Expand Up @@ -157,10 +157,10 @@
auto hepisema size 0 (H_NORMAL)
auto hepisema bridge true
---------------------------------------------------------------------
type 6 (GRE_END_OF_LINE)
type 5 (GRE_END_OF_LINE)
ragged true
=====================================================================
type 5 (GRE_SYLLABLE)
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
beginning of style ST_CENTER
Expand All @@ -179,7 +179,7 @@
shape 1 (S_PUNCTUM)
Choral Sign "c"
=====================================================================
type 5 (GRE_SYLLABLE)
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
beginning of style ST_CENTER
Expand All @@ -202,7 +202,7 @@
pitch h
shape 1 (S_PUNCTUM)
=====================================================================
type 5 (GRE_SYLLABLE)
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
beginning of style ST_CENTER
Expand All @@ -225,7 +225,7 @@
shape 1 (S_PUNCTUM)
Choral Sign "c"
=====================================================================
type 5 (GRE_SYLLABLE)
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
beginning of style ST_CENTER
Expand All @@ -252,7 +252,7 @@
pitch g
shape 1 (S_PUNCTUM)
=====================================================================
type 5 (GRE_SYLLABLE)
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
beginning of style ST_CENTER
Expand All @@ -279,7 +279,7 @@
pitch g
shape 1 (S_PUNCTUM)
=====================================================================
type 5 (GRE_SYLLABLE)
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
beginning of style ST_CENTER
Expand All @@ -306,7 +306,7 @@
shape 1 (S_PUNCTUM)
Choral Sign "c"
=====================================================================
type 5 (GRE_SYLLABLE)
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
beginning of style ST_CENTER
Expand Down Expand Up @@ -337,7 +337,7 @@
pitch h
shape 1 (S_PUNCTUM)
=====================================================================
type 5 (GRE_SYLLABLE)
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
beginning of style ST_CENTER
Expand Down Expand Up @@ -368,7 +368,7 @@
pitch h
shape 1 (S_PUNCTUM)
=====================================================================
type 5 (GRE_SYLLABLE)
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
beginning of style ST_CENTER
Expand Down Expand Up @@ -399,7 +399,7 @@
pitch h
shape 1 (S_PUNCTUM)
=====================================================================
type 5 (GRE_SYLLABLE)
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
beginning of style ST_CENTER
Expand Down Expand Up @@ -432,10 +432,10 @@
shape 1 (S_PUNCTUM)
Choral Sign "c"
---------------------------------------------------------------------
type 6 (GRE_END_OF_LINE)
type 5 (GRE_END_OF_LINE)
ragged true
=====================================================================
type 5 (GRE_SYLLABLE)
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
beginning of style ST_CENTER
Expand All @@ -460,7 +460,7 @@
pitch g
shape 1 (S_PUNCTUM)
=====================================================================
type 5 (GRE_SYLLABLE)
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
beginning of style ST_CENTER
Expand All @@ -485,7 +485,7 @@
shape 1 (S_PUNCTUM)
Choral Sign "c"
=====================================================================
type 5 (GRE_SYLLABLE)
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
beginning of style ST_CENTER
Expand Down Expand Up @@ -514,7 +514,7 @@
pitch h
shape 1 (S_PUNCTUM)
=====================================================================
type 5 (GRE_SYLLABLE)
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
beginning of style ST_CENTER
Expand Down Expand Up @@ -543,7 +543,7 @@
pitch h
shape 1 (S_PUNCTUM)
=====================================================================
type 5 (GRE_SYLLABLE)
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
beginning of style ST_CENTER
Expand Down Expand Up @@ -572,7 +572,7 @@
shape 1 (S_PUNCTUM)
Choral Sign "c"
=====================================================================
type 5 (GRE_SYLLABLE)
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
beginning of style ST_CENTER
Expand Down Expand Up @@ -605,7 +605,7 @@
pitch g
shape 1 (S_PUNCTUM)
=====================================================================
type 5 (GRE_SYLLABLE)
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
beginning of style ST_CENTER
Expand Down Expand Up @@ -638,7 +638,7 @@
pitch g
shape 1 (S_PUNCTUM)
=====================================================================
type 5 (GRE_SYLLABLE)
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
beginning of style ST_CENTER
Expand Down Expand Up @@ -671,7 +671,7 @@
pitch g
shape 1 (S_PUNCTUM)
=====================================================================
type 5 (GRE_SYLLABLE)
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
beginning of style ST_CENTER
Expand Down Expand Up @@ -704,10 +704,10 @@
shape 1 (S_PUNCTUM)
Choral Sign "c"
---------------------------------------------------------------------
type 6 (GRE_END_OF_LINE)
type 5 (GRE_END_OF_LINE)
ragged true
=====================================================================
type 5 (GRE_SYLLABLE)
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
beginning of style ST_CENTER
Expand All @@ -725,14 +725,14 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 14 (S_QUILISMA)
shape 16 (S_QUILISMA)
Choral Sign "c"
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch h
shape 1 (S_PUNCTUM)
=====================================================================
type 5 (GRE_SYLLABLE)
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
beginning of style ST_CENTER
Expand All @@ -746,22 +746,27 @@
type 3 (GRE_ELEMENT)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
type 2 (GRE_GLYPH)
glyph_type 23 (G_PORRECTUS)
glyph_type 19 (G_FLEXA)
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 14 (S_QUILISMA)
shape 16 (S_QUILISMA)
Choral Sign "c"
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch f
shape 1 (S_PUNCTUM)
---------------------------------------------------------------------
type 3 (GRE_ELEMENT)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
type 2 (GRE_GLYPH)
glyph_type 15 (G_PUNCTUM)
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 1 (S_PUNCTUM)
=====================================================================
type 5 (GRE_SYLLABLE)
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
beginning of style ST_CENTER
Expand All @@ -779,7 +784,7 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 14 (S_QUILISMA)
shape 16 (S_QUILISMA)
Choral Sign "c"
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
Expand All @@ -794,7 +799,7 @@
pitch h
shape 1 (S_PUNCTUM)
=====================================================================
type 5 (GRE_SYLLABLE)
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
beginning of style ST_CENTER
Expand Down
4 changes: 2 additions & 2 deletions tests/gabc-dump/glyphs/choral_signs.exp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: choral signs;
generated-by: gregorio 4.1.0-beta3-fix-905-2e2e49a-3303;
generated-by: gregorio 4.2.0-rc3-develop-d01f368-3955;
%%
(c3)ab(gh) ab(hg) ab(h._g_) ab(f_g_) ab(h._g_Z)
1(g) 2(gh) 3(gh) 4(ghg) 5(ghg) 6(ghg) 7(ghgh) 8(ghgh) 9(ghgh) 10(ghghZ)
11(hg) 12(hg) 13(hgh) 14(hgh) 15(hgh) 16(hghg) 17(hghg) 18(hghg) 19(hghgZ)
20(gwh) 21(gwfg) 22(gwhgh) 23(i'.h)
20(gwh) 21(gwf/g) 22(gwhgh) 23(i'.h)
Binary file modified tests/gabc-dump/glyphs/choral_signs.pdf
View file
Binary file not shown.
Loading

0 comments on commit 3f43c9e

Please sign in to comment.