Skip to content

Commit

Permalink
Merge branch 'develop' into feature/annotation_control
Browse files Browse the repository at this point in the history 
* develop:
  Added a test to exercise the slurs. Tests gregorio-project/gregorio#776.
  Added/updated tests/expectations to match oriscus orientation changes. Tests the fix for gregorio-project/gregorio#774.
  Updated expectations to match the taller liquescent stropha glyphs.
  • Loading branch information
@rpspringuel
rpspringuel committed Jan 13, 2016
2 parents 2efbbee + 216b1e0 commit cad72c3
Show file tree
Hide file tree
Showing 33 changed files with 630 additions and 579 deletions.
13 changes: 7 additions & 6 deletions backwards/gabc-dump/test_all_headers_B.dump
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
transcription_date 2009
mode 6
user_notes of course, it doesn't make sense to use all at once
oriscus-orientation legacy


=====================================================================
Expand All @@ -35,7 +36,7 @@
=====================================================================
SCORE
=====================================================================
type 9 (GRE_SYLLABLE)
type 8 (GRE_SYLLABLE)
position 3 (WORD_END)
---------------------------------------------------------------------
character I
Expand All @@ -57,7 +58,7 @@
shape 1 (S_PUNCTUM)
liquescentia 1 (L_DEMINUTUS)
=====================================================================
type 9 (GRE_SYLLABLE)
type 8 (GRE_SYLLABLE)
position 1 (WORD_BEGINNING)
---------------------------------------------------------------------
character n
Expand All @@ -77,7 +78,7 @@
pitch g
shape 1 (S_PUNCTUM)
=====================================================================
type 9 (GRE_SYLLABLE)
type 8 (GRE_SYLLABLE)
position 2 (WORD_MIDDLE)
---------------------------------------------------------------------
character m
Expand All @@ -101,7 +102,7 @@
pitch j
shape 1 (S_PUNCTUM)
=====================================================================
type 9 (GRE_SYLLABLE)
type 8 (GRE_SYLLABLE)
position 3 (WORD_END)
---------------------------------------------------------------------
character n
Expand All @@ -121,7 +122,7 @@
pitch j
shape 1 (S_PUNCTUM)
=====================================================================
type 9 (GRE_SYLLABLE)
type 8 (GRE_SYLLABLE)
position 1 (WORD_BEGINNING)
---------------------------------------------------------------------
character J
Expand All @@ -145,7 +146,7 @@
pitch j
shape 1 (S_PUNCTUM)
=====================================================================
type 9 (GRE_SYLLABLE)
type 8 (GRE_SYLLABLE)
position 3 (WORD_END)
---------------------------------------------------------------------
character s
Expand Down
1 change: 1 addition & 0 deletions backwards/gabc-dump/test_all_headers_B.gabc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,6 @@ user-notes: of course, it doesn't make sense to use all at once;
annotation: IN.;
annotation: III.;
language: Latin;
oriscus-orientation: legacy;
%%
(c4)IN(ed~) nó(g)mi(hj)ne(j) Je(ij)su(j.)
104 changes: 52 additions & 52 deletions tests/gabc-dump/bugs/fix-20.dump
View file

Large diffs are not rendered by default.

