Merge branch 'master' into lilypond/translation

[lilypond.git] / input / regression / rest-pitch.ly

diff --git a/input/regression/rest-pitch.ly b/input/regression/rest-pitch.ly
index 4a4ed7d0520557fb6d68e5de5094b9065c8922e5..e1abe1c24af9034b037f0c84059f25e3c92f6af4 100644 (file)
--- a/input/regression/rest-pitch.ly
+++ b/input/regression/rest-pitch.ly
@@ -1,23 +1,23 @@
-\version "2.1.30"
+\version "2.14.0"
 \header {
 
-texidoc = "Rests can have pitches--these will be affected by
-transposition and relativization. If a rest has a pitch, rest/rest and
-beam/rest collision resolving will leave it alone."
+  texidoc = "Rests can have pitches -- these will be affected by
+transposition and relativization.  If a rest has a pitch, rest/@/rest and
+beam/@/rest collision resolving will leave it alone."
 
 }
 
-    \paper { raggedright= ##t }
+\layout { ragged-right= ##t }
 
-\score { \notes\relative c'' 
-        {
-            a4\rest b4\rest c4\rest
+\relative c'' 
+{
+  a4\rest b4\rest c4\rest
+
+  <<d \\  d\rest^"rest pitch" >>
+  <<d \\  r>>
+  c16 [ d r e] 
+  c16 [ d e\rest^"rest pitch" e] 
+  
+}
 
-            <<d \\  d\rest^"rest pitch" >>
-            <<d \\  r>>
-            c16 [ d r e] 
-            c16 [ d e\rest^"rest pitch" e] 
-            
-        }
-     }