Merge with master

[lilypond.git] / input / regression / measure-grouping.ly

diff --git a/input/regression/measure-grouping.ly b/input/regression/measure-grouping.ly
index 4ced5bc7285ac4df282ceb51680f93b6037c64bb..cfea330422831ee7a4af3dbc2de8efb846ec5e57 100644 (file)
--- a/input/regression/measure-grouping.ly
+++ b/input/regression/measure-grouping.ly
@@ -1,33 +1,33 @@
+
 \header
 {
 
-    texidoc = "The Measure_grouping_engraver adds triangles and
-brackets above beats when you set beatGrouping.  This shows a fragment
-of Steve Martland's Dance Works. "
+  texidoc = "The @code{Measure_grouping_engraver} adds triangles and
+brackets above beats when the beats of a time signature are grouped.  "
 
 }
 
-\version "1.7.6"
+\version "2.10.0"
 
+\layout  {
+  ragged-right = ##t
+}
 
 %% TODO: should have 2/4 + 5/8 time sig style.
-\score { \notes
-\context Staff
-        \relative c' {
-            #(set-time-signature 2 4) 
-            c8 a'4 a8-~
-            #(set-time-signature 5 8 '(3 2)) 
-            a8 bes4 r8 bes8->
-            \time 2/4
-            c,8 g'4 g8-~
-            #(set-time-signature 5 8 '(3 2)) 
-            g8 a4 g a->
-        }
-        \paper  {
-            linewidth = -1.0 
-            \translator { \StaffContext
-                          \consists "Measure_grouping_engraver"
-                          }
-            }
-        }
-%% new-chords-done %%
+
+\context Staff \with {
+    \consists "Measure_grouping_engraver"
+  }
+
+\relative c' {
+  #(set-time-signature 2 4) 
+  c8 a'4 a8~
+  #(set-time-signature 5 8 '(3 2)) 
+  a8 bes4 r8 bes8->
+  \time 2/4
+  c,8 g'4 g8~
+  #(set-time-signature 5 8 '(3 2)) 
+  g8 a4 g a4.->
+}
+
+