Merge commit '4bb387fc8d54c2b4adc2bee49388b5161d0dcf5f' into fix-1029

* commit '4bb387fc8d54c2b4adc2bee49388b5161d0dcf5f': Added a test for protruding characters against translations. Updated expectations for spurious hyphenation fix. Tests gregorio-project/gregorio#1254 and gregorio-project/gregorio#1255.
gregorio-project · Nov 25, 2016 · 75a4609 · 75a4609
2 parents 97f0c76 + 4bb387f
commit 75a4609
Show file tree

Hide file tree

Showing 6 changed files with 499 additions and 12 deletions.
diff --git a/tests/gabc-dump/glyphs/translation.dump b/tests/gabc-dump/glyphs/translation.dump
diff --git a/tests/gabc-dump/glyphs/translation.exp b/tests/gabc-dump/glyphs/translation.exp
@@ -1,5 +1,6 @@
 name: translation;
-generated-by: gregorio 4.1.0-beta3-fix-905-2e2e49a-3303;
+generated-by: gregorio 4.2.0-fix-931-hg:4140:8f33dbde4fa3;
 %%
 (c3)ab[cd](ghZ)
-ab[translation](gh) cd(ij) ef[/](cd) 
+ab[translation](gh) cd(ij) ef[/](cdZ)
+gh,[ij](gh) hi.[jk](hi) ij;[kl](ij) jk:[lm](jk) kl<v>\GreForceHyphen</v>[mn](kl) 
diff --git a/tests/gabc-dump/glyphs/translation.gabc b/tests/gabc-dump/glyphs/translation.gabc
@@ -1,3 +1,4 @@
 name: translation;
 %%
-ab[cd](ghZ) ab[translation](gh) cd(ij) ef[/](cd)
+ab[cd](ghZ) ab[translation](gh) cd(ij) ef[/](cdZ)
+gh,[ij](gh) hi.[jk](hi) ij;[kl](ij) jk:[lm](jk) kl-[mn](kl)
diff --git a/tests/gabc-dump/glyphs/translation.pdf b/tests/gabc-dump/glyphs/translation.pdf
diff --git a/tests/gabc-output/eol-reverse.pdf b/tests/gabc-output/eol-reverse.pdf
diff --git a/tests/gabc-output/eol.pdf b/tests/gabc-output/eol.pdf