Merge branch 'master' into dev/texi2html

[lilypond.git] / input / regression / key-signature-cancellation.ly

diff --git a/input/regression/key-signature-cancellation.ly b/input/regression/key-signature-cancellation.ly
index a776e3c083e3195704a4044eb037e83b1550f638..af13a67cfcabd6ff48d3f58a11573b00f1e18686 100644 (file)
--- a/input/regression/key-signature-cancellation.ly
+++ b/input/regression/key-signature-cancellation.ly
@@ -1,19 +1,25 @@
-\header { texidoc = "Cancellation signs are printed by default. The
-   spacing of the natural signs depends on their vertical
-   positions. The stems should not clash graphically."
+\header {
+
+  texidoc = "Key cancellation signs consists of naturals for pitches
+  that are not in the new key signature. Naturals get a little padding
+  so the stems don't collide."
 
 }
 
-\version "2.6.0"
+\version "2.11.51"
 
 \layout {
-    raggedright = ##t
+  ragged-right = ##t
 }
 
 {
 
-    \key a \major
-    g'1
-    \key f \minor
-    g'1
+  \key a \major
+  g'1
+  \key f \minor
+  g'1
+  \key cis \major
+  g'1
+  \key c \major
+  g'1
 }