Merge remote branch 'origin/master' into release/unstable

[lilypond.git] / input / regression / grid-lines.ly

diff --git a/input/regression/grid-lines.ly b/input/regression/grid-lines.ly
index 8a99130511f6946f21ee8f12e99464305edfaf2c..b67f7b5d3344950235720c92acb9370a57ebd070 100644 (file)
--- a/input/regression/grid-lines.ly
+++ b/input/regression/grid-lines.ly
@@ -5,24 +5,24 @@
 staves synchronized with the notes."
 
 }
-\version "2.12.0"
+\version "2.17.30"
 
 skips =
 {
   \time 12/8
-  \once  \override Score.GridLine #'thickness = #4.0
+  \once  \override Score.GridLine.thickness = #4.0
   s8 
   s8 
   s8 
-  \once  \override Score.GridLine #'thickness = #3.0
+  \once  \override Score.GridLine.thickness = #3.0
   s8 
   s8 
   s8 
-  \once  \override Score.GridLine #'thickness = #4.0
+  \once  \override Score.GridLine.thickness = #4.0
   s8 
   s8 
   s8 
-  \once  \override Score.GridLine #'thickness = #3.0
+  \once  \override Score.GridLine.thickness = #3.0
   s8 
   s8 
   s8 
@@ -39,32 +39,31 @@ skips =
   \context {
     \RhythmicStaff
     \consists "Grid_point_engraver"
-    \override VerticalAxisGroup #'minimum-Y-extent = #'(-4 . 4) 
-    gridInterval = #(ly:make-moment 1 8)
-    \override BarLine #'bar-size = #0.05
+    gridInterval = #(ly:make-moment 1/8)
+    \override BarLine.bar-extent = #'(-0.025 . 0.025)
   }
   \context {
     \StaffGroup
     \remove "System_start_delimiter_engraver" 
   }
+  \context {
+    \Score
+      \consists "Grid_line_span_engraver"
+      \hide SystemStartBrace
+
+      \override NoteColumn.X-offset = #-0.5
+      \override NoteHead.Y-offset = #0.75
+  }
 }
 
 \layout {
   ragged-right = ##t
 }
-\new Score 
-\with {
-  \consists "Grid_line_span_engraver"
-  \override SystemStartBrace #'transparent = ##t
-
-  \override NoteColumn #'X-offset = #-0.5
-  \override NoteHead #'Y-offset = #0.75
-
-}
+\score {
 \new StaffGroup <<
   \new RhythmicStaff \with
   {
-    \override NoteHead  #'no-ledgers = ##t
+    \override NoteHead.no-ledgers = ##t
   }
   {
     \stemUp
@@ -72,10 +71,10 @@ skips =
   }
   \new RhythmicStaff
   {
-    \override NoteHead #'transparent = ##t
-    \override NoteHead #'no-ledgers = ##t
-    \override Stem #'transparent = ##t
-    \override Beam #'transparent = ##t
+    \hide NoteHead
+    \override NoteHead.no-ledgers = ##t
+    \hide Stem
+    \hide Beam
     << \skips
 
                                % force regular spacing by introducing notes.
@@ -84,4 +83,5 @@ skips =
   }
   
 >>
+}