Multiline initial

gregorio-test.sh

@@ -495,7 +495,7 @@ test|retest)
         overall_result=0
         time for group in ${groups}
         do
-            if ! ${group}_find | filter | $XARGS -0 -P $NPROCESSORS -n 1 -I{} bash -c "${group}_test"' "$@"' _ {} \;
+            if ! ${group}_find | filter | $XARGS -0 -P $NPROCESSORS -I{} bash -c "${group}_test"' "$@"' _ {} \;
             then
                 overall_result=1
             fi

harness.sh

@@ -268,16 +268,16 @@ function gabc_gtex_test {
         then
             fail "Did not fail" "$filename should have failed"
         else
-            ${SED} -e 's/^\(% File generated by gregorio \).*/\1@/' \
-                -e 's/\(\GregorioTeXAPIVersion{\)[^}]\+/\1@/' \
-                -e 's/\(\GreBeginScore{\)[^}]\+/\1@/' \
+            ${SED} -E -e 's/^(% File generated by gregorio ).*/\1@/' \
+                -e 's/(\\GregorioTeXAPIVersion\{)[^}]+/\1@/' \
+                -e 's/(\\GreBeginScore\{)[^}]+/\1@/' \
                 "$outfile" > "$outfile-"
             if [ -f "$expfile" ]
             then
-                $verify "$filename" && ${SED} \
-                    -e 's/^\(% File generated by gregorio \).*/\1@/' \
-                    -e 's/\(\GregorioTeXAPIVersion{\)[^}]\+/\1@/' \
-                    -e 's/\(\GreBeginScore{\)[^}]\+/\1@/' \
+                $verify "$filename" && ${SED} -E \
+                    -e 's/^(% File generated by gregorio ).*/\1@/' \
+                    -e 's/(\\GregorioTeXAPIVersion\{)[^}]+/\1@/' \
+                    -e 's/(\\GreBeginScore\{)[^}]+/\1@/' \
                     "$expfile" > "$expfile-"
                 maybe_run "$filename" diff -q "$outfile-" "$expfile-"
             else
@@ -346,12 +346,12 @@ function gabc_dump_test {
         then
             fail "Did not fail" "$filename should have failed"
         else
-            ${SED} -e 's/[0-9]\+\( (\(GRE\|S\|G\|L\|SP\|\)_\)/@\1/' "$outfile" \
+            ${SED} -E -e 's/[0-9]*( \((GRE_|S_|G_|L_|SP_|_))/@\1/' "$outfile" \
                 > "$outfile-"
             if [ -f "$expfile" ]
             then
-                $verify "$filename" && ${SED} \
-                    -e 's/[0-9]\+\( (\(GRE\|S\|G\|L\|SP\|\)_\)/@\1/' "$expfile" \
+                $verify "$filename" && ${SED} -E \
+                    -e 's/[0-9]*( \((GRE_|S_|G_|L_|SP_|_))/@\1/' "$expfile" \
                     > "$expfile-"
                 maybe_run "$filename" diff -q "$outfile-" "$expfile-"
             else
@@ -420,18 +420,18 @@ function gabc_gabc_test {
         then
             fail "Did not fail" "$filename should have failed"
         else
-            ${SED} -e 's/^\(% File generated by gregorio \).*/\1@/' \
-                -e 's/^\(generated-by: \).*;$/\1@;/' \
-                -e 's/^\(\GregorioTeXAPIVersion{\)[^}]*/\1@/' \
-                -e 's/^\(\GreBeginScore{\)[^}]*/\1@/' "$outfile" \
+            ${SED} -E -e 's/^(% File generated by gregorio ).*/\1@/' \
+                -e 's/^(generated-by: ).*;$/\1@;/' \
+                -e 's/^(\\GregorioTeXAPIVersion\{)[^}]*/\1@/' \
+                -e 's/^(\\GreBeginScore\{)[^}]*/\1@/' "$outfile" \
                 > "$outfile-"
             if [ -f "$expfile" ]
             then
-                $verify "$filename" && ${SED} \
-                    -e 's/^\(% File generated by gregorio \).*/\1@/' \
-                    -e 's/^\(generated-by: \).*;$/\1@;/' \
-                    -e 's/^\(\GregorioTeXAPIVersion{\)[^}]*/\1@/' \
-                    -e 's/^\(\GreBeginScore{\)[^}]*/\1@/' "$expfile" \
+                $verify "$filename" && ${SED} -E \
+                    -e 's/^(% File generated by gregorio ).*/\1@/' \
+                    -e 's/^(generated-by: ).*;$/\1@;/' \
+                    -e 's/^(\\GregorioTeXAPIVersion\{)[^}]*/\1@/' \
+                    -e 's/^(\\GreBeginScore\{)[^}]*/\1@/' "$expfile" \
                     > "$expfile-"
                 maybe_run "$filename" diff -q "$outfile-" "$expfile-"
             else
@@ -528,7 +528,7 @@ function typeset_and_compare {
     pdffile="$filebase.pdf"
     cmdoutfile="$filebase.cmdout"
 
-    if "$@" --output-directory="$outdir" "$texfile" >&"$outdir"/"$cmdoutfile"
+    if "$@" --output-directory="$outdir" "$texfile" >"$outdir"/"$cmdoutfile" 2>&1
     then
         if [[ "$indir/" == */should-fail/* ]]
         then

tests/gabc-dump/5-lines.dump

@@ -956,7 +956,9 @@
      character                 e
 ---------------------------------------------------------------------
      end of style                ST_CENTER
----------------------------------------------------------------------
+
+  Abovelinestext
+    above lines text---------------------------------------------------------------------
      type                    3 (GRE_ELEMENT)
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        type                  2 (GRE_GLYPH)

tests/gabc-dump/bugs/fix-1538.dump

@@ -0,0 +1,111 @@
+=====================================================================
+ SCORE INFOS
+=====================================================================
+   number_of_voices          1
+   name                      March 30 sample
+
+
+=====================================================================
+ HEADERS
+=====================================================================
+   name                      March 30 sample
+
+
+=====================================================================
+ VOICES INFOS
+=====================================================================
+  Voice 1
+   initial_key               5 (c3)
+
+
+=====================================================================
+ SCORE
+=====================================================================
+   type                      0 (GRE_SYLLABLE)
+   position                  2 (WORD_MIDDLE)
+---------------------------------------------------------------------
+     character                 F
+---------------------------------------------------------------------
+     character                 o
+---------------------------------------------------------------------
+     character                 r
+---------------------------------------------------------------------
+     type                    3 (GRE_ELEMENT)
+- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+       type                  2 (GRE_GLYPH)
+       glyph_type            15 (G_PUNCTUM)
+-  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  
+         type                   1 (GRE_NOTE)
+         pitch                  h
+         shape                  1 (S_PUNCTUM)
+=====================================================================
+   type                      0 (GRE_SYLLABLE)
+   position                  2 (WORD_MIDDLE)
+---------------------------------------------------------------------
+     beginning of style      ST_FIRST_WORD
+---------------------------------------------------------------------
+     character                 -
+---------------------------------------------------------------------
+     end of style            ST_FIRST_WORD
+---------------------------------------------------------------------
+     beginning of style          ST_CENTER
+---------------------------------------------------------------------
+     beginning of style      ST_FIRST_WORD
+---------------------------------------------------------------------
+     beginning of style          ST_ITALIC
+---------------------------------------------------------------------
+     character                 e
+---------------------------------------------------------------------
+     end of style                ST_ITALIC
+---------------------------------------------------------------------
+     end of style            ST_FIRST_WORD
+---------------------------------------------------------------------
+     end of style                ST_CENTER
+---------------------------------------------------------------------
+     beginning of style      ST_FIRST_WORD
+---------------------------------------------------------------------
+     beginning of style          ST_ITALIC
+---------------------------------------------------------------------
+     character                 v
+---------------------------------------------------------------------
+     end of style                ST_ITALIC
+---------------------------------------------------------------------
+     end of style            ST_FIRST_WORD
+---------------------------------------------------------------------
+     type                    3 (GRE_ELEMENT)
+- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+       type                  2 (GRE_GLYPH)
+       glyph_type            15 (G_PUNCTUM)
+-  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  
+         type                   1 (GRE_NOTE)
+         pitch                  h
+         shape                  1 (S_PUNCTUM)
+=====================================================================
+   type                      0 (GRE_SYLLABLE)
+   position                  3 (WORD_END)
+---------------------------------------------------------------------
+     beginning of style          ST_CENTER
+---------------------------------------------------------------------
+     beginning of style      ST_FIRST_WORD
+---------------------------------------------------------------------
+     character                 e
+---------------------------------------------------------------------
+     end of style            ST_FIRST_WORD
+---------------------------------------------------------------------
+     end of style                ST_CENTER
+---------------------------------------------------------------------
+     beginning of style      ST_FIRST_WORD
+---------------------------------------------------------------------
+     character                 r
+---------------------------------------------------------------------
+     end of style            ST_FIRST_WORD
+---------------------------------------------------------------------
+     type                    3 (GRE_ELEMENT)
+- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+       type                  2 (GRE_GLYPH)
+       glyph_type            15 (G_PUNCTUM)
+-  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  
+         type                   1 (GRE_NOTE)
+         pitch                  h
+         shape                  1 (S_PUNCTUM)
+=====================================================================

tests/gabc-dump/bugs/fix-1538.gabc

@@ -0,0 +1,3 @@
+name: March 30 sample;
+%%
+(c3)For(h)-<i>ev</i>(h)er(h)