Skip to content

Commit

Permalink
Updated tests to match the oriscus orientation at unison change.
Browse files Browse the repository at this point in the history 
Tests gregorio-project/gregorio#1177.
  • Loading branch information
@henryso
henryso committed Jul 7, 2016
1 parent 0c3f18d commit d55e14a
Show file tree
Hide file tree
Showing 13 changed files with 61 additions and 61 deletions.
28 changes: 14 additions & 14 deletions tests/gabc-dump/glyphs/oriscus.dump
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 10 (S_ORISCUS_ASCENDENS)
shape 12 (S_ORISCUS_DESCENDENS)
=====================================================================
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand All @@ -57,7 +57,7 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 10 (S_ORISCUS_ASCENDENS)
shape 11 (S_ORISCUS_ASCENDENS)
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch h
Expand All @@ -83,7 +83,7 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 11 (S_ORISCUS_DESCENDENS)
shape 12 (S_ORISCUS_DESCENDENS)
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch f
Expand All @@ -109,7 +109,7 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 11 (S_ORISCUS_DESCENDENS)
shape 12 (S_ORISCUS_DESCENDENS)
=====================================================================
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand All @@ -131,7 +131,7 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch h
shape 10 (S_ORISCUS_ASCENDENS)
shape 11 (S_ORISCUS_ASCENDENS)
=====================================================================
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand All @@ -151,7 +151,7 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 10 (S_ORISCUS_ASCENDENS)
shape 12 (S_ORISCUS_DESCENDENS)
=====================================================================
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand All @@ -178,7 +178,7 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 12 (S_ORISCUS_DEMINUTUS)
shape 13 (S_ORISCUS_DEMINUTUS)
liquescentia 1 (L_DEMINUTUS)
---------------------------------------------------------------------
type 5 (GRE_END_OF_LINE)
Expand All @@ -202,7 +202,7 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch f
shape 10 (S_ORISCUS_ASCENDENS)
shape 11 (S_ORISCUS_ASCENDENS)
=====================================================================
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand Down Expand Up @@ -231,7 +231,7 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch h
shape 11 (S_ORISCUS_DESCENDENS)
shape 12 (S_ORISCUS_DESCENDENS)
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch f
Expand All @@ -258,7 +258,7 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch e
shape 13 (S_ORISCUS_SCAPUS_ASCENDENS)
shape 14 (S_ORISCUS_SCAPUS_ASCENDENS)
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
Expand Down Expand Up @@ -286,7 +286,7 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 11 (S_ORISCUS_DESCENDENS)
shape 12 (S_ORISCUS_DESCENDENS)
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch i
Expand Down Expand Up @@ -314,7 +314,7 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 10 (S_ORISCUS_ASCENDENS)
shape 11 (S_ORISCUS_ASCENDENS)
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch e
Expand Down Expand Up @@ -342,7 +342,7 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 14 (S_ORISCUS_SCAPUS_DESCENDENS)
shape 15 (S_ORISCUS_SCAPUS_DESCENDENS)
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch i
Expand Down Expand Up @@ -370,7 +370,7 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 13 (S_ORISCUS_SCAPUS_ASCENDENS)
shape 14 (S_ORISCUS_SCAPUS_ASCENDENS)
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch e
Expand Down
4 changes: 2 additions & 2 deletions tests/gabc-dump/glyphs/oriscus.exp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: oriscus;
generated-by: gregorio 4.1.1-fix-972--;
generated-by: gregorio 4.2.0-rc2-release-4.2-cd7f78a-3869;
%%
(c3)go(go1) goh(go1h) gof(go0f) go0(go0) ho1(ho1) go(go1) go<sp>~</sp>(go~Z)
(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)
Binary file modified tests/gabc-dump/glyphs/oriscus.pdf
View file
Binary file not shown.
40 changes: 20 additions & 20 deletions tests/gabc-dump/glyphs/shape_switching.dump
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 20 (S_PUNCTUM_CAVUM)
shape 21 (S_PUNCTUM_CAVUM)
liquescentia 2 (L_AUCTUS_ASCENDENS)
=====================================================================
type 0 (GRE_SYLLABLE)
Expand All @@ -62,7 +62,7 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 20 (S_PUNCTUM_CAVUM)
shape 21 (S_PUNCTUM_CAVUM)
liquescentia 2 (L_AUCTUS_ASCENDENS)
=====================================================================
type 0 (GRE_SYLLABLE)
Expand All @@ -85,7 +85,7 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 25 (S_ORISCUS_CAVUM_ASCENDENS)
shape 26 (S_ORISCUS_CAVUM_ASCENDENS)
=====================================================================
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand Down Expand Up @@ -119,7 +119,7 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 25 (S_ORISCUS_CAVUM_ASCENDENS)
shape 26 (S_ORISCUS_CAVUM_ASCENDENS)
=====================================================================
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand Down Expand Up @@ -153,7 +153,7 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 26 (S_ORISCUS_CAVUM_DESCENDENS)
shape 27 (S_ORISCUS_CAVUM_DESCENDENS)
=====================================================================
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand Down Expand Up @@ -187,7 +187,7 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 26 (S_ORISCUS_CAVUM_DESCENDENS)
shape 27 (S_ORISCUS_CAVUM_DESCENDENS)
=====================================================================
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand Down Expand Up @@ -223,7 +223,7 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 26 (S_ORISCUS_CAVUM_DESCENDENS)
shape 27 (S_ORISCUS_CAVUM_DESCENDENS)
=====================================================================
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand Down Expand Up @@ -259,7 +259,7 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 26 (S_ORISCUS_CAVUM_DESCENDENS)
shape 27 (S_ORISCUS_CAVUM_DESCENDENS)
=====================================================================
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand Down Expand Up @@ -295,7 +295,7 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 25 (S_ORISCUS_CAVUM_ASCENDENS)
shape 26 (S_ORISCUS_CAVUM_ASCENDENS)
=====================================================================
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand Down Expand Up @@ -331,7 +331,7 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 25 (S_ORISCUS_CAVUM_ASCENDENS)
shape 26 (S_ORISCUS_CAVUM_ASCENDENS)
=====================================================================
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand Down Expand Up @@ -365,7 +365,7 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 25 (S_ORISCUS_CAVUM_ASCENDENS)
shape 26 (S_ORISCUS_CAVUM_ASCENDENS)
=====================================================================
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand Down Expand Up @@ -399,7 +399,7 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 13 (S_ORISCUS_SCAPUS_ASCENDENS)
shape 14 (S_ORISCUS_SCAPUS_ASCENDENS)
=====================================================================
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand Down Expand Up @@ -433,7 +433,7 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 26 (S_ORISCUS_CAVUM_DESCENDENS)
shape 27 (S_ORISCUS_CAVUM_DESCENDENS)
=====================================================================
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand Down Expand Up @@ -467,7 +467,7 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 14 (S_ORISCUS_SCAPUS_DESCENDENS)
shape 15 (S_ORISCUS_SCAPUS_DESCENDENS)
=====================================================================
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand Down Expand Up @@ -503,7 +503,7 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 26 (S_ORISCUS_CAVUM_DESCENDENS)
shape 27 (S_ORISCUS_CAVUM_DESCENDENS)
=====================================================================
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand Down Expand Up @@ -539,7 +539,7 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 14 (S_ORISCUS_SCAPUS_DESCENDENS)
shape 15 (S_ORISCUS_SCAPUS_DESCENDENS)
=====================================================================
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand Down Expand Up @@ -575,7 +575,7 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 25 (S_ORISCUS_CAVUM_ASCENDENS)
shape 26 (S_ORISCUS_CAVUM_ASCENDENS)
=====================================================================
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand Down Expand Up @@ -611,7 +611,7 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 13 (S_ORISCUS_SCAPUS_ASCENDENS)
shape 14 (S_ORISCUS_SCAPUS_ASCENDENS)
=====================================================================
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand Down Expand Up @@ -647,7 +647,7 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 25 (S_ORISCUS_CAVUM_ASCENDENS)
shape 27 (S_ORISCUS_CAVUM_DESCENDENS)
=====================================================================
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand All @@ -671,5 +671,5 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 14 (S_ORISCUS_SCAPUS_DESCENDENS)
shape 15 (S_ORISCUS_SCAPUS_DESCENDENS)
=====================================================================
4 changes: 2 additions & 2 deletions tests/gabc-dump/glyphs/shape_switching.exp
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: shape switching;
generated-by: gregorio 4.1.0-beta3-fix-898-4.1-089d865-3293;
generated-by: gregorio 4.2.0-rc2-release-4.2-cd7f78a-3869;
%%
(c4)gr<(gr<) g<r(gr<) gor(go1r) (h) gro(go1r) (h) gor(go0r) (f) gro(go0r) (f) go0r(go0r) (h) gro0(go0r) (h) go1r(go1r) (f) gro1(go1r) (f) gOr(go1r) (h) grO(gO1) (h) gOr(go0r) (f) grO(gO0) (f) gO0r(go0r) (h) grO0(gO0) (h) gO1r(go1r) (f) grO1(gO1) (f) goro(go1r) gOrO(gO0)
(c4)gr<(gr<) g<r(gr<) gor(go1r) (h) gro(go1r) (h) gor(go0r) (f) gro(go0r) (f) go0r(go0r) (h) gro0(go0r) (h) go1r(go1r) (f) gro1(go1r) (f) gOr(go1r) (h) grO(gO1) (h) gOr(go0r) (f) grO(gO0) (f) gO0r(go0r) (h) grO0(gO0) (h) gO1r(go1r) (f) grO1(gO1) (f) goro(go0r) gOrO(gO0)
Binary file modified tests/gabc-dump/glyphs/shape_switching.pdf
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion tests/gabc-dump/glyphs/shapes.dump
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1208,7 +1208,7 @@
- - - - - - - - - - - - - - - - - - - - - - -
type 1 (GRE_NOTE)
pitch g
shape 26 (S_ORISCUS_CAVUM_ASCENDENS)
shape 27 (S_ORISCUS_CAVUM_DESCENDENS)
=====================================================================
type 0 (GRE_SYLLABLE)
position 4 (WORD_ONE_SYLLABLE)
Expand Down
4 changes: 2 additions & 2 deletions tests/gabc-dump/glyphs/shapes.exp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: shapes;
generated-by: gregorio 4.2.0-beta1-fix-856-7ee4d55-3666;
generated-by: gregorio 4.2.0-rc2-release-4.2-cd7f78a-3869;
%%
(c3)fg(fg) gvFE(gvF0E0) ghg(ghg) ghgh(ghgh) ghghg(ghghg) gqh(gqh) gFE<(gF0E<) gFE<sp>~</sp>(gF0E~) gs(gs) gs<(gs<) gf(gf) g=(g=) h=(h=) fvE'D.(fvE0'D0.) gvFD(gvF0D0) hvGD(hvG0D0) ivHD(ivH0D0) iv>(iv>) ige(ig/e) ige<sp>~</sp>(ige~) dfec<sp>~</sp>(dfec~) dwfec<sp>~</sp>(dwfec~) egi(egi) egi<sp>~</sp>(egi~) GrGrFr(GrGrFr) GrGrFr<(GrGrFr<<) FrGrFr_0(FrGrFr_0) GrFrEr(GrFrEr) Gr<(Gr<<Z)
-fg(-fg) -f'g(-f'g) -f'1g(-f'1g) gf<sp>~</sp>(gf~) g'f<sp>~</sp>(g'f~) g'0f<sp>~</sp>(g'0f~) (:)
gor(go1r) go0r(go0r) gor<sp>~</sp>(gor~) {g}r/Gr/go0r(gr/Gr/go0rZ)
gor(go0r) go0r(go0r) gor<sp>~</sp>(gor~) {g}r/Gr/go0r(gr/Gr/go0rZ)
-fg>(-fg>) -fg<(-fg<) fwg>(fwg>) ivH<(iv/H<) fWg(fWg) hs<(hs<) g'h'..(g'h'..) g'h..'(g'h'..) gv(gv) hv(hv) gV(gV) hV(hV) gO(gO1) hO(hO0) gfd<sp>~</sp>(gfd~) hge<sp>~</sp>(hge~) g.fd<sp>~</sp>(g.fd~) bab(bab) baba(baba) abab(abab) ababa(ababa) lmlm(lmlm) lmlml(lmlml) ijiml(ijiml) gohghg(go1hghg) gwigig(gwigig) ghi<(ghi<) ghi>(ghi>) ghi<sp>~</sp>(ghi~) G<H<(G<H<) Gr<sp>~</sp>(Gr) gor<sp>~</sp>(gor~) fohd(fo1@hd) fohd<sp>~</sp>(fo1@hd~) h+(h+)
Binary file modified tests/gabc-dump/glyphs/shapes.pdf
View file
Binary file not shown.
Loading

0 comments on commit d55e14a

Please sign in to comment.