The grand \paper -> \layout, \bookpaper -> \paper renaming.

[lilypond.git] / input / mutopia / F.Schubert / standchen.ly

diff --git a/input/mutopia/F.Schubert/standchen.ly b/input/mutopia/F.Schubert/standchen.ly
index 48dc67195eff9fbafcb72df7a0b4f1ab02bcd92d..0e836a04971da4a1881312804719da6da0ff1768 100644 (file)
--- a/input/mutopia/F.Schubert/standchen.ly
+++ b/input/mutopia/F.Schubert/standchen.ly
@@ -42,14 +42,14 @@ instrument = "Piano"
  footer = "Mutopia-2001/04/27-xx"
 } 
 
-\version "2.1.22"
+\version "2.3.22"
 
 dynamicUp = \override DynamicLineSpanner  #'direction = #1
 dynamicRevert = \revert DynamicLineSpanner #'direction
 
 #(set-global-staff-size 16)
 
-vocalVerse = \notes\relative c''{
+vocalVerse = \relative c''{
        \dynamicUp
        \times 2/3 {  g8[(  as)] g } c4. g8 |
        \times 2/3 {  f8[(  g)] f } c'4 f,8 r |
@@ -90,7 +90,7 @@ vocalVerse = \notes\relative c''{
        c!2. |
 }
 
-vocalThrough = \notes\relative c{
+vocalThrough = \relative c{
        \dynamicUp
        g''8. g16 b8. b16 d8. d16 |
        c4 b r |
@@ -115,7 +115,7 @@ vocalThrough = \notes\relative c{
        e2 r4 |
 }
 
-lyricVerseOne = \lyrics {
+lyricVerseOne = \lyricmode {
        Lei -- se fle -- hen mei -- ne Lie -- der
        durch die Nacht zu dir;
        in den stil -- len Hain her nie -- der,
@@ -130,7 +130,7 @@ lyricVerseOne = \lyrics {
        fürch -- te, Hol -- de, nicht.
 }
        
-lyricVerseTwo = \lyrics{
+lyricVerseTwo = \lyricmode{
        Hörst die Nach -- ti -- gal -- len schla -- gen?
        ach! sie fle -- hen dich, 
        mit der Tö -- ne sü -- "\ss en" Kla -- gen
@@ -145,7 +145,7 @@ lyricVerseTwo = \lyrics{
        jed -- es wei -- che Herz.
 }
 
-lyricThrough = \lyrics{
+lyricThrough = \lyricmode{
        La\ss auch dir die Brust be -- we -- gen 
        Lieb -- chen, hö -- re mich! 
        be -- bend harr' ich dir ent -- ge -- gen! 
@@ -155,14 +155,14 @@ lyricThrough = \lyrics{
        be -- glük -- ke mich!
 }
 
-trebleIntro = \notes\relative c{
+trebleIntro = \relative c{
        r8^"\bf Mäßig"\pp <g' c>-. <c es>-. <g c>-. <c es>-. <g c>-. |
        r8 <as c>-. <c es>-. <as c>-. <c es>-. <as c>-. |
        r8 <as c>-. <c d>-. <as c>-. <c d>-. <as c>-. |
        r8 <g b>-. <b d>-. <g b>-. <b d>-. <g b>-. |
 }
 
-trebleVerseOne = \notes\relative c{
+trebleVerseOne = \relative c{
        %5
        r8 <g' c> <c es> <g c> <c es> <g c> |
        r8 <f c'> <c' d> <f, c'> <c' d> <f, c'> |
@@ -193,14 +193,12 @@ trebleVerseOne = \notes\relative c{
        r8\pp <es as c> <as c es> <es as c> <as c es> <es as c> |
        %20
        r8 <es g bes> <g bes es> <es g bes> <g bes es> <es g bes> |
-       \override Slur   #'attachment = #'(stem . stem)
        \grace {
   \override Stem   #'stroke-style = #"grace"
     as'32[( bes ] 
   \revert Stem #'stroke-style }
 
        \times 2/3 {  as8[)( g as] } c4.->  as8) |
-       \revert Slur #'attachment
        g2. |
        r8 <f, g> <g b> <f g> <g b> <f g> |
        r8 <e g> <g c> <e g> <g c> <e g> |
@@ -210,8 +208,8 @@ trebleVerseOne = \notes\relative c{
        <a a'>4.-> <f f'>8)  |
 }
 
-trebleEentje = \notes \relative c' \context Voice {
-       \stemBoth
+trebleEentje =  \relative c' \context Voice {
+       \stemNeutral
        <e e'>2 r4 |
        <f as!>2\(\mf <as c>8.(-> <f as>16)\) |
        % urg: slurs with staccati are ugly
@@ -225,8 +223,8 @@ trebleEentje = \notes \relative c' \context Voice {
        <e g>2 r4 |
 }
 
-trebleThrough = \notes \relative c'{
-       \stemBoth
+trebleThrough =  \relative c'{
+       \stemNeutral
        <e e'>2. |
        %61
        R2. |
@@ -278,7 +276,7 @@ trebleThrough = \notes \relative c'{
        <g e' g>2.\fermata |
 }
 
-bassIntro = \notes\relative c{
+bassIntro = \relative c{
        \dynamicUp
 %1
        <c, c'>2 r4 |
@@ -287,7 +285,7 @@ bassIntro = \notes\relative c{
        <g g'>2 r4 |
 }
 
-bassVerseOne = \notes\relative c{
+bassVerseOne = \relative c{
 %      \clef bass
        \dynamicUp
 %5
@@ -319,7 +317,7 @@ bassVerseOne = \notes\relative c{
        c,8 <c' e g>[ <e g c> <c e g> <e g c> <c e g>] |
 }
 
-bassEentje = \notes\relative c{
+bassEentje = \relative c{
        \dynamicUp
        <c, c'>8 <c' f as!>[ <f as c> <c f as> <f as c> <c f as>] |
        c,8 <c' e g>[ <e g c> <c e g> <e g c> <c e g>] |
@@ -331,7 +329,7 @@ bassEentje = \notes\relative c{
        c,8 <e' g>[ <g c> <e g> <g c> <e g>] |
 }
 
-bassThrough = \notes\relative c{
+bassThrough = \relative c{
        \dynamicUp
        %61
        <g, g'>8^"cresc." <g' b d>[ <b d f> <g b d> <as! b d >-> <b d f>] |
@@ -365,7 +363,7 @@ bassThrough = \notes\relative c{
        <c, g' c>2._\fermata |
 }
                
-global = \notes{
+global = {
        \time 3/4 
        \key es \major
        \skip 1 * 3/4 * 4
@@ -388,7 +386,7 @@ allLyrics = {
            \lyricThrough 
 } }
 
-vocals = \context Voice = leise \notes {
+vocals = \context Voice = leise  {
        \clef treble
        % certainly no auto-beaming for vocals
        \autoBeamOff
@@ -441,7 +439,7 @@ bassStaff = \context Staff = bass<<
            \bassStaff
        >>
     >>
-    \paper {
+    \layout {
                                % Use
                                %   textheight = 280.\mm
                                %   linewidth = 190.\mm
@@ -451,7 +449,7 @@ bassStaff = \context Staff = bass<<
        textheight = 270.0\mm
        linewidth = 180.0\mm
 
-       \translator { \RemoveEmptyStaffContext }
+       \context { \RemoveEmptyStaffContext }
     }
     \midi{
        \tempo 4 = 54