use ly:progess iso. display for song output.

diff --git a/input/regression/song-associated-voice.ly b/input/regression/song-associated-voice.ly
index ff62c03b1dd8c59d47fe6fb2b51f9614d91f927f..d6c43b82c4676832316ec699a32f1676689ae5eb 100644 (file)
--- a/input/regression/song-associated-voice.ly
+++ b/input/regression/song-associated-voice.ly
@@ -14,5 +14,5 @@
     play2 the4 game2.
   } >>
 }
     play2 the4 game2.
   } >>
 }

-#(display "song-associated-voice")
+#(ly:progress "song-associated-voice")

 #(ly:progress "~a" (ly:gulp-file "song-associated-voice.xml"))
 #(ly:progress "~a" (ly:gulp-file "song-associated-voice.xml"))

diff --git a/input/regression/song-basic-nonenglish.ly b/input/regression/song-basic-nonenglish.ly
index 06d1dbdae158352705acae3ea64a060d307b27b6..f1c0716efecc4a986d03224642f7dde90481ed17 100644 (file)
--- a/input/regression/song-basic-nonenglish.ly
+++ b/input/regression/song-basic-nonenglish.ly
@@ -7,5 +7,5 @@
 \relative { c e g r }
 \addlyrics { ov -- čá -- ci }
 }
 \relative { c e g r }
 \addlyrics { ov -- čá -- ci }
 }

-#(display "song-basic-nonenglish")
+#(ly:progress "song-basic-nonenglish")

 #(ly:progress "~a" (ly:gulp-file "song-basic-nonenglish.xml"))
 #(ly:progress "~a" (ly:gulp-file "song-basic-nonenglish.xml"))

diff --git a/input/regression/song-basic.ly b/input/regression/song-basic.ly
index 80b898fe96f098c5b76724af06ad7d1d8aededc9..fb43c9dc29dc43eebc179dc5b9279c641c64c3be 100644 (file)
--- a/input/regression/song-basic.ly
+++ b/input/regression/song-basic.ly
@@ -8,5 +8,5 @@
 \relative { c2 r2 e4 g2. }
 \addlyrics { play the game }
 }
 \relative { c2 r2 e4 g2. }
 \addlyrics { play the game }
 }

-#(display "song-basic")
+#(ly:progress "song-basic")

 #(ly:progress "~a" (ly:gulp-file "song-basic.xml"))
 #(ly:progress "~a" (ly:gulp-file "song-basic.xml"))

diff --git a/input/regression/song-breathe.ly b/input/regression/song-breathe.ly
index 091bc2fc5e0d2a4edae6ecdedb6b6d48227da337..2556ab263490d2d43a5873364125e6027a58e44b 100644 (file)
--- a/input/regression/song-breathe.ly
+++ b/input/regression/song-breathe.ly
@@ -8,5 +8,5 @@
 \relative { c2 e \breathe g }
 \addlyrics { play the game }
 }
 \relative { c2 e \breathe g }
 \addlyrics { play the game }
 }

-#(display "song-breathe")
+#(ly:progress "song-breathe")

 #(ly:progress "~a" (ly:gulp-file "song-breathe.xml"))
 #(ly:progress "~a" (ly:gulp-file "song-breathe.xml"))

diff --git a/input/regression/song-melisma.ly b/input/regression/song-melisma.ly
index 5ab5ffc6bd5d381fc04022971fa3f9296a57d695..c136f2d53450ff3f2ca41c7bfe4a3e2627a6c687 100644 (file)
--- a/input/regression/song-melisma.ly
+++ b/input/regression/song-melisma.ly
@@ -19,5 +19,5 @@
   }
 >>
 }
   }
 >>
 }

-#(display "song-melisma")
+#(ly:progress "song-melisma")

 #(ly:progress "~a" (ly:gulp-file "song-melisma.xml"))
 #(ly:progress "~a" (ly:gulp-file "song-melisma.xml"))

diff --git a/input/regression/song-reordering.ly b/input/regression/song-reordering.ly
index b8470d4fde821607175d754febca54a3f98c87bf..37c9425b11364626264b7e1f8afae2fbfbc1a405 100644 (file)
--- a/input/regression/song-reordering.ly
+++ b/input/regression/song-reordering.ly
@@ -33,5 +33,5 @@
     \set associatedVoice = lahlah % applies to "rus"
     sau -- rus Rex
   } >>
     \set associatedVoice = lahlah % applies to "rus"
     sau -- rus Rex
   } >>

-#(display "song-reordering")
+#(ly:progress "song-reordering")

 #(ly:progress "~a" (ly:gulp-file "song-reordering.xml"))
 #(ly:progress "~a" (ly:gulp-file "song-reordering.xml"))

diff --git a/input/regression/song-reordering2.ly b/input/regression/song-reordering2.ly
index f0bef6576d1c513b8e227550d9be5bce681d00d1..6a19b6040c6b2b4c2d0dc0e72795699c621b5113 100644 (file)
--- a/input/regression/song-reordering2.ly
+++ b/input/regression/song-reordering2.ly
@@ -34,5 +34,5 @@
     \set associatedVoice = lahlah % applies to "rus"
     sau -- rus Rex
   } >>
     \set associatedVoice = lahlah % applies to "rus"
     sau -- rus Rex
   } >>

-#(display "song-reordering2")
+#(ly:progress "song-reordering2")

 #(ly:progress "~a" (ly:gulp-file "song-reordering2.xml"))
 #(ly:progress "~a" (ly:gulp-file "song-reordering2.xml"))

