Merge commit 'origin' into beamlets2

[lilypond.git] / input / regression / collision-mesh.ly

diff --git a/input/regression/collision-mesh.ly b/input/regression/collision-mesh.ly
index 868a48fa256e82b135eccd10418bfe7a4ae21d33..53b02aa4cbda8e1c8834a72046b980d500a5a975 100644 (file)
--- a/input/regression/collision-mesh.ly
+++ b/input/regression/collision-mesh.ly
@@ -1,35 +1,32 @@
-\version "2.1.28"
+\version "2.12.0"
 \header {
-texidoc = "Oppositely stemmed chords,  meshing into each other,
+  texidoc = "Oppositely stemmed chords,  meshing into each other,
 are resolved."
 }
 
-    \paper { raggedright= ##t }
-
-
-\score {
-  \context Staff \notes \transpose c c' {
-     \time 3/4
-     % Here's what I was trying to do:
-     <<          {
-         d'4
-         d'4.   
-        <a c'>4
-        <g b g'>4
-        <g b g'>4.              
-          }\\ {
-       <g b g'>4
-       <g b g'>4.       
-       <g b d'>4
-       d'4
-       d'4.       
-       }
- >>
-
-  }
+\layout { ragged-right= ##t }
+
+
+\context Staff  \transpose c c' {
+  \time 3/4
+  %% Here's what I was trying to do:
+  <<
+    {
+      d'4
+      d'4.      
+      <a c'>4
+      <g b g'>4
+      <g b g'>4.                
+    } \\ {
+      <g b g'>4
+      <g b g'>4.       
+      <g b d'>4
+      d'4
+      d'4.       
+    }
+  >>
 }
 
 
 
 
-