Merge commit 'origin/dev/jneeman' into systems-per-page

[lilypond.git] / input / regression / quote-during.ly

diff --git a/input/regression/quote-during.ly b/input/regression/quote-during.ly
index c9ab28d42120added095eb69fa701c8c268a13d6..225bf6ebdda1899a852d48d470c6bd2de35c9dfd 100644 (file)
--- a/input/regression/quote-during.ly
+++ b/input/regression/quote-during.ly
@@ -4,33 +4,33 @@
     texidoc = "With @code{\\cueDuring} and @code{\\quoteDuring},
 fragments of previously entered music may be
 quoted. @code{quotedEventTypes} will determines what things are
-quoted. In this example, a 16th rests is not quoted, since
+quoted. In this example, a 16th rest is not quoted, since
 @code{rest-event} is not in @code{quotedEventTypes}."
 
 }
-\version "2.7.13"
+\version "2.12.0"
 \layout {
-    raggedright = ##t
+    ragged-right = ##t
 }
 
 
 quoteMe = \relative c' { fis4 r16  a8.-> b4-\ff c }
 
-\addquote quoteMe \quoteMe 
+\addQuote quoteMe \quoteMe 
 original = \relative c'' { c8 d s2 es8 gis8 }
 
 <<
     \new Staff {
-       \set Staff.instrument = "quoteMe"
+       \set Staff.instrumentName = "quoteMe"
        \quoteMe
     }
     \new Staff {
-       \set Staff.instrument = "orig"
+       \set Staff.instrumentName = "orig"
        \original
     }
     \new Staff \relative c'' <<
        
-       \set Staff.instrument = "orig+quote"    
+       \set Staff.instrumentName = "orig+quote"        
        \set Staff.quotedEventTypes = #'(note-event articulation-event)
        \original
        { s4 \quoteDuring #"quoteMe" { s2. } }