diff --git a/input/regression/song-repetition.ly b/input/regression/song-repetition.ly
index e929d0ee7e2ad9b7c9af0a523a5763e02dc24cd6..6f5691053e9854608c7d69145b583a0eacfc6f0c 100644 (file)
--- a/input/regression/song-repetition.ly
+++ b/input/regression/song-repetition.ly
@@ -18,5 +18,5 @@
    dodo rere mimi fafa solsol }
 >>
 }
    dodo rere mimi fafa solsol }
 >>
 }

-#(display "song-repetition")
+#(ly:progress "song-repetition")

 #(ly:progress "~a" (ly:gulp-file "song-repetition.xml"))
 #(ly:progress "~a" (ly:gulp-file "song-repetition.xml"))

diff --git a/input/regression/song-skip-noword.ly b/input/regression/song-skip-noword.ly
index 806973f12e4211316a34cad1739c0cac96544e7f..9c5d954365e095bc4fa64b7493c85de420651436 100644 (file)
--- a/input/regression/song-skip-noword.ly
+++ b/input/regression/song-skip-noword.ly
@@ -9,5 +9,5 @@
   twin -- \skip 4
   kle
 }
   twin -- \skip 4
   kle
 }

-#(display "song-skip-noword")
+#(ly:progress "song-skip-noword")

 #(ly:progress "~a" (ly:gulp-file "song-skip-noword.xml"))
 #(ly:progress "~a" (ly:gulp-file "song-skip-noword.xml"))

diff --git a/input/regression/song-skip.ly b/input/regression/song-skip.ly
index 5762603caf6b62dbe24193a1699796a03e135445..e53a2fb47cadf29d3a235771c9f77e9ac027a315 100644 (file)
--- a/input/regression/song-skip.ly
+++ b/input/regression/song-skip.ly
@@ -8,5 +8,5 @@
   twin -- \skip 4
   kle
 }
   twin -- \skip 4
   kle
 }

-#(display "song-skip")
+#(ly:progress "song-skip")

 #(ly:progress "~a" (ly:gulp-file "song-skip.xml"))
 #(ly:progress "~a" (ly:gulp-file "song-skip.xml"))

diff --git a/input/regression/song-slurs.ly b/input/regression/song-slurs.ly
index 7dc199fb716db890456fbd90e91fb96c253a8872..2e7fbddd9161bb07dbc5ba91eb9a9675e352f7f9 100644 (file)
--- a/input/regression/song-slurs.ly
+++ b/input/regression/song-slurs.ly
@@ -21,5 +21,5 @@
     still
   }
 >>
     still
   }
 >>

-#(display "song-slurs")
+#(ly:progress "song-slurs\n")

 #(ly:progress "~a" (ly:gulp-file "song-slurs.xml"))
 #(ly:progress "~a" (ly:gulp-file "song-slurs.xml"))

diff --git a/input/regression/song-splitpart.ly b/input/regression/song-splitpart.ly
index bfb901ea2493f4cf9350ab3bd471d4a93546481a..c311e9be3e526e2ffdc7bd16f22369924af724e0 100644 (file)
--- a/input/regression/song-splitpart.ly
+++ b/input/regression/song-splitpart.ly
@@ -18,5 +18,5 @@
   \new Lyrics \lyricsto "melody" { we shall not o- ver- come }
   \new Lyrics \lyricsto "splitpart" { will }
 >> }
   \new Lyrics \lyricsto "melody" { we shall not o- ver- come }
   \new Lyrics \lyricsto "splitpart" { will }
 >> }

-#(display "song-splitpart")
+#(ly:progress "song-splitpart")

 #(ly:progress "~a" (ly:gulp-file "song-splitpart.xml"))
 #(ly:progress "~a" (ly:gulp-file "song-splitpart.xml"))

diff --git a/input/regression/song-stanzas.ly b/input/regression/song-stanzas.ly
index 0a85f878c381b8168fe3b2822562a14c10c1e534..7388e9552f9952dd811e5dde4df4cd02bda209b4 100644 (file)
--- a/input/regression/song-stanzas.ly
+++ b/input/regression/song-stanzas.ly
@@ -10,5 +10,5 @@
 \addlyrics { speel het spel }
 \addlyrics { joue le jeu }
 }
 \addlyrics { speel het spel }
 \addlyrics { joue le jeu }
 }

-#(display "song-stanzas")
+#(ly:progress "song-stanzas")

 #(ly:progress "~a" (ly:gulp-file "song-stanzas.xml"))
 #(ly:progress "~a" (ly:gulp-file "song-stanzas.xml"))

diff --git a/input/regression/song-tempo.ly b/input/regression/song-tempo.ly
index 934039bfa13274de4bf35d3f650c1c1751d0c212..9a22d54f83fbcd94f4b45ea6d426d1ef032b6bd0 100644 (file)
--- a/input/regression/song-tempo.ly
+++ b/input/regression/song-tempo.ly
@@ -8,5 +8,5 @@
 \relative { c4 e g \tempo 4=60 c, e g }
 \addlyrics { do re mi do re mi }
 }
 \relative { c4 e g \tempo 4=60 c, e g }
 \addlyrics { do re mi do re mi }
 }

-#(display "song-tempo")
+#(ly:progress "song-tempo")

 #(ly:progress "~a" (ly:gulp-file "song-tempo.xml"))
 #(ly:progress "~a" (ly:gulp-file "song-tempo.xml"))