Merge branch 'master' into dev/texi2html

[lilypond.git] / input / regression / glissando.ly

diff --git a/input/regression/glissando.ly b/input/regression/glissando.ly
index 5e3fac44e7016acccf605d4c056c9c25e3cebd83..f3940198829aa04dd82484df0ec53a13d0047782 100644 (file)
--- a/input/regression/glissando.ly
+++ b/input/regression/glissando.ly
@@ -1,9 +1,8 @@
-#(ly:set-option 'old-relative)
-\version "2.1.29"
+\version "2.11.51"
 
 \header{
 
-texidoc=" Between notes, there may be simple glissando lines.
+  texidoc=" Between notes, there may be simple glissando lines.
 Here, the first two glissandi are not consecutive.
 
 The engraver does no time-keeping, so it involves some trickery to get
@@ -12,24 +11,23 @@ The engraver does no time-keeping, so it involves some trickery to get
 "
 }
 
-\score{
-        \context Staff=one \notes\relative c''{
-                    % gliss non gliss and 
-            c4 \glissando d e \glissando f \glissando \break
-            % consecutive 
-            c \glissando d, \glissando e'
-             << { \stemUp e8 \glissando g8 }
-               \context Voice = VB {\stemDown \repeat unfold 4 d16 } >>
-               \override Glissando  #'style = #'zigzag
-               c4 \glissando c,, \glissando c' \glissando d
-    }
-    \paper{
-        linewidth = 50.\mm indent = 0
-       \context{
-              \StaffContext
-              % makes for handier debugging
-              % \remove Clef_engraver
-       }
-    }
+
+\layout{
+  line-width = 50.\mm
+  indent = 0
+}
+
+\new Staff \relative c''{
+  \override Glissando #'breakable = ##t
+  
+  %% gliss non gliss and 
+  c4 \glissando d e \glissando f \glissando \break
+  %% consecutive 
+  c \glissando d, \glissando e'
+  << { \stemUp e8 \glissando g8 }
+     \context Voice = VB {\stemDown \repeat unfold 4 d16 } >>
+  \override Glissando  #'style = #'zigzag
+  c4 \glissando c,, \glissando c' \glissando d
 }
 
+