56 changes: 28 additions & 28 deletions tests/gabc-dump/glyphs/auto-fusion.dump
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
=====================================================================
SCORE
=====================================================================
type 9 (GRE_SYLLABLE)
type 8 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
character h
Expand Down Expand Up @@ -67,7 +67,7 @@
pitch h
shape 1 (S_PUNCTUM)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
type 13 (GRE_SPACE)
type 10 (GRE_SPACE)
space 3 (SP_ZERO_WIDTH)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
type 2 (GRE_GLYPH)
Expand Down Expand Up @@ -115,7 +115,7 @@
shape 1 (S_PUNCTUM)
liquescentia 1 (L_DEMINUTUS)
=====================================================================
type 9 (GRE_SYLLABLE)
type 8 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
character @
Expand Down Expand Up @@ -187,7 +187,7 @@
pitch k
shape 1 (S_PUNCTUM)
=====================================================================
type 9 (GRE_SYLLABLE)
type 8 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
character @
Expand Down Expand Up @@ -266,7 +266,7 @@
pitch k
shape 1 (S_PUNCTUM)
=====================================================================
type 9 (GRE_SYLLABLE)
type 8 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
character @
Expand Down Expand Up @@ -342,7 +342,7 @@
pitch k
shape 1 (S_PUNCTUM)
=====================================================================
type 9 (GRE_SYLLABLE)
type 8 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
beginning of style ST_CENTER
Expand Down Expand Up @@ -374,7 +374,7 @@
pitch f
shape 1 (S_PUNCTUM)
=====================================================================
type 9 (GRE_SYLLABLE)
type 8 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
character @
Expand Down Expand Up @@ -458,7 +458,7 @@
shape 1 (S_PUNCTUM)
liquescentia 4 (L_AUCTUS_DESCENDENS)
=====================================================================
type 9 (GRE_SYLLABLE)
type 8 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
character @
Expand Down Expand Up @@ -523,7 +523,7 @@
auto hepisema size 0 (H_NORMAL)
auto hepisema bridge true
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
type 13 (GRE_SPACE)
type 10 (GRE_SPACE)
space 3 (SP_ZERO_WIDTH)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
type 2 (GRE_GLYPH)
Expand All @@ -539,7 +539,7 @@
pitch f
shape 1 (S_PUNCTUM)
=====================================================================
type 9 (GRE_SYLLABLE)
type 8 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
character @
Expand Down Expand Up @@ -602,7 +602,7 @@
auto hepisema size 0 (H_NORMAL)
auto hepisema bridge true
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
type 13 (GRE_SPACE)
type 10 (GRE_SPACE)
space 3 (SP_ZERO_WIDTH)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
type 2 (GRE_GLYPH)
Expand All @@ -618,7 +618,7 @@
pitch f
shape 1 (S_PUNCTUM)
=====================================================================
type 9 (GRE_SYLLABLE)
type 8 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
beginning of style ST_CENTER
Expand Down Expand Up @@ -673,7 +673,7 @@
pitch g
shape 1 (S_PUNCTUM)
=====================================================================
type 9 (GRE_SYLLABLE)
type 8 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
character @
Expand Down Expand Up @@ -728,7 +728,7 @@
pitch f
shape 1 (S_PUNCTUM)
=====================================================================
type 9 (GRE_SYLLABLE)
type 8 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
beginning of style ST_CENTER
Expand Down Expand Up @@ -783,7 +783,7 @@
pitch g
shape 1 (S_PUNCTUM)
=====================================================================
type 9 (GRE_SYLLABLE)
type 8 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
character @
Expand Down Expand Up @@ -838,7 +838,7 @@
pitch g
shape 1 (S_PUNCTUM)
=====================================================================
type 9 (GRE_SYLLABLE)
type 8 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
character @
Expand Down Expand Up @@ -874,7 +874,7 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 10 (S_ORISCUS)
shape 11 (S_ORISCUS_DESCENDENS)
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
type 2 (GRE_GLYPH)
glyph_type 19 (G_FLEXA)
Expand All @@ -889,7 +889,7 @@
pitch d
shape 1 (S_PUNCTUM)
=====================================================================
type 9 (GRE_SYLLABLE)
type 8 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
character @
Expand Down Expand Up @@ -933,14 +933,14 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch e
shape 10 (S_ORISCUS)
shape 11 (S_ORISCUS_DESCENDENS)
liquescentia 32 (L_FUSED)
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch d
shape 1 (S_PUNCTUM)
=====================================================================
type 9 (GRE_SYLLABLE)
type 8 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
character @
Expand Down Expand Up @@ -984,14 +984,14 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch e
shape 10 (S_ORISCUS)
shape 11 (S_ORISCUS_DESCENDENS)
liquescentia 32 (L_FUSED)
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch c
shape 1 (S_PUNCTUM)
=====================================================================
type 9 (GRE_SYLLABLE)
type 8 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
character @
Expand Down Expand Up @@ -1044,7 +1044,7 @@
pitch e
shape 1 (S_PUNCTUM)
=====================================================================
type 9 (GRE_SYLLABLE)
type 8 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
character @
Expand Down Expand Up @@ -1095,7 +1095,7 @@
pitch e
shape 1 (S_PUNCTUM)
=====================================================================
type 9 (GRE_SYLLABLE)
type 8 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
character @
Expand Down Expand Up @@ -1146,7 +1146,7 @@
pitch j
shape 1 (S_PUNCTUM)
=====================================================================
type 9 (GRE_SYLLABLE)
type 8 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
character @
Expand Down Expand Up @@ -1197,7 +1197,7 @@
pitch j
shape 1 (S_PUNCTUM)
=====================================================================
type 9 (GRE_SYLLABLE)
type 8 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
character @
Expand Down Expand Up @@ -1398,9 +1398,9 @@
pitch d
shape 1 (S_PUNCTUM)
=====================================================================
type 9 (GRE_SYLLABLE)
type 8 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
---------------------------------------------------------------------
type 14 (GRE_BAR)
type 11 (GRE_BAR)
bar 5 (B_DIVISIO_FINALIS)
=====================================================================
Loading

0 comments on commit cad72c3

Please sign in to comment.