Merge commit 'origin' into includes

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

diff --git a/input/regression/beaming.ly b/input/regression/beaming.ly
index dd5796c76c4fe78704a02dd56761eb3b752bd0a5..d982b35b9fafd75b769fde64270c5a68aa921e8d 100644 (file)
--- a/input/regression/beaming.ly
+++ b/input/regression/beaming.ly
@@ -1,29 +1,34 @@
-\version "1.3.146"
+
+\version "2.12.0"
 
 \header{
 texidoc="
 Beaming is generated automatically. Beams may cross bar lines. In that
-case, line breaks are forbidden.  Yet clef and key signatures are
-hidden just as with breakable bar lines.
+case, line breaks are forbidden.
 "
 }
 
-\score { \context Staff \notes \relative c''  {
-       [c8. c16]
-       [c8. c16 c8.  c16]
-       [c16 c8.] |
-       [c8. c16  c16  c8.]
-       [c8. c32  c32]
-       [c8 c8] |
-       [c16 c16]
-       [c32 c32]
-       [c64 c64]       
-       c32
-       [c8 c,4 c'8] % should warn here!
-       [c8 c c] c8 % over barline
-       [c16 c8 c16]
-       [c32 c16 c16 c16 c32]
-       [c32 c16 c8 c32]                 % hmm ?
-       
-               }}
+\context Staff  \relative c''  {
+
+  c8[ \times 2/3 { c16 d e] }
+  s4*3
+  
+  c8.[ c16]
+  c8.[ c16 c8.  c16]
+  c16[ c8.] |
+  c8.[ c16  c16  c8.]
+  c8.[ c32  c32]
+  c8[ c8] |
+  c16[ c16]
+  c32[ c32]
+  c64[ c64]    
+  c32
+  c2
+
+  c8[^"over barline" c c] c8 
+  c16[ c8 c16]
+  c32[ c16 c16 c16 c32]
+  c32[ c16 c8 c32]              % hmm ?
+  
+}