Merge with master

[lilypond.git] / input / regression / fret-diagrams.ly

diff --git a/input/regression/fret-diagrams.ly b/input/regression/fret-diagrams.ly
index 25d46947ae0124712c72d5d73d26a6bea7720ec0..ec383e510442aeb958252914d9dadb898b370048 100644 (file)
--- a/input/regression/fret-diagrams.ly
+++ b/input/regression/fret-diagrams.ly
@@ -1,19 +1,19 @@
 %% regression test for fret diagram markups
 
 
-\version "2.6.0"
+\version "2.10.0"
 
 \paper {
 
   %% stretch to prevent diagrams from colliding.
-  linewidth = 18.0 \cm
+  line-width = 18.0 \cm
 }
 
 
 <<
   \chords {s2 c c c d}
   
-  \context Voice=mel {
+  \new Voice =mel {
 
     %% A chord for ukelele
     a'2 ^\markup