* lily/rest.cc (polyphonic_offset_callback): new function. Do

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

diff --git a/input/mutopia/F.Schubert/morgenlied.ly b/input/mutopia/F.Schubert/morgenlied.ly
index 0a246875e6b7f8031202047a518d00f34b83581f..416e7c3c65ee332426a3cba141ab3c2617706053 100644 (file)
--- a/input/mutopia/F.Schubert/morgenlied.ly
+++ b/input/mutopia/F.Schubert/morgenlied.ly
@@ -1,6 +1,6 @@
 \header {
     title = "Sängers Morgenlied"
-    composer  = "Franz Schubert"
+    composer = "Franz Schubert"
     date = "27. Februar 1815"
     source = "Edition Peters"
     editor = "Paul Losse"
@@ -26,7 +26,7 @@
 
 }
 
-\version "2.1.13"
+\version "2.1.22"
 manuscriptBreak = { \break }
 
 
@@ -39,9 +39,9 @@ manuscriptBreak = { \break }
     }
 
 modernAccidentals = {
-  \property Staff.extraNatural = ##f
-  \property Staff.autoAccidentals = #'(Staff (same-octave . 1) (any-octave . 0))
-  \property Staff.autoCautionaries = #'()  
+  \set Staff.extraNatural =  ##f
+  \set Staff.autoAccidentals =  #'(Staff (same-octave . 1) (any-octave . 0))
+  \set Staff.autoCautionaries =  #'()  
 }
 
 
@@ -54,7 +54,7 @@ melody = \notes   \relative c'' \repeat volta 2 \context Voice = singer {
   e4 c8
     <<
        \new Voice { \stemUp f8. g16 }
-       { \stemDown f8.[ g16] } >> a8 |
+       { \stemDown f8.[ g16] } >> \stemBoth a8 |
   fis4  g8 c16[ b a g] f[ e] |
   d4 f8 a16[ g fis g] f[ d] |
   g4. r8 gis gis |
@@ -73,12 +73,12 @@ melody = \notes   \relative c'' \repeat volta 2 \context Voice = singer {
 }
 
 
-ignoreMelisma =        \property LyricsVoice . ignoreMelismata = ##t
-ignoreMelismaOff = \property LyricsVoice . ignoreMelismata \unset
+ignoreMelisma =        \set ignoreMelismata = ##t
+ignoreMelismaOff = \unset ignoreMelismata 
 
 
 firstVerse = \lyrics {
-    \property LyricsVoice . stanza = "1."
+    \set stanza = "1."
     
     Sü -- ßes Licht! Aus
     \ignoreMelisma
@@ -93,7 +93,7 @@ firstVerse = \lyrics {
     }
 
 secondVerse = \lyrics {
-    \property LyricsVoice . stanza = "2."
+    \set stanza = "2."
     Ach, der Lie -- be sanf
     -- tes We -- hen schwellt mir |
     das be -- weg -- te __ Herz, sanft, wie ein ge -- lieb -- ter Schmerz. __ Dürft ich | 
@@ -106,7 +106,7 @@ pianoRH = \notes \relative c''' \repeat volta 2 {
     g16(_\p fis a g fis g f e d c b a ) | 
     <g e>8( <es fis a> <d f b> <c e c'>) r8 r | 
     r8 c'( e,) f r a |
-    \once \property Voice.DynamicLineSpanner \set #'padding =#3
+    \once \override DynamicLineSpanner   #'padding =#3
     r8_\> << { s8 s8-\! }  << { fis( g)
                            } \\ { c,4 } >> >> r8 <e c g> <e c g> |
     <d c a>4. r8 \clef bass  <d b f> <d b f> |
@@ -136,7 +136,7 @@ pianoLH = \notes \relative c'' \repeat volta 2 {
     fis r4 <g b>8( |
     <f c'>4.)
 
-    \once \property Voice.Slur \set #'height-limit = #1.0
+    \once \override Slur  #'height-limit = #1.0
 
     <g c>4.( | <a c>4.) <g b,> |
     c,4 r8 g4 r8 |
@@ -152,12 +152,10 @@ pianoLH = \notes \relative c'' \repeat volta 2 {
      \new Staff <<
         \context Staff \modernAccidentals
         \melody >>
-     \new Lyrics <<
-        \lyricsto "singer" \new LyricsVoice \firstVerse
-        \lyricsto "singer" \new LyricsVoice \secondVerse
-        >>
+        \lyricsto "singer" \new Lyrics \firstVerse
+        \lyricsto "singer" \new Lyrics \secondVerse
      \new PianoStaff << 
-        \property PianoStaff.instrument = \markup {
+        \set PianoStaff.instrument = \markup {
             \bold
             \bigger\bigger\bigger\bigger \huge "2.  " }
         \new Staff \pianoRH
@@ -167,7 +165,7 @@ pianoLH = \notes \relative c'' \repeat volta 2 {
 
     \paper {
        \translator {
-           \LyricsVoiceContext
+           \LyricsContext
            minimumVerticalExtent = #'(-1.0 . 0)
        }
        \translator {
@@ -185,4 +183,7 @@ pianoLH = \notes \relative c'' \repeat volta 2 {
            minimumVerticalExtent = #'(-3. . 6)
        }
     }
+    \midi {
+       \tempo 4 = 70
+       }
 }