X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fmutopia%2FF.Schubert%2Fmorgenlied.ly;h=31720633f4cb1f907f5390168466335c22d27ca5;hb=9e7b53f94e1e3bd7b3f7a14ba11a6cae6c8e9a73;hp=c3d13e688217d8ef29e00db07316608e641c25e6;hpb=366ac5a9c6dfb5a32111c8dd6ba40e49334402c3;p=lilypond.git diff --git a/input/mutopia/F.Schubert/morgenlied.ly b/input/mutopia/F.Schubert/morgenlied.ly index c3d13e6882..31720633f4 100644 --- a/input/mutopia/F.Schubert/morgenlied.ly +++ b/input/mutopia/F.Schubert/morgenlied.ly @@ -1,11 +1,11 @@ \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" - enteredby="Rune Zedeler" - maintainer="rune@zedeler.dk" + enteredby="Han-Wen Nienhuys" + maintainer="hanwen@xs4all.nl" texidoc = "The source is a rather tightly set Peters in Edition is a heavy font. The Peters edition (4622c) was `herausgegeben' by @@ -14,30 +14,52 @@ not be in the PD - but I am assuming there are no notable ones in this small piece. - The original compresses the entire music onto a single page, in 4 systems." + The original compresses the entire music onto a single page, in 4 + systems. Lily does so too if you tune down spacing-increment, but + 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. The crescendo in measure 4 has +been lowered + +" } -\version "2.1.3" +\version "2.11.38" +manuscriptBreak = { \break } + + + +#(set-global-staff-size (/ (* 5.8 72.27) 25.4)) \paper { - staffheight = 6.0 \mm - - #(define fonts (scale-font-list (/ (* 6 mm) (* 20 pt)) )) - - \include "params-init.ly" - linewidth = #(* mm 159) +%#(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 = { + \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 \bigger\bigger { \hspace #-3.0 Lieblich, etwas geschwind } } + s1*0^\markup { \bold \large\bigger\bigger { \hspace #-3.0 Lieblich, etwas geschwind } } R2. r4 r8 c4 g8 | - e4 c8 << { f8. g16 } \\ { f8.[ g16] } >> a8 | + e4 c8 + << + \new Voice { \stemUp f8. g16 } + { \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 | @@ -45,40 +67,55 @@ melody = \notes \relative c'' \repeat volta 2 \context Voice = singer { g4.~ g8-\fermata g8 g | as4 as8 g4 g8 | fis4 fis8 r8 g g | - a4 a8 g4 g8 | + a!4 a8 g4 g8 | fis4 fis8 d'16[ c b a] g[ f] | e4 g8 d4 g8 e4 r8 b'16[ c d b] g[ f] | e4 g8 d4 a'16[ g] | c,4 r8 r4 r8 | - R2.\fermata + + % TODO : make \fermata work. + R2.^\fermataMarkup } -firstVerse = \lyrics { - \property LyricsVoice . stanza = "1." +ignoreMelisma = \set ignoreMelismata = ##t +ignoreMelismaOff = \unset ignoreMelismata + + +firstVerse = \lyricmode { + \set stanza = "1." - Sü -- ßes Licht! Aus gol -- de -- nen Pfor -- ten brichst du __ \break - sie -- gend durch __ die Nacht. Schö -- ner Tag, du __ bist er -- wacht. __ Mit \break - ge -- heim -- nis -- vol -- len Wor -- ten, in me -- lo -- di -- schen Ak -- kor -- den, grüß __ ich __ \break - dei -- ne Ro -- sen -- pracht, grüß ich __ dei -- ne Ro -- sen -- pracht. + 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 -- | + \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. } -secondVerse = \lyrics { - \property LyricsVoice . 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 +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. } -pianoRH = \notes \relative c''' \repeat volta 2 { - g16( fis a g fis g f e d c b a ) | +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 | - r8 << { fis( g)} \\ { c,4 } >> r8 | + r8 c'( e,) f r a | + \once \override DynamicLineSpanner #'padding =#3 + r8 << { s8 s8 } << { fis(\> g)\! + } \\ { c,4 } >> >> r8 | 4. r8 \clef bass | - e,16 g c g e g d gis b gis d g | + e,16_" "_\markup { \bold\italic cresc. } g c g e g d gis b gis d gis | c, e a e c e a,-\f d fis d a d | b d g d b g r4\fermata \clef treble g''8 | as4.( g 4.) | fis4. r4 8 ( | @@ -86,14 +123,15 @@ pianoRH = \notes \relative c''' \repeat volta 2 { r8 r | r r | r r | - c16( b c e g b c b c e g ) | + c16(_\f b c e g b c b c e g ) | 8 r r 8 r r\fermata | } -pianoLH = \notes \relative c'' \repeat volta 2 { +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 | + \clef treble r4 8([ )] r | \clef bass r8 dis( e) r c c | f,4. r8 g g | 4. 4. | @@ -101,7 +139,11 @@ pianoLH = \notes \relative c'' \repeat volta 2 { g,8 r r g16 r16\fermata r8 g''8 | as4.( g ) | fis r4 8( | - 4.) 4.( | 4.) | + 4.) + + \once \override Slur #'height-limit = #1.0 + + 4.( | 4.) | c,4 r8 g4 r8 | c4 r8 g4 r8 | c4 r8 g4 r8 | @@ -109,40 +151,42 @@ pianoLH = \notes \relative c'' \repeat volta 2 { r r 8 r r\fermata \clef treble } -\score { - - << \time 6/8 - \addlyrics - \new Staff { \melody } - \new Lyrics << - \context LyricsVoice = "singer-1" \firstVerse - \context LyricsVoice = "singer-2" \secondVerse - >> - \new PianoStaff << - \property PianoStaff.instrument = \markup { \bold \bigger "2. " } - \new Staff \pianoRH - \new Staff \pianoLH - >> - >> - - \paper { - \translator { - \LyricsContext - minimumVerticalExtent = ##f - LyricText \set #'font-size = #1.5 +\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 { - \ScoreContext - SpacingSpanner \set #'common-shortest-duration = #(ly:make-moment 1 8) + \midi { + \context { + \Score + tempoWholesPerMinute = #(ly:make-moment 70 4) + } } - \translator { \PianoStaffContext - VerticalAlignment \override #'forced-distance = #10 - } - \translator { - \ScoreContext - \remove "Lyric_phrasing_engraver" - \consists "New_phrasing_engraver" - } - -} + } } +