Merge with master

[lilypond.git] / input / regression / accidental-cautionary.ly

diff --git a/input/regression/accidental-cautionary.ly b/input/regression/accidental-cautionary.ly
index d307932f480d40335eea59728244e9bfb8d6620b..b48c8b610d156e80901c38d5d4403c54d0c362a9 100644 (file)
--- a/input/regression/accidental-cautionary.ly
+++ b/input/regression/accidental-cautionary.ly
@@ -1,4 +1,4 @@
-\version "2.1.26"
+\version "2.11.5"
 \header {
 
 texidoc = "Cautionary accidentals are indicated using either
@@ -8,16 +8,14 @@ parentheses (default) or smaller accidentals.
 
 }
 
-\score {
-    \notes {
+\layout { ragged-right = ##t }
+
+{
     c''4
     cis''?4
-    \override Staff.Accidental  #'cautionary-style = #'smaller
+    \once \override Staff.AccidentalCautionary #'font-size = #-2
     cis''?4
-    \override Staff.Accidental  #'cautionary-style = #'parentheses
+    \once \override Staff.AccidentalCautionary #'parenthesized = ##t
     cis''?4
-    }
-
-\paper { raggedright = ##t }
 }