Merge branch 'master' into lilypond/translation

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

diff --git a/input/regression/slur-scoring.ly b/input/regression/slur-scoring.ly
index 8f4d8e07f5f27556e5f8eb73a49184b95bc5b9a3..2f78cf06c680eca093dc15214e92f3ddd5999fb3 100644 (file)
--- a/input/regression/slur-scoring.ly
+++ b/input/regression/slur-scoring.ly
@@ -7,19 +7,19 @@
     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.7.13"
+\version "2.14.0"

 \layout {
 \layout {

-    raggedright = ##t
+    ragged-right = ##t

 %    #(define debug-slur-scoring #t)
 }
 
 %    #(define debug-slur-scoring #t)
 }
 

-\relative {
-  
+\relative c'' {
+

     \grace e=''16( d8.[) c16]
     d=''8.[ \grace f16( e16)]
     s2
     \grace e=''16( d8.[) c16]
     d=''8.[ \grace f16( e16)]
     s2


@@ -28,20 +28,20 @@
        {r8  <as es> r <f des> r }
     >>
     \new Voice { \voiceOne b='8[ c16( d])  }
        {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)
     bes='8( f' des bes) as4( bes)
     r8 d( f e d c b a)

-    cis=''4( d)  f'=''16( e)    d( c)
+    cis=''4( d)  f=''16( e)    d( c)

     s4
     s4

-    
-    c'=''2(~c8 d16 c b8 a)
-    
-    <c=' g>4 ( f <g b>) f
+
+    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 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
     c,,^( c'')
     c,,^( c')
     | b='2( a4) s4


@@ -54,18 +54,18 @@
     | << { b='8[( c]) } \\
         { b='8[( c]) }>>
 
     | << { b='8[( c]) } \\
         { b='8[( c]) }>>
 

-    
+

     s2.|
     e4( dis4)
     s2.|
     e4( dis4)

-    e4( dis4) 
-    g='16( b d fis)
-    \clef bass a=8[ e16(f] g[ a b d,)]  s4 | \break
+    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 |
     e=8[( f] g[ a b d,)]  s4 |

-    
+

     \clef treble
     \new Voice {
        \slurDown
     \clef treble
     \new Voice {
        \slurDown

-       c=''4(^"slurs forced down"  d, c') s4
+       c''=''4(^"slurs forced down"  d, c') s4

        f=''2( d4 f | g c a f | d c f2 | f1) |
     }
 
        f=''2( d4 f | g c a f | d c f2 | f1) |
     }