diff --git a/.gitignore b/.gitignore index 8961c9b9..eefbb95f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /output/ /var/ /gregorio-test.rc +*.orig diff --git a/tests/gabc-dump/glyphs/above_lines_text.dump b/tests/gabc-dump/glyphs/above_lines_text.dump index ae266ab0..8858f5f4 100644 --- a/tests/gabc-dump/glyphs/above_lines_text.dump +++ b/tests/gabc-dump/glyphs/above_lines_text.dump @@ -107,7 +107,7 @@ shape 1 (S_PUNCTUM) --------------------------------------------------------------------- type 13 (GRE_ALT) - Above lines text "note alt" + Above lines text "note [alt]" --------------------------------------------------------------------- type 5 (GRE_END_OF_LINE) ragged true diff --git a/tests/gabc-dump/glyphs/above_lines_text.exp b/tests/gabc-dump/glyphs/above_lines_text.exp index 8423ab45..2dc0f8f1 100644 --- a/tests/gabc-dump/glyphs/above_lines_text.exp +++ b/tests/gabc-dump/glyphs/above_lines_text.exp @@ -1,6 +1,6 @@ name: above lines text; -generated-by: gregorio 5.2.1--a6b7641f-4476; +generated-by: gregorio 5.2.1-fix-1515-681ef1f2-4478; %% (c3)gh(ghZ) -gh$(with parentheses)(gh[alt:note alt]Z) +gh$(with parentheses)(gh[alt:note $[alt$]]Z) diff --git a/tests/gabc-dump/glyphs/above_lines_text.gabc b/tests/gabc-dump/glyphs/above_lines_text.gabc index 70f42568..63f83db2 100644 --- a/tests/gabc-dump/glyphs/above_lines_text.gabc +++ b/tests/gabc-dump/glyphs/above_lines_text.gabc @@ -1,4 +1,4 @@ name: above lines text; %% ghabove lines $(parentheses)(ghZ) -gh$(with parentheses)(gh[alt:note alt]Z) +gh$(with parentheses)(gh[alt:note [alt$]]Z) diff --git a/tests/gabc-dump/glyphs/above_lines_text.pdf b/tests/gabc-dump/glyphs/above_lines_text.pdf index 81c9ff9e..30d37251 100644 Binary files a/tests/gabc-dump/glyphs/above_lines_text.pdf and b/tests/gabc-dump/glyphs/above_lines_text.pdf differ diff --git a/tests/gabc-dump/glyphs/auto-fusion.exp b/tests/gabc-dump/glyphs/auto-fusion.exp index 66bb60e0..c6c1b133 100644 --- a/tests/gabc-dump/glyphs/auto-fusion.exp +++ b/tests/gabc-dump/glyphs/auto-fusion.exp @@ -1,5 +1,5 @@ name: auto-fusion; -generated-by: gregorio 5.2.1--a6b7641f-4476; +generated-by: gregorio 5.2.1-fix-1515-681ef1f2-4478; %% -(c3)h!@[iw_jijih~](h!iw_@ji@j@ih~) @[jhigjk](jh@ig@jk) @[j@higjk](j@h@ig@jk) @[jhi$](jhi<@g@jk) @[f](f) @[$-ehigjk>](-e@h@ig@jk>) @[gh_g_!@if](g@h_g_!@if) @[gh_g_!if](g@h_g_!@if) @[HGhg](H0G0@hg) @[IGhf](I0G0@hf) @[FGhg](F1G1@hg) @[EGig](E1G1@ig) @[goed](go0@ed) @[geod](g@eo0d) @[geoc](g@eo0c) @[hVfe](hV@f_e) @[hvfe](hv@fe) @[fVij](fV@ij) @[fvij](fv@ij) @[gh[ocba$:1\{]jgih[ocba$:0\}]ghiged](g@h[nv:\GreVarBraceSavePos{1}{1}{1}\GreOverCurlyBrace{\GreVarBraceLength{1}}{0pt}{0pt}{1}{1}]@jg@i@h[nv:\GreVarBraceSavePos{1}{0}{2}]@g@h@i@g@ed) @[igOi](i@gO1i) @[egOe](e@gO0e) @[igO0i](i@gO0i) @[egO1e](e@gO1e) @[egOe](e@gO0e) @[goio](go1@io0) @[goio1](go1@io1) (::) +(c3)h!@$[iw_jijih~$](h!iw_@ji@j@ih~) @$[jhigjk$](jh@ig@jk) @$[j@higjk$](j@h@ig@jk) @$[jhi$$](jhi<@g@jk) @$[f$](f) @$[$-ehigjk>$](-e@h@ig@jk>) @$[gh_g_!@if$](g@h_g_!@if) @$[gh_g_!if$](g@h_g_!@if) @$[HGhg$](H0G0@hg) @$[IGhf$](I0G0@hf) @$[FGhg$](F1G1@hg) @$[EGig$](E1G1@ig) @$[goed$](go0@ed) @$[geod$](g@eo0d) @$[geoc$](g@eo0c) @$[hVfe$](hV@f_e) @$[hvfe$](hv@fe) @$[fVij$](fV@ij) @$[fvij$](fv@ij) @$[gh$[ocba$:1\${$]jgih$[ocba$:0\$}$]ghiged$](g@h[nv:\GreVarBraceSavePos${1$}${1$}${1$}\GreOverCurlyBrace${\GreVarBraceLength${1$}$}${0pt$}${0pt$}${1$}${1$}]@jg@i@h[nv:\GreVarBraceSavePos${1$}${0$}${2$}]@g@h@i@g@ed) @$[igOi$](i@gO1i) @$[egOe$](e@gO0e) @$[igO0i$](i@gO0i) @$[egO1e$](e@gO1e) @$[egOe$](e@gO0e) @$[goio$](go1@io0) @$[goio1$](go1@io1) (::) diff --git a/tests/gabc-dump/glyphs/bars.exp b/tests/gabc-dump/glyphs/bars.exp index 9a3439b2..739a7bd8 100644 --- a/tests/gabc-dump/glyphs/bars.exp +++ b/tests/gabc-dump/glyphs/bars.exp @@ -1,5 +1,5 @@ name: bars; -generated-by: gregorio 5.2.1--a6b7641f-4476; +generated-by: gregorio 5.2.1-fix-1515-681ef1f2-4478; %% (c3),(,) (,) @@ -74,27 +74,27 @@ $,0(,0) `0(`0) (`0) {i`0j}(i`0/j) -\textasciicircum{}(^) +\textasciicircum${$}(^) (^) -{g\textasciicircum{}h}(g^/h) -\textasciicircum{}(^) +{g\textasciicircum${$}h}(g^/h) +\textasciicircum${$}(^) (^) -{h\textasciicircum{}i}(h^/i) -\textasciicircum{}(^) +{h\textasciicircum${$}i}(h^/i) +\textasciicircum${$}(^) (^) -{i\textasciicircum{}j}(i^/j) -\textasciicircum{}(^) +{i\textasciicircum${$}j}(i^/j) +\textasciicircum${$}(^) (^) -{j\textasciicircum{}k}(j^/k) -\textasciicircum{}0(^0) +{j\textasciicircum${$}k}(j^/k) +\textasciicircum${$}0(^0) (^0) -{i\textasciicircum{}0j}(i^0/j) -\textasciicircum{}0(^0) +{i\textasciicircum${$}0j}(i^0/j) +\textasciicircum${$}0(^0) (^0) -{j\textasciicircum{}0k}(j^0/k) -\textasciicircum{}0(^0) +{j\textasciicircum${$}0k}(j^0/k) +\textasciicircum${$}0(^0) (^0) -{k\textasciicircum{}0l}(k^0/l) +{k\textasciicircum${$}0l}(k^0/l) (Z) $,?(,?) (,?) diff --git a/tests/gabc-dump/glyphs/brackets.exp b/tests/gabc-dump/glyphs/brackets.exp index 60dec817..5ac757c8 100644 --- a/tests/gabc-dump/glyphs/brackets.exp +++ b/tests/gabc-dump/glyphs/brackets.exp @@ -1,5 +1,5 @@ name: brackets; -generated-by: gregorio 4.2.0-rc1-fix-844-394a23c-3859; +generated-by: gregorio 5.2.1-fix-1515-681ef1f2-4478; %% -(c3)Test(c/do1e) {e}fe([gv:\GreBracket{0}{7}{8}{}]efe[gv:\GreBracket{1}{7}{8}{}]) {f}gf([gv:\GreBracket{0}{8}{9}{}]fgf[gv:\GreBracket{1}{8}{9}{}]) {g}([gv:\GreBracket{0}{9}{9}{}]g[gv:\GreBracket{1}{9}{9}{}]) {a}m([gv:\GreBracket{0}{3}{15}{}]a/m[gv:\GreBracket{1}{3}{15}{}]) {e}/h([gv:\GreBracket{0}{7}{10}{}]e/h[gv:\GreBracket{1}{7}{10}{}]) {g}e([gv:\GreBracket{0}{7}{9}{}]ge[gv:\GreBracket{1}{7}{9}{}]Z) -{a}([gv:\GreBracket{0}{3}{3}{}]a[gv:\GreBracket{1}{3}{3}{}]) {b}([gv:\GreBracket{0}{4}{4}{}]b[gv:\GreBracket{1}{4}{4}{}]) {c}([gv:\GreBracket{0}{5}{5}{}]c[gv:\GreBracket{1}{5}{5}{}]) {d}([gv:\GreBracket{0}{6}{6}{}]d[gv:\GreBracket{1}{6}{6}{}]) {e}([gv:\GreBracket{0}{7}{7}{}]e[gv:\GreBracket{1}{7}{7}{}]) {f}([gv:\GreBracket{0}{8}{8}{}]f[gv:\GreBracket{1}{8}{8}{}]) {g}([gv:\GreBracket{0}{9}{9}{}]g[gv:\GreBracket{1}{9}{9}{}]) {a}b([gv:\GreBracket{0}{3}{4}{}]ab[gv:\GreBracket{1}{3}{4}{}]) {a}c([gv:\GreBracket{0}{3}{5}{}]ac[gv:\GreBracket{1}{3}{5}{}]) {a}d([gv:\GreBracket{0}{3}{6}{}]ad[gv:\GreBracket{1}{3}{6}{}]) {a}e([gv:\GreBracket{0}{3}{7}{}]ae[gv:\GreBracket{1}{3}{7}{}]) {a}f([gv:\GreBracket{0}{3}{8}{}]af[gv:\GreBracket{1}{3}{8}{}]) {b}c([gv:\GreBracket{0}{4}{5}{}]bc[gv:\GreBracket{1}{4}{5}{}]) {b}d([gv:\GreBracket{0}{4}{6}{}]bd[gv:\GreBracket{1}{4}{6}{}]) {b}e([gv:\GreBracket{0}{4}{7}{}]be[gv:\GreBracket{1}{4}{7}{}]) {b}f([gv:\GreBracket{0}{4}{8}{}]bf[gv:\GreBracket{1}{4}{8}{}]) {b}g([gv:\GreBracket{0}{4}{9}{}]bg[gv:\GreBracket{1}{4}{9}{}]) {c}d([gv:\GreBracket{0}{5}{6}{}]cd[gv:\GreBracket{1}{5}{6}{}]) {c}e([gv:\GreBracket{0}{5}{7}{}]ce[gv:\GreBracket{1}{5}{7}{}]) {c}f([gv:\GreBracket{0}{5}{8}{}]cf[gv:\GreBracket{1}{5}{8}{}]) {c}g([gv:\GreBracket{0}{5}{9}{}]cg[gv:\GreBracket{1}{5}{9}{}]) {c}h([gv:\GreBracket{0}{5}{10}{}]ch[gv:\GreBracket{1}{5}{10}{}]) {d}e([gv:\GreBracket{0}{6}{7}{}]de[gv:\GreBracket{1}{6}{7}{}]) {d}f([gv:\GreBracket{0}{6}{8}{}]df[gv:\GreBracket{1}{6}{8}{}]) {d}g([gv:\GreBracket{0}{6}{9}{}]dg[gv:\GreBracket{1}{6}{9}{}]) {d}h([gv:\GreBracket{0}{6}{10}{}]dh[gv:\GreBracket{1}{6}{10}{}]) {d}i([gv:\GreBracket{0}{6}{11}{}]di[gv:\GreBracket{1}{6}{11}{}]) {e}f([gv:\GreBracket{0}{7}{8}{}]ef[gv:\GreBracket{1}{7}{8}{}]) {e}g([gv:\GreBracket{0}{7}{9}{}]eg[gv:\GreBracket{1}{7}{9}{}]) {e}h([gv:\GreBracket{0}{7}{10}{}]eh[gv:\GreBracket{1}{7}{10}{}]) {e}i([gv:\GreBracket{0}{7}{11}{}]ei[gv:\GreBracket{1}{7}{11}{}]) {e}j([gv:\GreBracket{0}{7}{12}{}]ej[gv:\GreBracket{1}{7}{12}{}]) {f}g([gv:\GreBracket{0}{8}{9}{}]fg[gv:\GreBracket{1}{8}{9}{}]) {f}h([gv:\GreBracket{0}{8}{10}{}]fh[gv:\GreBracket{1}{8}{10}{}]) {f}i([gv:\GreBracket{0}{8}{11}{}]fi[gv:\GreBracket{1}{8}{11}{}]) {f}j([gv:\GreBracket{0}{8}{12}{}]fj[gv:\GreBracket{1}{8}{12}{}]) {f}k([gv:\GreBracket{0}{8}{13}{}]fk[gv:\GreBracket{1}{8}{13}{}]) {g}h([gv:\GreBracket{0}{9}{10}{}]gh[gv:\GreBracket{1}{9}{10}{}]) {g}i([gv:\GreBracket{0}{9}{11}{}]gi[gv:\GreBracket{1}{9}{11}{}]) {g}j([gv:\GreBracket{0}{9}{12}{}]gj[gv:\GreBracket{1}{9}{12}{}]) {g}k([gv:\GreBracket{0}{9}{13}{}]gk[gv:\GreBracket{1}{9}{13}{}]) {g}l([gv:\GreBracket{0}{9}{14}{}]gl[gv:\GreBracket{1}{9}{14}{}]) +(c3)Test(c/do1e) {e}fe([gv:\GreBracket${0$}${7$}${8$}${$}]efe[gv:\GreBracket${1$}${7$}${8$}${$}]) {f}gf([gv:\GreBracket${0$}${8$}${9$}${$}]fgf[gv:\GreBracket${1$}${8$}${9$}${$}]) {g}([gv:\GreBracket${0$}${9$}${9$}${$}]g[gv:\GreBracket${1$}${9$}${9$}${$}]) {a}m([gv:\GreBracket${0$}${3$}${15$}${$}]a/m[gv:\GreBracket${1$}${3$}${15$}${$}]) {e}/h([gv:\GreBracket${0$}${7$}${10$}${$}]e/h[gv:\GreBracket${1$}${7$}${10$}${$}]) {g}e([gv:\GreBracket${0$}${7$}${9$}${$}]ge[gv:\GreBracket${1$}${7$}${9$}${$}]Z) +{a}([gv:\GreBracket${0$}${3$}${3$}${$}]a[gv:\GreBracket${1$}${3$}${3$}${$}]) {b}([gv:\GreBracket${0$}${4$}${4$}${$}]b[gv:\GreBracket${1$}${4$}${4$}${$}]) {c}([gv:\GreBracket${0$}${5$}${5$}${$}]c[gv:\GreBracket${1$}${5$}${5$}${$}]) {d}([gv:\GreBracket${0$}${6$}${6$}${$}]d[gv:\GreBracket${1$}${6$}${6$}${$}]) {e}([gv:\GreBracket${0$}${7$}${7$}${$}]e[gv:\GreBracket${1$}${7$}${7$}${$}]) {f}([gv:\GreBracket${0$}${8$}${8$}${$}]f[gv:\GreBracket${1$}${8$}${8$}${$}]) {g}([gv:\GreBracket${0$}${9$}${9$}${$}]g[gv:\GreBracket${1$}${9$}${9$}${$}]) {a}b([gv:\GreBracket${0$}${3$}${4$}${$}]ab[gv:\GreBracket${1$}${3$}${4$}${$}]) {a}c([gv:\GreBracket${0$}${3$}${5$}${$}]ac[gv:\GreBracket${1$}${3$}${5$}${$}]) {a}d([gv:\GreBracket${0$}${3$}${6$}${$}]ad[gv:\GreBracket${1$}${3$}${6$}${$}]) {a}e([gv:\GreBracket${0$}${3$}${7$}${$}]ae[gv:\GreBracket${1$}${3$}${7$}${$}]) {a}f([gv:\GreBracket${0$}${3$}${8$}${$}]af[gv:\GreBracket${1$}${3$}${8$}${$}]) {b}c([gv:\GreBracket${0$}${4$}${5$}${$}]bc[gv:\GreBracket${1$}${4$}${5$}${$}]) {b}d([gv:\GreBracket${0$}${4$}${6$}${$}]bd[gv:\GreBracket${1$}${4$}${6$}${$}]) {b}e([gv:\GreBracket${0$}${4$}${7$}${$}]be[gv:\GreBracket${1$}${4$}${7$}${$}]) {b}f([gv:\GreBracket${0$}${4$}${8$}${$}]bf[gv:\GreBracket${1$}${4$}${8$}${$}]) {b}g([gv:\GreBracket${0$}${4$}${9$}${$}]bg[gv:\GreBracket${1$}${4$}${9$}${$}]) {c}d([gv:\GreBracket${0$}${5$}${6$}${$}]cd[gv:\GreBracket${1$}${5$}${6$}${$}]) {c}e([gv:\GreBracket${0$}${5$}${7$}${$}]ce[gv:\GreBracket${1$}${5$}${7$}${$}]) {c}f([gv:\GreBracket${0$}${5$}${8$}${$}]cf[gv:\GreBracket${1$}${5$}${8$}${$}]) {c}g([gv:\GreBracket${0$}${5$}${9$}${$}]cg[gv:\GreBracket${1$}${5$}${9$}${$}]) {c}h([gv:\GreBracket${0$}${5$}${10$}${$}]ch[gv:\GreBracket${1$}${5$}${10$}${$}]) {d}e([gv:\GreBracket${0$}${6$}${7$}${$}]de[gv:\GreBracket${1$}${6$}${7$}${$}]) {d}f([gv:\GreBracket${0$}${6$}${8$}${$}]df[gv:\GreBracket${1$}${6$}${8$}${$}]) {d}g([gv:\GreBracket${0$}${6$}${9$}${$}]dg[gv:\GreBracket${1$}${6$}${9$}${$}]) {d}h([gv:\GreBracket${0$}${6$}${10$}${$}]dh[gv:\GreBracket${1$}${6$}${10$}${$}]) {d}i([gv:\GreBracket${0$}${6$}${11$}${$}]di[gv:\GreBracket${1$}${6$}${11$}${$}]) {e}f([gv:\GreBracket${0$}${7$}${8$}${$}]ef[gv:\GreBracket${1$}${7$}${8$}${$}]) {e}g([gv:\GreBracket${0$}${7$}${9$}${$}]eg[gv:\GreBracket${1$}${7$}${9$}${$}]) {e}h([gv:\GreBracket${0$}${7$}${10$}${$}]eh[gv:\GreBracket${1$}${7$}${10$}${$}]) {e}i([gv:\GreBracket${0$}${7$}${11$}${$}]ei[gv:\GreBracket${1$}${7$}${11$}${$}]) {e}j([gv:\GreBracket${0$}${7$}${12$}${$}]ej[gv:\GreBracket${1$}${7$}${12$}${$}]) {f}g([gv:\GreBracket${0$}${8$}${9$}${$}]fg[gv:\GreBracket${1$}${8$}${9$}${$}]) {f}h([gv:\GreBracket${0$}${8$}${10$}${$}]fh[gv:\GreBracket${1$}${8$}${10$}${$}]) {f}i([gv:\GreBracket${0$}${8$}${11$}${$}]fi[gv:\GreBracket${1$}${8$}${11$}${$}]) {f}j([gv:\GreBracket${0$}${8$}${12$}${$}]fj[gv:\GreBracket${1$}${8$}${12$}${$}]) {f}k([gv:\GreBracket${0$}${8$}${13$}${$}]fk[gv:\GreBracket${1$}${8$}${13$}${$}]) {g}h([gv:\GreBracket${0$}${9$}${10$}${$}]gh[gv:\GreBracket${1$}${9$}${10$}${$}]) {g}i([gv:\GreBracket${0$}${9$}${11$}${$}]gi[gv:\GreBracket${1$}${9$}${11$}${$}]) {g}j([gv:\GreBracket${0$}${9$}${12$}${$}]gj[gv:\GreBracket${1$}${9$}${12$}${$}]) {g}k([gv:\GreBracket${0$}${9$}${13$}${$}]gk[gv:\GreBracket${1$}${9$}${13$}${$}]) {g}l([gv:\GreBracket${0$}${9$}${14$}${$}]gl[gv:\GreBracket${1$}${9$}${14$}${$}]) diff --git a/tests/gabc-dump/glyphs/centering-edge-cases.exp b/tests/gabc-dump/glyphs/centering-edge-cases.exp index 3ebe9153..81c0fb6e 100644 --- a/tests/gabc-dump/glyphs/centering-edge-cases.exp +++ b/tests/gabc-dump/glyphs/centering-edge-cases.exp @@ -1,5 +1,5 @@ name: centering edge cases; -generated-by: gregorio 4.1.0-beta3-fix-905-2e2e49a-3303; +generated-by: gregorio 5.2.1-fix-1515-681ef1f2-4478; %% (c3)Centering edge cases(g) (::Z) -clara(g) clara(g) clara(g) clara(g) \textbf{cla}ra(g) \textbf{clar}a(g) clar\textbf{a}(g) cla\textbf{ra}(g) clara(g) clara(g) clara(g) clara(g) ra(g) a(g) clar(g) cla(g) +clara(g) clara(g) clara(g) clara(g) \textbf${cla$}ra(g) \textbf${clar$}a(g) clar\textbf${a$}(g) cla\textbf${ra$}(g) clara(g) clara(g) clara(g) clara(g) ra(g) a(g) clar(g) cla(g) diff --git a/tests/gabc-dump/glyphs/divisio_finalis.exp b/tests/gabc-dump/glyphs/divisio_finalis.exp index 088cfd56..9f7eb1b3 100644 --- a/tests/gabc-dump/glyphs/divisio_finalis.exp +++ b/tests/gabc-dump/glyphs/divisio_finalis.exp @@ -1,6 +1,6 @@ name: the final divisio finalis; -generated-by: gregorio 4.1.0-beta3-fix-905-2e2e49a-3303; +generated-by: gregorio 5.2.1-fix-1515-681ef1f2-4478; %% (c3)d(d) h+(::h+) -(::[ev:{X}]f+) +(::[ev:${X$}]f+) diff --git a/tests/gabc-dump/glyphs/fusion.exp b/tests/gabc-dump/glyphs/fusion.exp index e75cab65..e4628fd3 100644 --- a/tests/gabc-dump/glyphs/fusion.exp +++ b/tests/gabc-dump/glyphs/fusion.exp @@ -1,5 +1,5 @@ name: fusion; -generated-by: gregorio 5.2.1--a6b7641f-4476; +generated-by: gregorio 5.2.1-fix-1515-681ef1f2-4478; %% -(c3)h!iw@ji@j@ih~(h!iw@ji@j@ih~) $-e@hj(-e@hj) f@g[ocb:1;6mm]@ij(f@g[nv:\GreOverCurlyBrace{6mm}{0pt}{0pt}{1}{0}]@ij) e@g(i@g) HI@jg(H1I1@jg) GH@jg(G1H1@jg) d@d(d@d) h@f_e~(h@f_e~) e@g(e@g) h!iw_@ji@j@ih~(h!iw_@ji@j@ih~) h!iw_@j_i@j@ih~(h!iw_@j_i@j@ih~) h!iw_@j_i_@j@ih~(h!iw_@j_i_@j@ih~) h!iw'_@j_i_@j_@ih~(h!iw'_@j_i_@j_@ih~) h$.@e@fd>(h.@e@fd>) jh@i_g@jk(jh@i_g@jk) jh@ig_@jk~(jh@ig_@jk~) jh@i_g_@j_h(jh@i_g_@j_h) f@g@h@j'h@i_g_@j$.@h@f@e@d@gi$<(f@g@h@j'h@i_g_@j.@h@f@e@d@gi<) @[fghj'hi_g_j$.hfedgi$<](f@g@h@j'h@i_g_@j.@h@f@e@d@gi<) f'_@hf(f'_@hf) f_@if@ge(f_@if@ge) g'@hg_@i_f(g'@hg_@i_f) g_@h_g_@if(g_@h_g_@if) g@h_g_@if(g@h_g_@if) g@h_g_!@if(g@h_g_!@if) f@gwh(f@gwh) e@gwh(e@gwi) f@gw@hi(f@gw@hi) e@gw@ih(e@gw@ih) e@gW@ih(e@gw@ih) e@gij(e@gij) e@g@ece(e@g@ece) e@g@ec@e(e@g@ec@e) e@g@igi(e@g@igi) e@g@ig@i(e@g@ig@i) gw@ij(gw@ij) gW@ij(gw@ij) $-g@ed(-g@ed) g@ed(g@ed) g@ec(g@ec) hV@fe(hV@fe) hv@fe(hv@fe) fV@hi(fV@hi) fv@hi(fv@hi) e@gor@i(e@go1r@i) e@gr@i(e@gr@i) e@Gr@i(e@G1r@i) g@cd(g@cd) hV@g@e(hV@g@e) eV@d@b(eV@d@b) gV@f@d(gV@f@d) f@gh@i(f@gh@i) $-g@i@gi~(-g@i@gi~) gV@eg~(gV@eg~) (::) +(c3)h!iw@ji@j@ih~(h!iw@ji@j@ih~) $-e@hj(-e@hj) f@g$[ocb$:1$;6mm$]@ij(f@g[nv:\GreOverCurlyBrace${6mm$}${0pt$}${0pt$}${1$}${0$}]@ij) e@g(i@g) HI@jg(H1I1@jg) GH@jg(G1H1@jg) d@d(d@d) h@f_e~(h@f_e~) e@g(e@g) h!iw_@ji@j@ih~(h!iw_@ji@j@ih~) h!iw_@j_i@j@ih~(h!iw_@j_i@j@ih~) h!iw_@j_i_@j@ih~(h!iw_@j_i_@j@ih~) h!iw'_@j_i_@j_@ih~(h!iw'_@j_i_@j_@ih~) h$.@e@fd>(h.@e@fd>) jh@i_g@jk(jh@i_g@jk) jh@ig_@jk~(jh@ig_@jk~) jh@i_g_@j_h(jh@i_g_@j_h) f@g@h@j'h@i_g_@j$.@h@f@e@d@gi$<(f@g@h@j'h@i_g_@j.@h@f@e@d@gi<) @$[fghj'hi_g_j$.hfedgi$<$](f@g@h@j'h@i_g_@j.@h@f@e@d@gi<) f'_@hf(f'_@hf) f_@if@ge(f_@if@ge) g'@hg_@i_f(g'@hg_@i_f) g_@h_g_@if(g_@h_g_@if) g@h_g_@if(g@h_g_@if) g@h_g_!@if(g@h_g_!@if) f@gwh(f@gwh) e@gwh(e@gwi) f@gw@hi(f@gw@hi) e@gw@ih(e@gw@ih) e@gW@ih(e@gw@ih) e@gij(e@gij) e@g@ece(e@g@ece) e@g@ec@e(e@g@ec@e) e@g@igi(e@g@igi) e@g@ig@i(e@g@ig@i) gw@ij(gw@ij) gW@ij(gw@ij) $-g@ed(-g@ed) g@ed(g@ed) g@ec(g@ec) hV@fe(hV@fe) hv@fe(hv@fe) fV@hi(fV@hi) fv@hi(fv@hi) e@gor@i(e@go1r@i) e@gr@i(e@gr@i) e@Gr@i(e@G1r@i) g@cd(g@cd) hV@g@e(hV@g@e) eV@d@b(eV@d@b) gV@f@d(gV@f@d) f@gh@i(f@gh@i) $-g@i@gi~(-g@i@gi~) gV@eg~(gV@eg~) (::) diff --git a/tests/gabc-dump/glyphs/ledger_lines.exp b/tests/gabc-dump/glyphs/ledger_lines.exp index a4c58299..90918528 100644 --- a/tests/gabc-dump/glyphs/ledger_lines.exp +++ b/tests/gabc-dump/glyphs/ledger_lines.exp @@ -1,26 +1,26 @@ name: ledger lines; -generated-by: gregorio 5.2.1-develop-6f8ad691-4369; +generated-by: gregorio 5.2.1-fix-1515-681ef1f2-4478; %% -(c4)static over([gv:\GreDrawAdditionalLine{0}{4 cm}{2}{1 cm}{0}{}]lxg_i_h_!iwj.i!jwk!lv_K0J0) (:Z) -static under([gv:\GreDrawAdditionalLine{1}{4 cm}{2}{1 cm}{0}{}]lxg_i_h_!iwj.i!jwk!lv_K0J0) (:Z) -variable over([gv:\GreVarBraceSavePos{1}{0}{1}\GreDrawAdditionalLine{0}{\GreVarBraceLength{1}}{1}{}{1}{}]lxg_[hl:1]i_[hl:1]h_[hl:1]!iw[hl:1]j.[hl:1]i[hl:1]!jw[hl:1]k[hl:1]!lv_[gv:\GreVarBraceSavePos{1}{0}{2}]K0J0) (:) -variable under([gv:\GreVarBraceSavePos{2}{0}{1}\GreDrawAdditionalLine{1}{\GreVarBraceLength{2}}{1}{}{1}{}]lx[ll:1]g_[ll:1]i_[ll:1]h_[ll:1]!iw[ll:1]j.[ll:1]i[ll:1]!jw[ll:1]k[ll:1]!lv_[ll:1][gv:\GreVarBraceSavePos{2}{0}{2}]K0J0) (:Z) -over heuristic([gv:\GreVarBraceSavePos{3}{0}{1}\GreDrawAdditionalLine{0}{\GreVarBraceLength{3}}{0}{}{2}{1cm}]jq[hl:1]k_[hl:1]/jq[hl:1]k_[hl:1][gv:\GreVarBraceSavePos{3}{0}{2}]) (:) -under heuristic([gv:\GreVarBraceSavePos{4}{0}{1}\GreDrawAdditionalLine{1}{\GreVarBraceLength{4}}{0}{}{2}{1cm}]d[ll:1]c_0[ll:1]/d[ll:1]c_0[ll:1][gv:\GreVarBraceSavePos{4}{0}{2}]) (:Z) +(c4)static over([gv:\GreDrawAdditionalLine${0$}${4 cm$}${2$}${1 cm$}${0$}${$}]lxg_i_h_!iwj.i!jwk!lv_K0J0) (:Z) +static under([gv:\GreDrawAdditionalLine${1$}${4 cm$}${2$}${1 cm$}${0$}${$}]lxg_i_h_!iwj.i!jwk!lv_K0J0) (:Z) +variable over([gv:\GreVarBraceSavePos${1$}${0$}${1$}\GreDrawAdditionalLine${0$}${\GreVarBraceLength${1$}$}${1$}${$}${1$}${$}]lxg_[hl:1]i_[hl:1]h_[hl:1]!iw[hl:1]j.[hl:1]i[hl:1]!jw[hl:1]k[hl:1]!lv_[gv:\GreVarBraceSavePos${1$}${0$}${2$}]K0J0) (:) +variable under([gv:\GreVarBraceSavePos${2$}${0$}${1$}\GreDrawAdditionalLine${1$}${\GreVarBraceLength${2$}$}${1$}${$}${1$}${$}]lx[ll:1]g_[ll:1]i_[ll:1]h_[ll:1]!iw[ll:1]j.[ll:1]i[ll:1]!jw[ll:1]k[ll:1]!lv_[ll:1][gv:\GreVarBraceSavePos${2$}${0$}${2$}]K0J0) (:Z) +over heuristic([gv:\GreVarBraceSavePos${3$}${0$}${1$}\GreDrawAdditionalLine${0$}${\GreVarBraceLength${3$}$}${0$}${$}${2$}${1cm$}]jq[hl:1]k_[hl:1]/jq[hl:1]k_[hl:1][gv:\GreVarBraceSavePos${3$}${0$}${2$}]) (:) +under heuristic([gv:\GreVarBraceSavePos${4$}${0$}${1$}\GreDrawAdditionalLine${1$}${\GreVarBraceLength${4$}$}${0$}${$}${2$}${1cm$}]d[ll:1]c_0[ll:1]/d[ll:1]c_0[ll:1][gv:\GreVarBraceSavePos${4$}${0$}${2$}]) (:Z) draw explicit over(lxg_i_h_[oll:1]!iwj.i!jwk!lv_K0J0) (:) draw explicit under(lxg_i_h_[ull:1]!iwj.i!jwk!lv_K0J0) (:) omit explicit over(lxg_i_h_[oll:0]!iwj.i!jwk!lv_K0J0) (:) omit explicit under(lxg_i_h_[ull:0]!iwj.i!jwk!lv_K0J0) (:Z) -autofuse(c@e@g[gv:\GreVarBraceSavePos{5}{0}{1}\GreDrawAdditionalLine{0}{\GreVarBraceLength{5}}{1}{}{1}{}]@i[hl:1]@k[hl:1]@i[hl:1][gv:\GreVarBraceSavePos{5}{0}{2}]@ge) (::) -autofuse(c@e@g[gv:\GreDrawAdditionalLine{0}{1cm}{1}{}{0}{}]@i@k@i@ge) (::) -autofuse([gv:\GreVarBraceSavePos{6}{0}{1}\GreDrawAdditionalLine{0}{\GreVarBraceLength{6}}{1}{}{1}{}]c[hl:1]@e[hl:1]@g[hl:1]@i[hl:1]@k[hl:1]@i[hl:1][gv:\GreVarBraceSavePos{6}{0}{2}]@ge) (::) -autofuse(c@e@g[gv:\GreVarBraceSavePos{7}{0}{1}\GreDrawAdditionalLine{0}{\GreVarBraceLength{7}}{1}{}{0}{}]@i[hl:1]@k[hl:1]@i[hl:1]@g[hl:1]e[hl:1][gv:\GreVarBraceSavePos{7}{0}{2}]) (::) -autofuse(c@e@g[gv:\GreVarBraceSavePos{8}{0}{1}\GreDrawAdditionalLine{0}{\GreVarBraceLength{8}}{1}{}{0}{}]@i[hl:1]@k[hl:1]@i[hl:1][gv:\GreVarBraceSavePos{8}{0}{2}]@g[hl:1]e) (::Z) -fusion(c@e@g[gv:\GreVarBraceSavePos{9}{0}{1}\GreDrawAdditionalLine{0}{\GreVarBraceLength{9}}{1}{}{1}{}]@i[hl:1]@k[hl:1]@i[hl:1][gv:\GreVarBraceSavePos{9}{0}{2}]@g@e) (::) -fusion(c@e@g[gv:\GreDrawAdditionalLine{0}{1cm}{1}{}{0}{}]@i@k@i@g@e) (::) -fusion([gv:\GreVarBraceSavePos{10}{0}{1}\GreDrawAdditionalLine{0}{\GreVarBraceLength{10}}{1}{}{1}{}]c[hl:1]@e[hl:1]@g[hl:1]@i[hl:1]@k[hl:1]@i[hl:1][gv:\GreVarBraceSavePos{10}{0}{2}]@g@e) (::) -fusion(c@e@g[gv:\GreVarBraceSavePos{11}{0}{1}\GreDrawAdditionalLine{0}{\GreVarBraceLength{11}}{1}{}{0}{}]@i[hl:1]@k[hl:1]@i[hl:1]@g[hl:1]@e[hl:1][gv:\GreVarBraceSavePos{11}{0}{2}]) (::) -fusion(c@e@g[gv:\GreVarBraceSavePos{12}{0}{1}\GreDrawAdditionalLine{0}{\GreVarBraceLength{12}}{1}{}{0}{}]@i[hl:1]@k[hl:1]@i[hl:1]@g[hl:1][gv:\GreVarBraceSavePos{12}{0}{2}]@e) (::Z) +autofuse(c@e@g[gv:\GreVarBraceSavePos${5$}${0$}${1$}\GreDrawAdditionalLine${0$}${\GreVarBraceLength${5$}$}${1$}${$}${1$}${$}]@i[hl:1]@k[hl:1]@i[hl:1][gv:\GreVarBraceSavePos${5$}${0$}${2$}]@ge) (::) +autofuse(c@e@g[gv:\GreDrawAdditionalLine${0$}${1cm$}${1$}${$}${0$}${$}]@i@k@i@ge) (::) +autofuse([gv:\GreVarBraceSavePos${6$}${0$}${1$}\GreDrawAdditionalLine${0$}${\GreVarBraceLength${6$}$}${1$}${$}${1$}${$}]c[hl:1]@e[hl:1]@g[hl:1]@i[hl:1]@k[hl:1]@i[hl:1][gv:\GreVarBraceSavePos${6$}${0$}${2$}]@ge) (::) +autofuse(c@e@g[gv:\GreVarBraceSavePos${7$}${0$}${1$}\GreDrawAdditionalLine${0$}${\GreVarBraceLength${7$}$}${1$}${$}${0$}${$}]@i[hl:1]@k[hl:1]@i[hl:1]@g[hl:1]e[hl:1][gv:\GreVarBraceSavePos${7$}${0$}${2$}]) (::) +autofuse(c@e@g[gv:\GreVarBraceSavePos${8$}${0$}${1$}\GreDrawAdditionalLine${0$}${\GreVarBraceLength${8$}$}${1$}${$}${0$}${$}]@i[hl:1]@k[hl:1]@i[hl:1][gv:\GreVarBraceSavePos${8$}${0$}${2$}]@g[hl:1]e) (::Z) +fusion(c@e@g[gv:\GreVarBraceSavePos${9$}${0$}${1$}\GreDrawAdditionalLine${0$}${\GreVarBraceLength${9$}$}${1$}${$}${1$}${$}]@i[hl:1]@k[hl:1]@i[hl:1][gv:\GreVarBraceSavePos${9$}${0$}${2$}]@g@e) (::) +fusion(c@e@g[gv:\GreDrawAdditionalLine${0$}${1cm$}${1$}${$}${0$}${$}]@i@k@i@g@e) (::) +fusion([gv:\GreVarBraceSavePos${10$}${0$}${1$}\GreDrawAdditionalLine${0$}${\GreVarBraceLength${10$}$}${1$}${$}${1$}${$}]c[hl:1]@e[hl:1]@g[hl:1]@i[hl:1]@k[hl:1]@i[hl:1][gv:\GreVarBraceSavePos${10$}${0$}${2$}]@g@e) (::) +fusion(c@e@g[gv:\GreVarBraceSavePos${11$}${0$}${1$}\GreDrawAdditionalLine${0$}${\GreVarBraceLength${11$}$}${1$}${$}${0$}${$}]@i[hl:1]@k[hl:1]@i[hl:1]@g[hl:1]@e[hl:1][gv:\GreVarBraceSavePos${11$}${0$}${2$}]) (::) +fusion(c@e@g[gv:\GreVarBraceSavePos${12$}${0$}${1$}\GreDrawAdditionalLine${0$}${\GreVarBraceLength${12$}$}${1$}${$}${0$}${$}]@i[hl:1]@k[hl:1]@i[hl:1]@g[hl:1][gv:\GreVarBraceSavePos${12$}${0$}${2$}]@e) (::Z) high symbols(g lx : lx? : ly : ly? : l# : l#? : `0 : `0? : ,0 : ,0?) (::Z) diff --git a/tests/gabc-dump/glyphs/macros.exp b/tests/gabc-dump/glyphs/macros.exp index 9d98ee47..ee7d0d76 100644 --- a/tests/gabc-dump/glyphs/macros.exp +++ b/tests/gabc-dump/glyphs/macros.exp @@ -1,4 +1,4 @@ name: macros; -generated-by: gregorio 4.0.0-rc2-fix-670-af3219a-2704; +generated-by: gregorio 5.2.1-fix-1515-681ef1f2-4478; %% -(c3)ab(g[nv:%test1]h[nv:%test2][gv:%test3] gh[gv:%test4] [ev:%test5] g[nv:%test6test7] g[nv:%test72]) +(c3)ab(g[nv:$%test1]h[nv:$%test2][gv:$%test3] gh[gv:$%test4] [ev:$%test5] g[nv:$%test6test7] g[nv:$%test72]) diff --git a/tests/gabc-dump/glyphs/over_braces.exp b/tests/gabc-dump/glyphs/over_braces.exp index 5e9d8c6c..d8b55d13 100644 --- a/tests/gabc-dump/glyphs/over_braces.exp +++ b/tests/gabc-dump/glyphs/over_braces.exp @@ -1,9 +1,9 @@ name: over braces; -generated-by: gregorio 4.1.0-beta3-fix-905-2e2e49a-3303; +generated-by: gregorio 5.2.1-fix-1515-681ef1f2-4478; %% (c3)ab(g,_/h) ab(g_,_/h_) ab(g,'_/h) ab(g_,'_ h_) -ab(g[nv:\GreOverBrace{6mm}{0pt}{0pt}{1}]!hgh) ab(g[nv:\GreOverCurlyBrace{6mm}{0pt}{0pt}{1}{0}]!hghZ) -ab(g[nv:\GreOverCurlyBrace{6mm}{0pt}{0pt}{1}{1}]/hgh) ab(g[nv:\GreUnderBrace{6mm}{0pt}{0pt}{1}]!hgh) +ab(g[nv:\GreOverBrace${6mm$}${0pt$}${0pt$}${1$}]!hgh) ab(g[nv:\GreOverCurlyBrace${6mm$}${0pt$}${0pt$}${1$}${0$}]!hghZ) +ab(g[nv:\GreOverCurlyBrace${6mm$}${0pt$}${0pt$}${1$}${1$}]/hgh) ab(g[nv:\GreUnderBrace${6mm$}${0pt$}${0pt$}${1$}]!hgh) diff --git a/tests/gabc-dump/glyphs/punctum-inclinatum.exp b/tests/gabc-dump/glyphs/punctum-inclinatum.exp index b56b4e63..6591b6fc 100644 --- a/tests/gabc-dump/glyphs/punctum-inclinatum.exp +++ b/tests/gabc-dump/glyphs/punctum-inclinatum.exp @@ -1,13 +1,13 @@ name: punctum inclinatum; -generated-by: gregorio 5.2.1--a6b7641f-4476; +generated-by: gregorio 5.2.1-fix-1515-681ef1f2-4478; %% -(c3)@[HGhg](H0G0@hg) @[IGhf](I0G0@hf) @[JGhe](J0G0@he) @[KGhd](K0G0@hd) @[LGhc](L0G0@hcZ) -@[FGhg](F1G1@hg) @[EG_i_g](E1G1_@i_g) @[DGjg](D1G1@jg) @[CGkg](C1G1@kg) @[BGlg](B1G1@lg) @[EG_ig](E1G1_@igZ) -@[HGfc](H0G0@fc) @[IG_ec](I0G0_@ec) @[JG_d_c](J0G0_@d_c) @[HG_h_fg](H0G0_@h_fg) @[IGifg](I0G0@ifg) @[JGjfg](J0G0@jfgZ) -@[HG~hg](H0G~@hg) @[IG~hf](I0G~@hf) @[JG~he](J0G~@he) @[KG~hd](K0G~@hd) @[LG~hc](L0G~@hcZ) -@[FG~hg](F0G~@hg) @[EG~ig](E0G~@ig) @[DG~jg](D0G~@jg) @[CG~kg](C0G~@kg) @[BG~lg](B0G~@lgZ) -@[H~G~hg](H~G~@hg) @[I~G~hf](I~G~@hf) @[J~G~he](J~G~@he) @[K~G~hd](K~G~@hd) @[L~G~hc](L~G~@hcZ) -@[F~G~hg](F~G~@hg) @[E~G~ig](E~G~@ig) @[D~G~jg](D~G~@jg) @[C~G~kg](C~G~@kg) @[B~G~lg](B~G~@lgZ) -@[HG$](H0G<@hg) @[IG$](I0G<@hf) @[JG$](J0G<@he) @[KG$](K0G<@hd) @[LG$](L0G<@hcZ) -@[FG$](F0G<@hg) @[EG$](E0G<@ig) @[DG$](D0G<@jg) @[CG$](C0G<@kg) @[BG$](B0G<@lg) (::) +(c3)@$[HGhg$](H0G0@hg) @$[IGhf$](I0G0@hf) @$[JGhe$](J0G0@he) @$[KGhd$](K0G0@hd) @$[LGhc$](L0G0@hcZ) +@$[FGhg$](F1G1@hg) @$[EG_i_g$](E1G1_@i_g) @$[DGjg$](D1G1@jg) @$[CGkg$](C1G1@kg) @$[BGlg$](B1G1@lg) @$[EG_ig$](E1G1_@igZ) +@$[HGfc$](H0G0@fc) @$[IG_ec$](I0G0_@ec) @$[JG_d_c$](J0G0_@d_c) @$[HG_h_fg$](H0G0_@h_fg) @$[IGifg$](I0G0@ifg) @$[JGjfg$](J0G0@jfgZ) +@$[HG~hg$](H0G~@hg) @$[IG~hf$](I0G~@hf) @$[JG~he$](J0G~@he) @$[KG~hd$](K0G~@hd) @$[LG~hc$](L0G~@hcZ) +@$[FG~hg$](F0G~@hg) @$[EG~ig$](E0G~@ig) @$[DG~jg$](D0G~@jg) @$[CG~kg$](C0G~@kg) @$[BG~lg$](B0G~@lgZ) +@$[H~G~hg$](H~G~@hg) @$[I~G~hf$](I~G~@hf) @$[J~G~he$](J~G~@he) @$[K~G~hd$](K~G~@hd) @$[L~G~hc$](L~G~@hcZ) +@$[F~G~hg$](F~G~@hg) @$[E~G~ig$](E~G~@ig) @$[D~G~jg$](D~G~@jg) @$[C~G~kg$](C~G~@kg) @$[B~G~lg$](B~G~@lgZ) +@$[HG$$](H0G<@hg) @$[IG$$](I0G<@hf) @$[JG$$](J0G<@he) @$[KG$$](K0G<@hd) @$[LG$$](L0G<@hcZ) +@$[FG$$](F0G<@hg) @$[EG$$](E0G<@ig) @$[DG$$](D0G<@jg) @$[CG$$](C0G<@kg) @$[BG$$](B0G<@lg) (::) diff --git a/tests/gabc-dump/glyphs/spaces.exp b/tests/gabc-dump/glyphs/spaces.exp index 3ec1a235..905365a4 100644 --- a/tests/gabc-dump/glyphs/spaces.exp +++ b/tests/gabc-dump/glyphs/spaces.exp @@ -1,6 +1,6 @@ name: spaces; -generated-by: gregorio 4.1.0-beta3-fix-905-2e2e49a-3303; +generated-by: gregorio 5.2.1-fix-1515-681ef1f2-4478; %% (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) +{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) {c/!d f!/!g}(c/!d f/!g) diff --git a/tests/gabc-dump/glyphs/styles.exp b/tests/gabc-dump/glyphs/styles.exp index 4fe95011..d1ea18a9 100644 --- a/tests/gabc-dump/glyphs/styles.exp +++ b/tests/gabc-dump/glyphs/styles.exp @@ -1,8 +1,8 @@ name: styles, verb and special characters; -generated-by: gregorio 5.2.1--a6b7641f-4476; +generated-by: gregorio 5.2.1-fix-1515-681ef1f2-4478; %% (c3)italicsbold
    underline
+a(gZ) -$+%><>(fZ) +$+$%>$<>$(fZ) Small Caps(e) xcolored(eZ) ItalicBoldSmallColoredCapsFaceFont(iZ) BoldTeletypeFont(gZ) diff --git a/tests/gabc-dump/glyphs/text-before-clef.exp b/tests/gabc-dump/glyphs/text-before-clef.exp index 2ca25f76..ae4fd746 100644 --- a/tests/gabc-dump/glyphs/text-before-clef.exp +++ b/tests/gabc-dump/glyphs/text-before-clef.exp @@ -1,6 +1,6 @@ name: text before clef; -generated-by: gregorio 4.2.0-beta1-fix-856-7ee4d55-3666; +generated-by: gregorio 5.2.1-fix-1515-681ef1f2-4478; %% -(c3)@[hiwjijih~](h@iw@ji@j@ih~) (;) -@[deofd](d@eo1@fd) (;) -@[IJkh](I1J1@kh) +(c3)@$[hiwjijih~$](h@iw@ji@j@ih~) (;) +@$[deofd$](d@eo1@fd) (;) +@$[IJkh$](I1J1@kh) diff --git a/tests/gabc-dump/glyphs/verbatim.exp b/tests/gabc-dump/glyphs/verbatim.exp index ef4a104c..110e033b 100644 --- a/tests/gabc-dump/glyphs/verbatim.exp +++ b/tests/gabc-dump/glyphs/verbatim.exp @@ -1,7 +1,7 @@ name: tex verbatim; -generated-by: gregorio 4.1.0-beta3-fix-905-2e2e49a-3303; +generated-by: gregorio 5.2.1-fix-1515-681ef1f2-4478; %% -(c3)\{gr\}ir([ev:\hbox to 0pt{]/gr[ev:\hss% -}% +(c3)\${gr\$}ir([ev:\hbox to 0pt${]/gr[ev:\hss$% +$}$% \GreNoBreak\relax ]/irZ) diff --git a/tests/gabc-gabc/episema_with_ledger_line.exp b/tests/gabc-gabc/episema_with_ledger_line.exp index 61a48018..922c595a 100644 --- a/tests/gabc-gabc/episema_with_ledger_line.exp +++ b/tests/gabc-gabc/episema_with_ledger_line.exp @@ -1,5 +1,5 @@ name: episema with ledger line; -generated-by: gregorio 5.2.1--a6b7641f-4476; +generated-by: gregorio 5.2.1-fix-1515-681ef1f2-4478; %% (c3)k_(k_) c_0(c_0) (:) l/k_(l/k_) b/c_0(b/c_0) (:) @@ -15,9 +15,9 @@ k_j_i_/l(k_j_/i_/l) c_0!d_0!e_0/b(c_0!d_0!e_0/b) (:) j_jk_(j_jk_) c_0c_0d(c_0c_0d) (:) l/j_jk_(l/j_jk_) b/c_0c_0d(b/c_0c_0d) (:) j_jk_/l(j_jk_/l) c_0c_0d/b(c_0c_0d/b) (::) -k[hl$:1]_(k_[hl:1]) c[ll$:1]_0(c_0[ll:1]) (:) -l/k[hl$:0]_(l/k_[hl:0]) b/c[ll$:0]_0(b/c_0[ll:0]) (:) -k[hl$:0]_/l(k_[hl:0]/l) c[ll$:0]_0/b(c_0[ll:0]/b) (::) +k$[hl$:1$]_(k_[hl:1]) c$[ll$:1$]_0(c_0[ll:1]) (:) +l/k$[hl$:0$]_(l/k_[hl:0]) b/c$[ll$:0$]_0(b/c_0[ll:0]) (:) +k$[hl$:0$]_/l(k_[hl:0]/l) c$[ll$:0$]_0/b(c_0[ll:0]/b) (::) l/m_0(l/m_0) b/a_(b/a_) (:) m_0/l(m_0/l) a_/b(a_/b) (:) l/m_0m_0(l/m_0m_0) b/a_a_(b/a_a_) (:) diff --git a/tests/gabc-gabc/first_syllable/initial-second-verbatim.exp b/tests/gabc-gabc/first_syllable/initial-second-verbatim.exp index aefd4712..ed95fccb 100644 --- a/tests/gabc-gabc/first_syllable/initial-second-verbatim.exp +++ b/tests/gabc-gabc/first_syllable/initial-second-verbatim.exp @@ -1,4 +1,4 @@ name: initial-second-verbatim; -generated-by: gregorio 4.0.0-rc2-fix-670-fefd9da-2697; +generated-by: gregorio 5.2.1-fix-1515-681ef1f2-4478; %% -(c3)L\TeX{}(c) +(c3)L\TeX${$}(c) diff --git a/tests/gabc-gabc/first_syllable/initial-verbatim.exp b/tests/gabc-gabc/first_syllable/initial-verbatim.exp index 1901a6c8..a62687d9 100644 --- a/tests/gabc-gabc/first_syllable/initial-verbatim.exp +++ b/tests/gabc-gabc/first_syllable/initial-verbatim.exp @@ -1,4 +1,4 @@ name: initial-verbatim; -generated-by: gregorio 4.0.0-rc2-fix-670-fefd9da-2697; +generated-by: gregorio 5.2.1-fix-1515-681ef1f2-4478; %% -(c3)\TeX{}Live(c) +(c3)\TeX${$}Live(c) diff --git a/tests/gabc-gabc/first_syllable/no-initial-second-verbatim.exp b/tests/gabc-gabc/first_syllable/no-initial-second-verbatim.exp index 4fcbf718..8faf9418 100644 --- a/tests/gabc-gabc/first_syllable/no-initial-second-verbatim.exp +++ b/tests/gabc-gabc/first_syllable/no-initial-second-verbatim.exp @@ -1,4 +1,4 @@ name: no-initial-second-verbatim; -generated-by: gregorio 4.0.0-rc2-fix-670-af3219a-2704; +generated-by: gregorio 5.2.1-fix-1515-681ef1f2-4478; %% -(c3)L\TeX{}(c) +(c3)L\TeX${$}(c) diff --git a/tests/gabc-gabc/first_syllable/no-initial-verbatim.exp b/tests/gabc-gabc/first_syllable/no-initial-verbatim.exp index 060bf9c8..e687c5ed 100644 --- a/tests/gabc-gabc/first_syllable/no-initial-verbatim.exp +++ b/tests/gabc-gabc/first_syllable/no-initial-verbatim.exp @@ -1,4 +1,4 @@ name: no-initial-verbatim; -generated-by: gregorio 4.0.0-rc2-fix-670-af3219a-2704; +generated-by: gregorio 5.2.1-fix-1515-681ef1f2-4478; %% -(c3)\TeX{}Live(c) +(c3)\TeX${$}Live(c) diff --git a/tests/gabc-gabc/first_syllable/styled-initial-second-verbatim.exp b/tests/gabc-gabc/first_syllable/styled-initial-second-verbatim.exp index d400eb17..ad8cf3b1 100644 --- a/tests/gabc-gabc/first_syllable/styled-initial-second-verbatim.exp +++ b/tests/gabc-gabc/first_syllable/styled-initial-second-verbatim.exp @@ -1,4 +1,4 @@ name: styled-initial-second-verbatim; -generated-by: gregorio 4.0.0-rc2-fix-670-af3219a-2704; +generated-by: gregorio 5.2.1-fix-1515-681ef1f2-4478; %% -(c3)L\TeX{}(c) +(c3)L\TeX${$}(c) diff --git a/tests/gabc-gabc/first_syllable/styled-initial-verbatim.exp b/tests/gabc-gabc/first_syllable/styled-initial-verbatim.exp index 589473de..00f70162 100644 --- a/tests/gabc-gabc/first_syllable/styled-initial-verbatim.exp +++ b/tests/gabc-gabc/first_syllable/styled-initial-verbatim.exp @@ -1,4 +1,4 @@ name: styled-initial-verbatim; -generated-by: gregorio 4.0.0-rc2-fix-670-af3219a-2704; +generated-by: gregorio 5.2.1-fix-1515-681ef1f2-4478; %% -(c3)\TeX{}Live(c) +(c3)\TeX${$}Live(c) diff --git a/tests/gabc-gabc/first_syllable/styled-no-initial-second-verbatim.exp b/tests/gabc-gabc/first_syllable/styled-no-initial-second-verbatim.exp index 4ee6790a..8e2ec2e5 100644 --- a/tests/gabc-gabc/first_syllable/styled-no-initial-second-verbatim.exp +++ b/tests/gabc-gabc/first_syllable/styled-no-initial-second-verbatim.exp @@ -1,4 +1,4 @@ name: styled-no-initial-second-verbatim; -generated-by: gregorio 4.0.0-rc2-fix-670-af3219a-2704; +generated-by: gregorio 5.2.1-fix-1515-681ef1f2-4478; %% -(c3)L\TeX{}(c) +(c3)L\TeX${$}(c) diff --git a/tests/gabc-gabc/first_syllable/styled-no-initial-verbatim.exp b/tests/gabc-gabc/first_syllable/styled-no-initial-verbatim.exp index bec40c27..60e93619 100644 --- a/tests/gabc-gabc/first_syllable/styled-no-initial-verbatim.exp +++ b/tests/gabc-gabc/first_syllable/styled-no-initial-verbatim.exp @@ -1,4 +1,4 @@ name: styled-no-initial-verbatim; -generated-by: gregorio 4.0.0-rc2-fix-670-af3219a-2704; +generated-by: gregorio 5.2.1-fix-1515-681ef1f2-4478; %% -(c3)\TeX{}Live(c) +(c3)\TeX${$}Live(c) diff --git a/tests/gabc-gabc/first_syllable/unstyled-initial-second-verbatim.exp b/tests/gabc-gabc/first_syllable/unstyled-initial-second-verbatim.exp index 78c5bbd6..21687a09 100644 --- a/tests/gabc-gabc/first_syllable/unstyled-initial-second-verbatim.exp +++ b/tests/gabc-gabc/first_syllable/unstyled-initial-second-verbatim.exp @@ -1,4 +1,4 @@ name: unstyled-initial-second-verbatim; -generated-by: gregorio 4.0.0-rc2-fix-670-fefd9da-2697; +generated-by: gregorio 5.2.1-fix-1515-681ef1f2-4478; %% -(c3)L\TeX{}(c) +(c3)L\TeX${$}(c) diff --git a/tests/gabc-gabc/first_syllable/unstyled-initial-verbatim.exp b/tests/gabc-gabc/first_syllable/unstyled-initial-verbatim.exp index 1cd958e9..820d660d 100644 --- a/tests/gabc-gabc/first_syllable/unstyled-initial-verbatim.exp +++ b/tests/gabc-gabc/first_syllable/unstyled-initial-verbatim.exp @@ -1,4 +1,4 @@ name: unstyled-initial-verbatim; -generated-by: gregorio 4.0.0-rc2-fix-670-af3219a-2704; +generated-by: gregorio 5.2.1-fix-1515-681ef1f2-4478; %% -(c3)\TeX{}Live(c) +(c3)\TeX${$}Live(c) diff --git a/tests/gabc-gabc/first_syllable/unstyled-no-initial-second-verbatim.exp b/tests/gabc-gabc/first_syllable/unstyled-no-initial-second-verbatim.exp index 623dec04..0afffc21 100644 --- a/tests/gabc-gabc/first_syllable/unstyled-no-initial-second-verbatim.exp +++ b/tests/gabc-gabc/first_syllable/unstyled-no-initial-second-verbatim.exp @@ -1,4 +1,4 @@ name: unstyled-no-initial-second-verbatim; -generated-by: gregorio 4.0.0-rc2-fix-670-af3219a-2704; +generated-by: gregorio 5.2.1-fix-1515-681ef1f2-4478; %% -(c3)L\TeX{}(c) +(c3)L\TeX${$}(c) diff --git a/tests/gabc-gabc/first_syllable/unstyled-no-initial-verbatim.exp b/tests/gabc-gabc/first_syllable/unstyled-no-initial-verbatim.exp index 06623988..909a15fe 100644 --- a/tests/gabc-gabc/first_syllable/unstyled-no-initial-verbatim.exp +++ b/tests/gabc-gabc/first_syllable/unstyled-no-initial-verbatim.exp @@ -1,4 +1,4 @@ name: unstyled-no-initial-verbatim; -generated-by: gregorio 4.0.0-rc2-fix-670-af3219a-2704; +generated-by: gregorio 5.2.1-fix-1515-681ef1f2-4478; %% -(c3)\TeX{}Live(c) +(c3)\TeX${$}Live(c)