Merge branch 'master' into translation

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

diff --git a/input/regression/slur-scoring.ly b/input/regression/slur-scoring.ly
index e2810eea9b6c58f3ff31188a11a012bc480e6b7a..ebcace50e020a4c3b4060c4980fdc304eab16276 100644 (file)
--- a/input/regression/slur-scoring.ly
+++ b/input/regression/slur-scoring.ly
@@ -7,12 +7,12 @@
     one big file, since changing one score parameter for one situation
     may affect several other situations.
 
     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.14.0"
+\version "2.19.2"

 \layout {
     ragged-right = ##t
 %    #(define debug-slur-scoring #t)
 \layout {
     ragged-right = ##t
 %    #(define debug-slur-scoring #t)


@@ -23,7 +23,7 @@
     \grace e=''16( d8.[) c16]
     d=''8.[ \grace f16( e16)]
     s2
     \grace e=''16( d8.[) c16]
     d=''8.[ \grace f16( e16)]
     s2

-    << {c=''8.([ es16] bes4~bes )}
+    << {c=''8.([ es16] bes4~4 )}

        \\
        {r8  <as es> r <f des> r }
     >>
        \\
        {r8  <as es> r <f des> r }
     >>


@@ -47,7 +47,7 @@
     | b='2( a4) s4
     | b='4.( c8) s2
     | << c=''1_(
     | b='2( a4) s4
     | b='4.( c8) s2
     | << c=''1_(

-       { s2 \grace { b16[ c] } } >>
+       { s2 \grace { b16 c } } >>

     \break
     b4)
     e=''4.( c8) s4
     \break
     b4)
     e=''4.( c8) s4


@@ -69,7 +69,7 @@
        f=''2( d4 f | g c a f | d c f2 | f1) |
     }
 
        f=''2( d4 f | g c a f | d c f2 | f1) |
     }
 

-%    \override Slur #'eccentricity = #-2
+%    \override Slur.eccentricity = #-2

     c=''8 ( d[ b f d] a'[ c])
 }
 
     c=''8 ( d[ b f d] a'[ c])
 }