Cleanup us << \\ >> for multivoice sections.

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

diff --git a/input/regression/glissando.ly b/input/regression/glissando.ly
index 24b869d9bda90acc866c2f4722c63ab8063a8bb3..a878601a92989bce264e45b375f5fee3ac40d2cd 100644 (file)
--- a/input/regression/glissando.ly
+++ b/input/regression/glissando.ly
@@ -1,32 +1,33 @@
-\version "1.5.68"
+\version "2.11.51"
 
 \header{
 
-texidoc=" Simple glissando lines between notes are supported.
-The first two glissandi are not consecutive.
+  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
-< @{ s8 s8 s4 @} @{ c4 \\gliss d4 @} > working correctly.
+<< @{ s8 s8 s4 @} @{ c4 \\gliss d4 @} >> working correctly.
 
 "
 }
 
-\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 } >
-            
-    }
-    \paper{
-        linewidth = 70.\mm
-       \translator{
-              \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'
+  << { e8 \glissando g8 } \\
+     { \repeat unfold 4 d16 } >>
+  \override Glissando  #'style = #'zigzag
+  c4 \glissando c,, \glissando c' \glissando d
 }
+
+