Merge commit 'origin' into includes

[lilypond.git] / input / regression / spacing-accidental-stretch.ly

diff --git a/input/regression/spacing-accidental-stretch.ly b/input/regression/spacing-accidental-stretch.ly
index 4042c672df0dc266f9ca0eb4cd306807839d4136..931d4438368525752002c5a60b026839f78b86a1 100644 (file)
--- a/input/regression/spacing-accidental-stretch.ly
+++ b/input/regression/spacing-accidental-stretch.ly
@@ -1,18 +1,19 @@
-#(ly:set-option 'old-relative)
-\version "1.9.1"
+
+\version "2.12.0"
 
 \header {
-    texidoc = "Accidentals don't influence the amount of stretchable space. "
+  texidoc = "Accidentals do not influence the amount of stretchable space.
+The accidental does add a little non-stretchable space. 
+"
 }
 
-\score {
-     \notes \relative c'' \context GrandStaff {
-       \pianoCautionaries
-       d16 d d d d d cis d 
-       
-     }
-
-     %% not raggedright!!
-     \paper {  linewidth = 14.\cm
-     }
+%% not ragged-right!!
+\layout {
+  line-width = 18.\cm
+}
+\relative c'' {
+  #(set-accidental-style 'piano-cautionary)
+  \time 2/4 
+  d16 d d d d d cis d dis dis dis dis 
+  
 }