Merge pull request #107 from henryso/fix-800

Updated expectations and added tests for ad hoc custos at line break.
gregorio-project · Jan 21, 2016 · e819f60 · e819f60
2 parents 9ea7a02 + 83d4cb4
commit e819f60
Show file tree

Hide file tree

Showing 72 changed files with 2,890 additions and 1,867 deletions.
diff --git a/tests/gabc-dump/5-lines.dump b/tests/gabc-dump/5-lines.dump
diff --git a/tests/gabc-dump/bugs/fix-20.dump b/tests/gabc-dump/bugs/fix-20.dump
diff --git a/tests/gabc-dump/eol.dump b/tests/gabc-dump/eol.dump
diff --git a/tests/gabc-dump/eol.gabc b/tests/gabc-dump/eol.gabc
@@ -0,0 +1,9 @@
+name:eol;
+%%
+(c4) This(e) is(d) a(h) test(f) of (h) z(g) (::z)
+This(e) is(d) a(h) test(f) of(h) z<v>+</v>(g) (::z+)
+This(e) is(d) a(h) test(f) of(h) z-(g) (::z-)
+This(e) is(d) a(h) test(f) of(h) Z(g) (::Z)
+This(e) is(d) a(h) test(f) of(h) Z<v>+</v>(g) (::Z+)
+This(e) is(d) a(h) test(f) of(h) Z-(g) (::Z-)
+This(e) is(d) a(h) of(f) test(g) (::)
diff --git a/tests/gabc-dump/glyphs/above_lines_text.dump b/tests/gabc-dump/glyphs/above_lines_text.dump
@@ -21,7 +21,7 @@
 =====================================================================
  SCORE
 =====================================================================
-   type                      8 (GRE_SYLLABLE)
+   type                      5 (GRE_SYLLABLE)
    position                  4 (WORD_ONE_SYLLABLE)
 ---------------------------------------------------------------------
      character                 a
@@ -33,7 +33,7 @@
      type                    3 (GRE_ELEMENT)
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        type                  2 (GRE_GLYPH)
-       glyph_type            17 (G_PODATUS)
+       glyph_type            18 (G_PODATUS)
 -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  
          type                   1 (GRE_NOTE)
          pitch                  g
@@ -43,6 +43,6 @@
          pitch                  h
          shape                  1 (S_PUNCTUM)
 ---------------------------------------------------------------------
-     type                    9 (GRE_END_OF_LINE)
-     sub_type                12 (GRE_END_OF_PAR)
+     type                    6 (GRE_END_OF_LINE)
+         ragged                 true
 =====================================================================
diff --git a/tests/gabc-dump/glyphs/accidentals.dump b/tests/gabc-dump/glyphs/accidentals.dump
@@ -319,5 +319,5 @@
          shape                  30 (S_SHARP)
 ---------------------------------------------------------------------
      type                    6 (GRE_END_OF_LINE)
-     sub_type                9 (GRE_END_OF_PAR)
+         ragged                 true
 =====================================================================
diff --git a/tests/gabc-dump/glyphs/bars.dump b/tests/gabc-dump/glyphs/bars.dump
diff --git a/tests/gabc-dump/glyphs/choral_signs.dump b/tests/gabc-dump/glyphs/choral_signs.dump
diff --git a/tests/gabc-dump/glyphs/clivis.dump b/tests/gabc-dump/glyphs/clivis.dump
diff --git a/tests/gabc-dump/glyphs/horizontal_episemus.dump b/tests/gabc-dump/glyphs/horizontal_episemus.dump
@@ -234,7 +234,7 @@
          shape                  1 (S_PUNCTUM)
 ---------------------------------------------------------------------
      type                    6 (GRE_END_OF_LINE)
-     sub_type                9 (GRE_END_OF_PAR)
+         ragged                 true
 =====================================================================
    type                      5 (GRE_SYLLABLE)
    position                  4 (WORD_ONE_SYLLABLE)
@@ -437,7 +437,7 @@
          below hepisema bridge  true
 ---------------------------------------------------------------------
      type                    6 (GRE_END_OF_LINE)
-     sub_type                9 (GRE_END_OF_PAR)
+         ragged                 true
 =====================================================================
    type                      5 (GRE_SYLLABLE)
    position                  4 (WORD_ONE_SYLLABLE)
@@ -674,7 +674,7 @@
          auto hepisema bridge   true
 ---------------------------------------------------------------------
      type                    6 (GRE_END_OF_LINE)
-     sub_type                9 (GRE_END_OF_PAR)
+         ragged                 true
 =====================================================================
    type                      5 (GRE_SYLLABLE)
    position                  4 (WORD_ONE_SYLLABLE)
@@ -827,7 +827,7 @@
          auto hepisema bridge   true
 ---------------------------------------------------------------------
      type                    6 (GRE_END_OF_LINE)
-     sub_type                9 (GRE_END_OF_PAR)
+         ragged                 true
 =====================================================================
    type                      5 (GRE_SYLLABLE)
    position                  4 (WORD_ONE_SYLLABLE)
@@ -1045,7 +1045,7 @@
          auto hepisema bridge   true
 ---------------------------------------------------------------------
      type                    6 (GRE_END_OF_LINE)
-     sub_type                9 (GRE_END_OF_PAR)
+         ragged                 true
 =====================================================================
    type                      5 (GRE_SYLLABLE)
    position                  4 (WORD_ONE_SYLLABLE)
@@ -1361,7 +1361,7 @@
          above hepisema bridge  true
 ---------------------------------------------------------------------
      type                    6 (GRE_END_OF_LINE)
-     sub_type                9 (GRE_END_OF_PAR)
+         ragged                 true
 =====================================================================
    type                      5 (GRE_SYLLABLE)
    position                  4 (WORD_ONE_SYLLABLE)
@@ -1700,7 +1700,7 @@
          shape                  1 (S_PUNCTUM)
 ---------------------------------------------------------------------
      type                    6 (GRE_END_OF_LINE)
-     sub_type                9 (GRE_END_OF_PAR)
+         ragged                 true
 =====================================================================
    type                      5 (GRE_SYLLABLE)
    position                  4 (WORD_ONE_SYLLABLE)