Skip to content

Commit

Permalink
Merge pull request gregorio-project#351 from henryso/fix-1558
Browse files Browse the repository at this point in the history 
Added tests for virga fusion and shape hints.
  • Loading branch information
@rpspringuel
rpspringuel authored Feb 16, 2022
2 parents 3a7039f + 055a3af commit bc2a994
Show file tree
Hide file tree
Showing 12 changed files with 1,261 additions and 62 deletions.
64 changes: 32 additions & 32 deletions tests/gabc-dump/glyphs/choral_signs.dump
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
type 1 (GRE_NOTE)
pitch h
shape 1 (S_PUNCTUM)
Choral Sign "c"
choral sign "c"
=====================================================================
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand All @@ -61,12 +61,12 @@
type 1 (GRE_NOTE)
pitch h
shape 1 (S_PUNCTUM)
Choral Sign "c"
choral sign "c"
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 1 (S_PUNCTUM)
Choral Sign "t"
choral sign "t"
=====================================================================
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand Down Expand Up @@ -94,7 +94,7 @@
type 1 (GRE_NOTE)
pitch g
shape 1 (S_PUNCTUM)
Choral Sign "t"
choral sign "t"
auto hepisema size 0 (H_NORMAL)
auto hepisema bridge true
=====================================================================
Expand All @@ -117,7 +117,7 @@
type 1 (GRE_NOTE)
pitch f
shape 1 (S_PUNCTUM)
Choral Sign "c"
choral sign "c"
auto hepisema size 0 (H_NORMAL)
auto hepisema bridge true
- - - - - - - - - - - - - - - - - - - - - - -
Expand Down Expand Up @@ -146,7 +146,7 @@
type 1 (GRE_NOTE)
pitch h
shape 1 (S_PUNCTUM)
Choral Sign "t"
choral sign "t"
signs 1 (_PUNCTUM_MORA)
auto hepisema size 0 (H_NORMAL)
auto hepisema bridge true
Expand Down Expand Up @@ -177,7 +177,7 @@
type 1 (GRE_NOTE)
pitch g
shape 1 (S_PUNCTUM)
Choral Sign "c"
choral sign "c"
=====================================================================
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand All @@ -196,7 +196,7 @@
type 1 (GRE_NOTE)
pitch g
shape 1 (S_PUNCTUM)
Choral Sign "c"
choral sign "c"
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch h
Expand All @@ -223,7 +223,7 @@
type 1 (GRE_NOTE)
pitch h
shape 1 (S_PUNCTUM)
Choral Sign "c"
choral sign "c"
=====================================================================
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand All @@ -242,7 +242,7 @@
type 1 (GRE_NOTE)
pitch g
shape 1 (S_PUNCTUM)
Choral Sign "c"
choral sign "c"
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch h
Expand Down Expand Up @@ -273,7 +273,7 @@
type 1 (GRE_NOTE)
pitch h
shape 1 (S_PUNCTUM)
Choral Sign "c"
choral sign "c"
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
Expand Down Expand Up @@ -304,7 +304,7 @@
type 1 (GRE_NOTE)
pitch g
shape 1 (S_PUNCTUM)
Choral Sign "c"
choral sign "c"
=====================================================================
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand All @@ -323,7 +323,7 @@
type 1 (GRE_NOTE)
pitch g
shape 1 (S_PUNCTUM)
Choral Sign "c"
choral sign "c"
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch h
Expand Down Expand Up @@ -358,7 +358,7 @@
type 1 (GRE_NOTE)
pitch h
shape 1 (S_PUNCTUM)
Choral Sign "c"
choral sign "c"
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
Expand Down Expand Up @@ -393,7 +393,7 @@
type 1 (GRE_NOTE)
pitch g
shape 1 (S_PUNCTUM)
Choral Sign "c"
choral sign "c"
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch h
Expand Down Expand Up @@ -430,7 +430,7 @@
type 1 (GRE_NOTE)
pitch h
shape 1 (S_PUNCTUM)
Choral Sign "c"
choral sign "c"
---------------------------------------------------------------------
type 5 (GRE_END_OF_LINE)
ragged true
Expand All @@ -454,7 +454,7 @@
type 1 (GRE_NOTE)
pitch h
shape 1 (S_PUNCTUM)
Choral Sign "c"
choral sign "c"
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
Expand Down Expand Up @@ -483,7 +483,7 @@
type 1 (GRE_NOTE)
pitch g
shape 1 (S_PUNCTUM)
Choral Sign "c"
choral sign "c"
=====================================================================
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand All @@ -504,7 +504,7 @@
type 1 (GRE_NOTE)
pitch h
shape 1 (S_PUNCTUM)
Choral Sign "c"
choral sign "c"
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
Expand Down Expand Up @@ -537,7 +537,7 @@
type 1 (GRE_NOTE)
pitch g
shape 1 (S_PUNCTUM)
Choral Sign "c"
choral sign "c"
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch h
Expand Down Expand Up @@ -570,7 +570,7 @@
type 1 (GRE_NOTE)
pitch h
shape 1 (S_PUNCTUM)
Choral Sign "c"
choral sign "c"
=====================================================================
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand All @@ -591,7 +591,7 @@
type 1 (GRE_NOTE)
pitch h
shape 1 (S_PUNCTUM)
Choral Sign "c"
choral sign "c"
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
Expand Down Expand Up @@ -628,7 +628,7 @@
type 1 (GRE_NOTE)
pitch g
shape 1 (S_PUNCTUM)
Choral Sign "c"
choral sign "c"
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch h
Expand Down Expand Up @@ -665,7 +665,7 @@
type 1 (GRE_NOTE)
pitch h
shape 1 (S_PUNCTUM)
Choral Sign "c"
choral sign "c"
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
Expand Down Expand Up @@ -702,7 +702,7 @@
type 1 (GRE_NOTE)
pitch g
shape 1 (S_PUNCTUM)
Choral Sign "c"
choral sign "c"
---------------------------------------------------------------------
type 5 (GRE_END_OF_LINE)
ragged true
Expand All @@ -725,8 +725,8 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 16 (S_QUILISMA)
Choral Sign "c"
shape 17 (S_QUILISMA)
choral sign "c"
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch h
Expand All @@ -750,8 +750,8 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 16 (S_QUILISMA)
Choral Sign "c"
shape 17 (S_QUILISMA)
choral sign "c"
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch f
Expand Down Expand Up @@ -784,8 +784,8 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 16 (S_QUILISMA)
Choral Sign "c"
shape 17 (S_QUILISMA)
choral sign "c"
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch h
Expand Down Expand Up @@ -823,5 +823,5 @@
type 1 (GRE_NOTE)
pitch h
shape 1 (S_PUNCTUM)
Choral Sign "c"
choral sign "c"
=====================================================================
10 changes: 5 additions & 5 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.2.0-rc3-develop-d01f368-3955;
generated-by: gregorio 6.0.0-fix-1558-2991e642-4526;
%%
(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(gwf/g) 22(gwhgh) 23(i'.h)
(c3)ab(gh[cs:c]) ab(h[cs:c]g[cs:t]) ab(h._g_[cs:t]) ab(f_[cs:c]g_) ab(h._[cs:t]g_Z)
1(g[cs:c]) 2(g[cs:c]h) 3(gh[cs:c]) 4(g[cs:c]hg) 5(gh[cs:c]g) 6(ghg[cs:c]) 7(g[cs:c]hgh) 8(gh[cs:c]gh) 9(ghg[cs:c]h) 10(ghgh[cs:c]Z)
11(h[cs:c]g) 12(hg[cs:c]) 13(h[cs:c]gh) 14(hg[cs:c]h) 15(hgh[cs:c]) 16(h[cs:c]ghg) 17(hg[cs:c]hg) 18(hgh[cs:c]g) 19(hghg[cs:c]Z)
20(gw[cs:c]h) 21(gw[cs:c]f/g) 22(gw[cs:c]hgh) 23(i'.h[cs:c])
Loading

0 comments on commit bc2a994

Please sign in to comment.