diff --git a/harness.sh b/harness.sh index bd0f1598..724cf6e5 100644 --- a/harness.sh +++ b/harness.sh @@ -272,10 +272,10 @@ function gabc_dump_test { if eval $gregorio -f gabc -F dump -o "$outfile" -l "$logfile" "$filename" then - ${SED} -e 's/[0-9]\+\( (\(GRE\|S\|G\|L\|\)_\)/@\1/' "$outfile" \ + ${SED} -e 's/[0-9]\+\( (\(GRE\|S\|G\|L\|SP\|\)_\)/@\1/' "$outfile" \ > "$outfile-" $verify "$filename" && ${SED} \ - -e 's/[0-9]\+\( (\(GRE\|S\|G\|L\|\)_\)/@\1/' "$expfile" \ + -e 's/[0-9]\+\( (\(GRE\|S\|G\|L\|SP\|\)_\)/@\1/' "$expfile" \ > "$expfile-" maybe_run "$filename" diff -q "$outfile-" "$expfile-" else diff --git a/tests/gabc-dump/glyphs/spaces.dump b/tests/gabc-dump/glyphs/spaces.dump index 14944301..2e799d4c 100644 --- a/tests/gabc-dump/glyphs/spaces.dump +++ b/tests/gabc-dump/glyphs/spaces.dump @@ -69,6 +69,52 @@ character g --------------------------------------------------------------------- character / +--------------------------------------------------------------------- + character 0 +--------------------------------------------------------------------- + character h +--------------------------------------------------------------------- + character i +--------------------------------------------------------------------- + end of style ST_FORCED_CENTER +--------------------------------------------------------------------- + type 3 (GRE_ELEMENT) +- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + type 2 (GRE_GLYPH) + glyph_type 17 (G_PODATUS) +- - - - - - - - - - - - - - - - - - - - - - - + type 1 (GRE_NOTE) + pitch f + shape 1 (S_PUNCTUM) +- - - - - - - - - - - - - - - - - - - - - - - + type 1 (GRE_NOTE) + pitch g + shape 1 (S_PUNCTUM) +- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + type 13 (GRE_SPACE) + space 4 (SP_HALF_SPACE) +- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + type 2 (GRE_GLYPH) + glyph_type 17 (G_PODATUS) +- - - - - - - - - - - - - - - - - - - - - - - + type 1 (GRE_NOTE) + pitch h + shape 1 (S_PUNCTUM) +- - - - - - - - - - - - - - - - - - - - - - - + type 1 (GRE_NOTE) + pitch i + shape 1 (S_PUNCTUM) +===================================================================== + type 9 (GRE_SYLLABLE) + position 4 (WORD_ONE_SYLLABLE) +--------------------------------------------------------------------- + beginning of style ST_FORCED_CENTER +--------------------------------------------------------------------- + character f +--------------------------------------------------------------------- + character g +--------------------------------------------------------------------- + character / --------------------------------------------------------------------- character h --------------------------------------------------------------------- @@ -135,7 +181,7 @@ shape 1 (S_PUNCTUM) --------------------------------------------------------------------- type 13 (GRE_SPACE) - space 5 (SP_LARGER_SPACE) + space 6 (SP_LARGER_SPACE) --------------------------------------------------------------------- type 3 (GRE_ELEMENT) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -181,7 +227,7 @@ shape 1 (S_PUNCTUM) --------------------------------------------------------------------- type 13 (GRE_SPACE) - space 6 (SP_GLYPH_SPACE) + space 7 (SP_GLYPH_SPACE) --------------------------------------------------------------------- type 3 (GRE_ELEMENT) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -208,6 +254,54 @@ character ! --------------------------------------------------------------------- character / +--------------------------------------------------------------------- + character 0 +--------------------------------------------------------------------- + character h +--------------------------------------------------------------------- + character i +--------------------------------------------------------------------- + end of style ST_FORCED_CENTER +--------------------------------------------------------------------- + type 3 (GRE_ELEMENT) +- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + type 2 (GRE_GLYPH) + glyph_type 17 (G_PODATUS) +- - - - - - - - - - - - - - - - - - - - - - - + type 1 (GRE_NOTE) + pitch f + shape 1 (S_PUNCTUM) +- - - - - - - - - - - - - - - - - - - - - - - + type 1 (GRE_NOTE) + pitch g + shape 1 (S_PUNCTUM) +- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + type 13 (GRE_SPACE) + space 4 (SP_HALF_SPACE) +- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + type 2 (GRE_GLYPH) + glyph_type 17 (G_PODATUS) +- - - - - - - - - - - - - - - - - - - - - - - + type 1 (GRE_NOTE) + pitch h + shape 1 (S_PUNCTUM) +- - - - - - - - - - - - - - - - - - - - - - - + type 1 (GRE_NOTE) + pitch i + shape 1 (S_PUNCTUM) +===================================================================== + type 9 (GRE_SYLLABLE) + position 4 (WORD_ONE_SYLLABLE) +--------------------------------------------------------------------- + beginning of style ST_FORCED_CENTER +--------------------------------------------------------------------- + character f +--------------------------------------------------------------------- + character g +--------------------------------------------------------------------- + character ! +--------------------------------------------------------------------- + character / --------------------------------------------------------------------- character h --------------------------------------------------------------------- @@ -229,7 +323,7 @@ shape 1 (S_PUNCTUM) --------------------------------------------------------------------- type 13 (GRE_SPACE) - space 7 (SP_NEUMATIC_CUT_NB) + space 9 (SP_NEUMATIC_CUT_NB) --------------------------------------------------------------------- type 3 (GRE_ELEMENT) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -279,7 +373,7 @@ shape 1 (S_PUNCTUM) --------------------------------------------------------------------- type 13 (GRE_SPACE) - space 8 (SP_LARGER_SPACE_NB) + space 10 (SP_LARGER_SPACE_NB) --------------------------------------------------------------------- type 3 (GRE_ELEMENT) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -327,7 +421,268 @@ shape 1 (S_PUNCTUM) --------------------------------------------------------------------- type 13 (GRE_SPACE) - space 9 (SP_GLYPH_SPACE_NB) + space 11 (SP_GLYPH_SPACE_NB) +--------------------------------------------------------------------- + type 3 (GRE_ELEMENT) +- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + type 2 (GRE_GLYPH) + glyph_type 17 (G_PODATUS) +- - - - - - - - - - - - - - - - - - - - - - - + type 1 (GRE_NOTE) + pitch h + shape 1 (S_PUNCTUM) +- - - - - - - - - - - - - - - - - - - - - - - + type 1 (GRE_NOTE) + pitch i + shape 1 (S_PUNCTUM) +--------------------------------------------------------------------- + type 12 (GRE_END_OF_LINE) + sub_type 15 (GRE_END_OF_PAR) +===================================================================== + type 9 (GRE_SYLLABLE) + position 4 (WORD_ONE_SYLLABLE) +--------------------------------------------------------------------- + beginning of style ST_FORCED_CENTER +--------------------------------------------------------------------- + character f +--------------------------------------------------------------------- + character g +--------------------------------------------------------------------- + character / +--------------------------------------------------------------------- + beginning of style ST_VERBATIM +--------------------------------------------------------------------- + character [ +--------------------------------------------------------------------- + character 1 +--------------------------------------------------------------------- + character . +--------------------------------------------------------------------- + character 3 +--------------------------------------------------------------------- + character ] +--------------------------------------------------------------------- + end of style ST_VERBATIM +--------------------------------------------------------------------- + character h +--------------------------------------------------------------------- + character i +--------------------------------------------------------------------- + end of style ST_FORCED_CENTER +--------------------------------------------------------------------- + type 3 (GRE_ELEMENT) +- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + type 2 (GRE_GLYPH) + glyph_type 17 (G_PODATUS) +- - - - - - - - - - - - - - - - - - - - - - - + type 1 (GRE_NOTE) + pitch f + shape 1 (S_PUNCTUM) +- - - - - - - - - - - - - - - - - - - - - - - + type 1 (GRE_NOTE) + pitch g + shape 1 (S_PUNCTUM) +--------------------------------------------------------------------- + type 13 (GRE_SPACE) + space 8 (SP_AD_HOC_SPACE) x 1.3 +--------------------------------------------------------------------- + type 3 (GRE_ELEMENT) +- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + type 2 (GRE_GLYPH) + glyph_type 17 (G_PODATUS) +- - - - - - - - - - - - - - - - - - - - - - - + type 1 (GRE_NOTE) + pitch h + shape 1 (S_PUNCTUM) +- - - - - - - - - - - - - - - - - - - - - - - + type 1 (GRE_NOTE) + pitch i + shape 1 (S_PUNCTUM) +===================================================================== + type 9 (GRE_SYLLABLE) + position 4 (WORD_ONE_SYLLABLE) +--------------------------------------------------------------------- + beginning of style ST_FORCED_CENTER +--------------------------------------------------------------------- + character f +--------------------------------------------------------------------- + character g +--------------------------------------------------------------------- + character ! +--------------------------------------------------------------------- + character / +--------------------------------------------------------------------- + beginning of style ST_VERBATIM +--------------------------------------------------------------------- + character [ +--------------------------------------------------------------------- + character - +--------------------------------------------------------------------- + character 0 +--------------------------------------------------------------------- + character . +--------------------------------------------------------------------- + character 8 +--------------------------------------------------------------------- + character ] +--------------------------------------------------------------------- + end of style ST_VERBATIM +--------------------------------------------------------------------- + character h +--------------------------------------------------------------------- + character i +--------------------------------------------------------------------- + end of style ST_FORCED_CENTER +--------------------------------------------------------------------- + type 3 (GRE_ELEMENT) +- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + type 2 (GRE_GLYPH) + glyph_type 17 (G_PODATUS) +- - - - - - - - - - - - - - - - - - - - - - - + type 1 (GRE_NOTE) + pitch f + shape 1 (S_PUNCTUM) +- - - - - - - - - - - - - - - - - - - - - - - + type 1 (GRE_NOTE) + pitch g + shape 1 (S_PUNCTUM) +--------------------------------------------------------------------- + type 13 (GRE_SPACE) + space 12 (SP_AD_HOC_SPACE_NB) x -0.8 +--------------------------------------------------------------------- + type 3 (GRE_ELEMENT) +- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + type 2 (GRE_GLYPH) + glyph_type 17 (G_PODATUS) +- - - - - - - - - - - - - - - - - - - - - - - + type 1 (GRE_NOTE) + pitch h + shape 1 (S_PUNCTUM) +- - - - - - - - - - - - - - - - - - - - - - - + type 1 (GRE_NOTE) + pitch i + shape 1 (S_PUNCTUM) +===================================================================== + type 9 (GRE_SYLLABLE) + position 4 (WORD_ONE_SYLLABLE) +--------------------------------------------------------------------- + beginning of style ST_FORCED_CENTER +--------------------------------------------------------------------- + character f +--------------------------------------------------------------------- + character g +--------------------------------------------------------------------- + character / +--------------------------------------------------------------------- + character / +--------------------------------------------------------------------- + beginning of style ST_VERBATIM +--------------------------------------------------------------------- + character [ +--------------------------------------------------------------------- + character - +--------------------------------------------------------------------- + character 0 +--------------------------------------------------------------------- + character . +--------------------------------------------------------------------- + character 2 +--------------------------------------------------------------------- + character ] +--------------------------------------------------------------------- + end of style ST_VERBATIM +--------------------------------------------------------------------- + character h +--------------------------------------------------------------------- + character i +--------------------------------------------------------------------- + end of style ST_FORCED_CENTER +--------------------------------------------------------------------- + type 3 (GRE_ELEMENT) +- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + type 2 (GRE_GLYPH) + glyph_type 17 (G_PODATUS) +- - - - - - - - - - - - - - - - - - - - - - - + type 1 (GRE_NOTE) + pitch f + shape 1 (S_PUNCTUM) +- - - - - - - - - - - - - - - - - - - - - - - + type 1 (GRE_NOTE) + pitch g + shape 1 (S_PUNCTUM) +--------------------------------------------------------------------- + type 13 (GRE_SPACE) + space 5 (SP_NEUMATIC_CUT) +--------------------------------------------------------------------- + type 13 (GRE_SPACE) + space 8 (SP_AD_HOC_SPACE) x -0.2 +--------------------------------------------------------------------- + type 3 (GRE_ELEMENT) +- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + type 2 (GRE_GLYPH) + glyph_type 17 (G_PODATUS) +- - - - - - - - - - - - - - - - - - - - - - - + type 1 (GRE_NOTE) + pitch h + shape 1 (S_PUNCTUM) +- - - - - - - - - - - - - - - - - - - - - - - + type 1 (GRE_NOTE) + pitch i + shape 1 (S_PUNCTUM) +===================================================================== + type 9 (GRE_SYLLABLE) + position 4 (WORD_ONE_SYLLABLE) +--------------------------------------------------------------------- + beginning of style ST_FORCED_CENTER +--------------------------------------------------------------------- + character f +--------------------------------------------------------------------- + character g +--------------------------------------------------------------------- + character ! +--------------------------------------------------------------------- + character / +--------------------------------------------------------------------- + character / +--------------------------------------------------------------------- + beginning of style ST_VERBATIM +--------------------------------------------------------------------- + character [ +--------------------------------------------------------------------- + character - +--------------------------------------------------------------------- + character . +--------------------------------------------------------------------- + character 3 +--------------------------------------------------------------------- + character ] +--------------------------------------------------------------------- + end of style ST_VERBATIM +--------------------------------------------------------------------- + character h +--------------------------------------------------------------------- + character i +--------------------------------------------------------------------- + end of style ST_FORCED_CENTER +--------------------------------------------------------------------- + type 3 (GRE_ELEMENT) +- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + type 2 (GRE_GLYPH) + glyph_type 17 (G_PODATUS) +- - - - - - - - - - - - - - - - - - - - - - - + type 1 (GRE_NOTE) + pitch f + shape 1 (S_PUNCTUM) +- - - - - - - - - - - - - - - - - - - - - - - + type 1 (GRE_NOTE) + pitch g + shape 1 (S_PUNCTUM) +--------------------------------------------------------------------- + type 13 (GRE_SPACE) + space 9 (SP_NEUMATIC_CUT_NB) +--------------------------------------------------------------------- + type 13 (GRE_SPACE) + space 8 (SP_AD_HOC_SPACE) x -.3 --------------------------------------------------------------------- type 3 (GRE_ELEMENT) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/gabc-dump/glyphs/spaces.gabc b/tests/gabc-dump/glyphs/spaces.gabc index 7e01041a..3b600a14 100644 --- a/tests/gabc-dump/glyphs/spaces.gabc +++ b/tests/gabc-dump/glyphs/spaces.gabc @@ -1,4 +1,7 @@ name: spaces; %% -{fg!hi}(fg!hi) {fg/hi}(fg/hi) {fg//hi}(fg//hi) {fg hi}(fg hi) {fg!/hi}(fg!/hi) {fg!//hi}(fg!//hi) {fg! hi}(fg! hiZ) +{fg!hi}(fg!hi) {fg/0hi}(fg/0hi) {fg/hi}(fg/hi) {fg//hi}(fg//hi) {fg hi}(fg hi) +{fg!/0hi}(fg!/0hi) {fg!/hi}(fg!/hi) {fg!//hi}(fg!//hi) {fg! hi}(fg! hiZ) +{fg/[1.3]hi}(fg/[1.3]hi) {fg!/[-0.8]hi}(fg!/[-0.8]hi) +{fg//[-0.2]hi}(fg//[-0.2]hi) {fg!//[-.3]hi}(fg!//[-.3]hiZ) æ(dc) æ(ab/dc) diff --git a/tests/gabc-gabc/glyphs/spaces.exp b/tests/gabc-gabc/glyphs/spaces.exp index b989709e..cd295f9e 100644 --- a/tests/gabc-gabc/glyphs/spaces.exp +++ b/tests/gabc-gabc/glyphs/spaces.exp @@ -1,4 +1,4 @@ name: spaces; -generated-by: gregorio 4.0.0-rc2-fix-670-af3219a-2704; +generated-by: gregorio 4.0.1-fix-736-97d15b2-2839; %% -(c3){fg!hi}(fg!hi) {fg/hi}(fg/hi) {fg//hi}(fg//hi) {fg hi}(fg hi) {fg!/hi}(fg!/hi) {fg!//hi}(fg!//hi) {fg! hi}(fg! hiz) æ(dc) æ(ab/dc) +(c3){fg!hi}(fg!hi) {fg/0hi}(fg/0hi) {fg/hi}(fg/hi) {fg//hi}(fg//hi) {fg hi}(fg hi) {fg!/0hi}(fg/0hi) {fg!/hi}(fg!/hi) {fg!//hi}(fg!//hi) {fg! hi}(fg! hiz) {fg/[1.3]hi}(fg/[1.3]hi) {fg!/[-0.8]hi}(fg!/[-0.8]hi) {fg//[-0.2]hi}(fg//[-0.2]hi) {fg!//[-.3]hi}(fg!//[-.3]hiz) æ(dc) æ(ab/dc) diff --git a/tests/gabc-output/glyphs/spaces.pdf b/tests/gabc-output/glyphs/spaces.pdf index 42e7432b..b6568676 100644 Binary files a/tests/gabc-output/glyphs/spaces.pdf and b/tests/gabc-output/glyphs/spaces.pdf differ