Merge commit 'origin' into beamlets2

[lilypond.git] / input / regression / grace-volta-repeat-2.ly

diff --git a/input/regression/grace-volta-repeat-2.ly b/input/regression/grace-volta-repeat-2.ly
index 2960e0f9beeb58acb25b3c22c2ccfd42dcde90e4..1df9fec9c42f19b98789076624c0ca7a3a38c5a8 100644 (file)
--- a/input/regression/grace-volta-repeat-2.ly
+++ b/input/regression/grace-volta-repeat-2.ly
@@ -1,21 +1,19 @@
-#(ly:set-option 'old-relative)
-\version "1.9.4"
+\version "2.12.0"
 
 \header {
 
-    texidoc = "Graces at combined with volta repeats: a repeat
-starting with a grace, following a repeat directly. The bars should be
-merged into one :||:."
+  texidoc = "A volta repeat may begin with a grace. Consecutive
+    ending and starting repeat bars are merged into one @code{:||:}."
 
-      }
+}
 
-    \paper { raggedright= ##t }
+\layout { ragged-right= ##t }
 
-\score {\notes\relative c' {
-\repeat volta 2 {
-        c1 
-}
-\repeat volta 2 {
-        \grace {c8 } c4
+\relative c' {
+  \repeat volta 2 {
+    c1 
+  }
+  \repeat volta 2 {
+    \grace {c8 } c4
+  }
 }
-}}