Merge branch 'master' into dev/texi2html

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

diff --git a/input/regression/accidental-cautionary.ly b/input/regression/accidental-cautionary.ly
index 596b7290c428904cfd21296d32c5280b17150e45..c622833bfd4884c873d69190656266e818db7f75 100644 (file)
--- a/input/regression/accidental-cautionary.ly
+++ b/input/regression/accidental-cautionary.ly
@@ -1,21 +1,22 @@
-\version "2.6.0"
+\version "2.11.51"
 \header {
 
-texidoc = "Cautionary accidentals are indicated using either
+texidoc = "Cautionary accidentals may be indicated using either
 parentheses (default) or smaller accidentals.
 
 "
 
 }
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 {
     c''4
     cis''?4
-    \override Staff.Accidental  #'cautionary-style = #'smaller
+    \once \override Staff.AccidentalCautionary #'parenthesized = ##f
+    \once \override Staff.AccidentalCautionary #'font-size = #-2
     cis''?4
-    \override Staff.Accidental  #'cautionary-style = #'parentheses
+    \once \override Staff.AccidentalCautionary #'parenthesized = ##t
     cis''?4
 }