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 05279d4b55c57ae68040cdd673d0a8ee612c3af1..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.5.21"
+\version "2.17.30"
 
 skips =
 {
-\time 12/8
-\once  \override Score.GridLine #'thickness = #4.0
+  \time 12/8
+  \once  \override Score.GridLine.thickness = #4.0
   s8 
   s8 
   s8 
-\once  \override Score.GridLine #'thickness = #2.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 = #2.0
+  \once  \override Score.GridLine.thickness = #3.0
   s8 
   s8 
   s8 
@@ -31,38 +31,57 @@ skips =
 
 \layout {
   \context {
-  \Staff
-  \consists "Grid_point_engraver"
-  
+    \Staff
+    \consists "Grid_point_engraver"
+    
   }
 
   \context {
-  \RhythmicStaff
-  \consists "Grid_point_engraver"
-  gridInterval = #(ly:make-moment 1 8)
-  \override BarLine #'bar-size = #0.05
-}
+    \RhythmicStaff
+    \consists "Grid_point_engraver"
+    gridInterval = #(ly:make-moment 1/8)
+    \override BarLine.bar-extent = #'(-0.025 . 0.025)
+  }
   \context {
     \StaffGroup
     \remove "System_start_delimiter_engraver" 
   }
-}
-
-\new Score 
-\with {
-  \consists "Grid_line_span_engraver"
-  \override SystemStartBrace #'transparent = ##t
-  \override TimeSignature #'transparent = ##t
+  \context {
+    \Score
+      \consists "Grid_line_span_engraver"
+      \hide SystemStartBrace
 
-  \override NoteColumn #'X-offset-callbacks = #(list (lambda (x a) -0.5))
-  \override NoteColumn #'Y-offset-callbacks = #(list (lambda (x a) 0.25))
+      \override NoteColumn.X-offset = #-0.5
+      \override NoteHead.Y-offset = #0.75
+  }
+}
 
+\layout {
+  ragged-right = ##t
 }
+\score {
 \new StaffGroup <<
-  \new Staff {
-    \repeat unfold 12 { c''8 }
-    }
-  \new RhythmicStaff \skips
-  \new RhythmicStaff \skips
->>
+  \new RhythmicStaff \with
+  {
+    \override NoteHead.no-ledgers = ##t
+  }
+  {
+    \stemUp
+    c4. c8 c8 c c4 c8 c8.[ c16 c8]
+  }
+  \new RhythmicStaff
+  {
+    \hide NoteHead
+    \override NoteHead.no-ledgers = ##t
+    \hide Stem
+    \hide Beam
+    << \skips
+
+                               % force regular spacing by introducing notes.
+       \repeat unfold 12 c8
+     >>
+  }
   
+>>
+}
+