Merge branch 'master' of git://git.sv.gnu.org/lilypond

diff --git a/input/regression/accidental-cautionary.ly b/input/regression/accidental-cautionary.ly
index b48c8b610d156e80901c38d5d4403c54d0c362a9..1b9a99f6cf7c7bd2e6f3065d256f24ab922ff182 100644 (file)
--- a/input/regression/accidental-cautionary.ly
+++ b/input/regression/accidental-cautionary.ly
@@ -1,7 +1,7 @@
 \version "2.11.5"
 \header {
 
-texidoc = "Cautionary accidentals are indicated using either
+texidoc = "Cautionary accidentals may be indicated using either
 parentheses (default) or smaller accidentals.
 
 "
@@ -13,6 +13,7 @@ parentheses (default) or smaller accidentals.
 {
     c''4
     cis''?4
+    \once \override Staff.AccidentalCautionary #'parenthesized = ##f
     \once \override Staff.AccidentalCautionary #'font-size = #-2
     cis''?4
     \once \override Staff.AccidentalCautionary #'parenthesized = ##t