resolve merge

[lilypond.git] / input / regression / slur-scoring.ly

diff --git a/input/regression/slur-scoring.ly b/input/regression/slur-scoring.ly
index a1b1ee4506756d335ab9dc05955d4b7dae933536..e2810eea9b6c58f3ff31188a11a012bc480e6b7a 100644 (file)
--- a/input/regression/slur-scoring.ly
+++ b/input/regression/slur-scoring.ly
@@ -7,20 +7,20 @@
     one big file, since changing one score parameter for one situation
     may affect several other situations.
 
-    Tunable parameters are in @file{scm/slur.scm}. 
+    Tunable parameters are in @file{scm/slur.scm}.
 "
 
 }
 
-\version "2.12.0"
+\version "2.14.0"
 \layout {
     ragged-right = ##t
 %    #(define debug-slur-scoring #t)
 }
 
-\relative {
-  
-    \grace e'=''16( d8.[) c16]
+\relative c'' {
+
+    \grace e=''16( d8.[) c16]
     d=''8.[ \grace f16( e16)]
     s2
     << {c=''8.([ es16] bes4~bes )}
@@ -28,20 +28,20 @@
        {r8  <as es> r <f des> r }
     >>
     \new Voice { \voiceOne b='8[ c16( d])  }
-    g,='8[( a b b! ]  c4  bes) 
+    g,='8[( a b b! ]  c4  bes)
     bes='8( f' des bes) as4( bes)
     r8 d( f e d c b a)
     cis=''4( d)  f=''16( e)    d( c)
     s4
-    
+
     c=''2(~c8 d16 c b8 a)
-    
+
     <c,=' g>4 ( f <g b>) f
     <c g>^( f <g b>) f
     <c g>_( f <g b>)
     <g b>_( g  <b d>)
     <g b>_( \stemDown g \stemNeutral  <b d>)
-    c,='^( c'' c) 
+    c,='^( c'' c)
     c,,^( c'')
     c,,^( c')
     | b='2( a4) s4
@@ -54,14 +54,14 @@
     | << { b='8[( c]) } \\
         { b='8[( c]) }>>
 
-    
+
     s2.|
     e4( dis4)
-    e4( dis4) 
+    e4( dis4)
     g,='16( b d fis)
     \clef bass a,,=8[ e16(f] g[ a b d,)]  s4 | \break
     e=8[( f] g[ a b d,)]  s4 |
-    
+
     \clef treble
     \new Voice {
        \slurDown