X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fmutopia%2FF.Schubert%2Fmorgenlied.ly;h=31720633f4cb1f907f5390168466335c22d27ca5;hb=def21b306e2b8fa2d5630fab0878e9922e197f0c;hp=a8e1f085505905603ea8aabf1f5b134af1add58e;hpb=5a37dd7a016f89d56495aeaf6e3a8889e3852584;p=lilypond.git diff --git a/input/mutopia/F.Schubert/morgenlied.ly b/input/mutopia/F.Schubert/morgenlied.ly index a8e1f08550..31720633f4 100644 --- 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" + title = "Sängers Morgenlied" + composer = "Franz Schubert (1797-1828)" date = "27. Februar 1815" source = "Edition Peters" editor = "Paul Losse" @@ -19,33 +19,38 @@ chooses line breaks differently. Further manual tweaks: the slur in measure 12 has been flattened - manually. The beam in measure 3, left-hand, technically is wrong, - but has been added following the original. +manually. The beam in measure 3, left-hand, technically is wrong, but +has been added following the original. The crescendo in measure 4 has +been lowered " } -\version "2.1.19" +\version "2.11.38" manuscriptBreak = { \break } +#(set-global-staff-size (/ (* 5.8 72.27) 25.4)) + \paper { - #(paper-set-staff-size (* 5.8 mm)) - linewidth = #(* mm 160) +%#(set-global-staff-size (* 5.8 mm)) + line-width = #(* mm 160) indent = 8\mm interscoreline = 2.\mm + between-system-space = 15\mm + ragged-bottom = ##t } 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 = #'() } -melody = \notes \relative c'' \repeat volta 2 \context Voice = singer { +melody = \relative c'' \repeat volta 2 \new Voice = "singer" { \time 6/8 \autoBeamOff s1*0^\markup { \bold \large\bigger\bigger { \hspace #-3.0 Lieblich, etwas geschwind } } @@ -54,7 +59,7 @@ melody = \notes \relative c'' \repeat volta 2 \context Voice = singer { e4 c8 << \new Voice { \stemUp f8. g16 } - { \stemDown f8.[ g16] } >> \stemBoth a8 | + { \stemDown f8.[ g16] } >> \stemNeutral a8 | fis4 g8 c16[ b a g] f[ e] | d4 f8 a16[ g fis g] f[ d] | g4. r8 gis gis | @@ -73,41 +78,41 @@ 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." +firstVerse = \lyricmode { + \set stanza = "1." - Sü -- ßes Licht! Aus + Sü -- ßes Licht! Aus \ignoreMelisma gol -- \ignoreMelismaOff de -- nen Pfor -- ten brichst du __ \manuscriptBreak | - sie -- gend durch __ die Nacht. Schö -- ner Tag, du __ bist er -- wacht. __ Mit ge -- | + sie -- gend durch __ die Nacht. Schö -- ner Tag, du __ bist er -- wacht. __ Mit ge -- | \manuscriptBreak - heim -- nis -- vol -- len Wor -- ten, in me -- lo -- di -- schen Ak -- kor -- den, grüß __ ich __ \manuscriptBreak | - dei -- ne Ro -- sen -- pracht, grüß ich __ dei -- ne Ro -- sen -- pracht. + heim -- nis -- vol -- len Wor -- ten, in me -- lo -- di -- schen Ak -- kor -- den, grüß __ ich __ \manuscriptBreak | + dei -- ne Ro -- sen -- pracht, grüß __ ich __ dei -- ne Ro -- sen -- pracht. } -secondVerse = \lyrics { - \property LyricsVoice . stanza = "2." +secondVerse = \lyricmode { + \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 | - nur auf gold -- nen Hö -- hen mich im Mor -- gen -- duft er -- ge -- hen! Sehn -- sucht | - zieht mich him -- mel -- wärts, Sehn -- sucht zieht mich him -- mel -- wärts. + das be -- weg -- te __ Herz, sanft, wie ein ge -- lieb -- ter Schmerz. __ Dürft ich | + nur auf gold -- nen Hö -- hen mich im Mor -- gen -- duft er -- ge -- hen! Sehn -- sucht | + zieht mich him -- mel -- wärts, Sehn -- sucht zieht mich him -- mel -- wärts. } -pianoRH = \notes \relative c''' \repeat volta 2 { - \modernAccidentals +pianoRH = \relative c''' \repeat volta 2 { + #(set-accidental-style 'modern) g16(_\p fis a g fis g f e d c b a ) | 8( ) r8 r | r8 c'( e,) f r a | - \once \property Voice.DynamicLineSpanner \set #'padding =#3 - r8_\> << { s8 s8-\! } << { fis( g) + \once \override DynamicLineSpanner #'padding =#3 + r8 << { s8 s8 } << { fis(\> g)\! } \\ { c,4 } >> >> r8 | 4. r8 \clef bass | e,16_" "_\markup { \bold\italic cresc. } g c g e g d gis b gis d gis | @@ -122,8 +127,8 @@ pianoRH = \notes \relative c''' \repeat volta 2 { 8 r r 8 r r\fermata | } -pianoLH = \notes \relative c'' \repeat volta 2 { - \modernAccidentals +pianoLH = \relative c'' \repeat volta 2 { + #(set-accidental-style 'modern) g16( fis a g fis g f e d c b a) | \clef bass g4.( c,8) r r \clef treble r4 8([ )] r | @@ -136,7 +141,7 @@ pianoLH = \notes \relative c'' \repeat volta 2 { fis r4 8( | 4.) - \once \property Voice.Slur \set #'height-limit = #1.0 + \once \override Slur #'height-limit = #1.0 4.( | 4.) | c,4 r8 g4 r8 | @@ -146,44 +151,42 @@ pianoLH = \notes \relative c'' \repeat volta 2 { r r 8 r r\fermata \clef treble } -\score { - - << \time 6/8 - \new Staff << - \context Staff \modernAccidentals - \melody >> - \lyricsto "singer" \new LyricsVoice \firstVerse - \lyricsto "singer" \new LyricsVoice \secondVerse - \new PianoStaff << - \property PianoStaff.instrument = \markup { - \bold - \bigger\bigger\bigger\bigger \huge "2. " } - \new Staff \pianoRH - \new Staff \pianoLH - >> - >> - - \paper { - \translator { - \LyricsVoiceContext - minimumVerticalExtent = #'(-1.0 . 0) - } - \translator { - \ScoreContext - Beam \override #'thickness = #0.55 - SpacingSpanner \set #'spacing-increment = #1.0 - Slur \set #'height-limit = #1.5 - } - \translator { - \PianoStaffContext - VerticalAlignment \override #'forced-distance = #10 +\book { + \score { + << \time 6/8 + \new Staff << + \context Staff #(set-accidental-style 'modern) + \melody >> + \lyricsto "singer" \new Lyrics \firstVerse + \lyricsto "singer" \new Lyrics \secondVerse + \new PianoStaff << + \set PianoStaff.instrumentName = \markup { + \bold + \bigger\bigger\bigger\bigger \huge "2. " } + \new Staff \pianoRH + \new Staff \pianoLH + >> + >> + + \layout { + \context { + \Lyrics + \override VerticalAxisGroup #'minimum-Y-extent = #'(-0.5 . 2.5) + \override LyricText #'font-size = #-1 + } + \context { + \Score + \override Beam #'thickness = #0.55 + \override SpacingSpanner #'spacing-increment = #1.0 + \override Slur #'height-limit = #1.5 + } } - \translator { - \StaffContext - minimumVerticalExtent = #'(-3. . 6) + \midi { + \context { + \Score + tempoWholesPerMinute = #(ly:make-moment 70 4) + } } } - \midi { - \tempo 4 = 70 - } } +