X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fmetronome-text.ly;h=f5f826a673a1f387df3190c90f16976ef33cd213;hb=2055f35c47a045a50a01ff4dba8524322cfc3b48;hp=ec771c57babe1f047be5b82764c8eb42d9e22b2a;hpb=4fa31a2f796de53ec728b7459f655cff9a10d680;p=lilypond.git

diff --git a/input/regression/metronome-text.ly b/input/regression/metronome-text.ly
index ec771c57ba..f5f826a673 100644
--- a/input/regression/metronome-text.ly
+++ b/input/regression/metronome-text.ly
@@ -1,36 +1,41 @@
-\version "2.11.51"
+\version "2.14.0"
 
 \header{
   texidoc="
-The tempo command supports text markup and/or duration=count. Using the
-Score.hideTempoNote, one can hide the duration=count in the tempo mark.
+The tempo command supports text markup and/or duration=count.  Using
+@code{Score.tempoHideNote}, one can hide the duration=count in the tempo mark.
 "
 }
 
 \relative c'' {
   \tempo "Allegro" c1
   \tempo "Allegro" c1
-  \set Score.tempoText = #"blah" d1
-  \tempo \markup{\italic \medium "Allegro"} c1\break
-  \tempo 4=120 c1
-  \tempo "Allegro" 4=120 c1
-  \tempo "Allegro" 4=120 c1
-  \tempo "Allegro" 4=110 c1
-  \tempo "Allegretto" 4=110 c1\break
+  #(ly:export
+    (make-event-chord (list (make-music 'TempoChangeEvent
+                                        'text "blah"))))
+  d1
+  \tempo \markup { \italic \medium "Allegro" } c1 \break
+  \tempo 4 = 120 c1
+  \tempo "Allegro" 4 = 120 c1
+  \tempo "Allegro" 4 = 120 c1
+  \tempo "Allegro" 4 = 110 c1
+  \tempo "Allegretto" 4 = 110 c1 \break
 
   \set Score.tempoHideNote = ##f
-  \tempo "Allegro" 4=120 c1
+  \tempo "Allegro" 4 = 120 c1
   \set Score.tempoHideNote = ##t
-  \tempo "No note" 8=160 c1
+  \tempo "No note" 8 = 160 c1
   \tempo "Still not" c1
-  \tempo "Allegro" 4=120 c1
+  % No text and also no note => \null markup
+  \tempo 4 = 100 c1
+  \tempo "Allegro" 4 = 120 c1
   \set Score.tempoHideNote = ##f
-  \tempo "With note" 8=80 c1\break
+  \tempo "With note" 8 = 80 c1 \break
 
   % Unsetting the tempoText using only note=count:
-  \tempo 8=80 c1
-  \tempo "Allegro" 8=80 c1
-  \tempo 8=80 c1
+  \tempo 8 = 80 c1
+  \tempo "Allegro" 8 = 80 c1
+  \tempo 8 = 80 c1
   
   % Unsetting the count using only text
   \tempo "no note (text-only)" c1