X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fmutopia%2FR.Schumann%2Fromanze-op28-2.ly;h=7a5250149e157cf267231283aa192eabd3e4dae1;hb=fe1eb832e9e1e92e2bf98c33011465658192f033;hp=ef496b8f954576630311d3548fa4a0db2c5f28ac;hpb=e33041dba657b4c94d79236cf3e705dcdaee2f30;p=lilypond.git diff --git a/input/mutopia/R.Schumann/romanze-op28-2.ly b/input/mutopia/R.Schumann/romanze-op28-2.ly index ef496b8f95..7a5250149e 100644 --- a/input/mutopia/R.Schumann/romanze-op28-2.ly +++ b/input/mutopia/R.Schumann/romanze-op28-2.ly @@ -1,11 +1,10 @@ +#(ly:set-option 'old-relative) % NOT FINISHED!!!! \include "deutsch.ly" - -%% 19 is broken --hwn. -%\include "paper19.ly" -\version "1.7.18" +#(set-global-staff-size 16) +\version "2.1.22" \header { title = "Romanzen" @@ -20,68 +19,68 @@ copyright = "Public Domain" } -u = { \translator Staff = up \stemDown } -m = { \translator Staff = mid \stemUp } -d = { \translator Staff = down \stemUp } +u = { \change Staff = up \stemDown } +m = { \change Staff = mid \stemUp } +d = { \change Staff = down \stemUp } -% forcedBreak should be \break, but first we have to reinstate paper19 or paper18 -forcedBreak = \notes { } +forcedBreak = \break global = \notes { \key fis \major \time 6/8 - \property Score.beatLength = #(ly:make-moment 3 8) + \set Score.beatLength = #(ly:make-moment 3 8) \repeat volta 2 { s2.*8 } s2.*26 \bar "|." } righta = \notes \transpose c cis' { % \stemUp \slurUp \tieUp \stemUp - \property Voice.Slur \override #'attachment = #'(stem . stem) + \override Slur #'attachment = #'(stem . stem) \repeat volta 2 { - \property Voice.TextScript \override #'extra-offset = #'(-8.0 . 2.5) - \m a,16-[^\p( \u c^\markup { - \large { "Einfach (" - \note #3 #0 #1 - " = 100)" } } - a c -] \m g,-[ \u c^3 -] \m b,-[ \u c^2 b c-] \m a,-[ \u )c^3-] | - \property Voice.TextScript \revert #'extra-offset - \m f,-[( \u c f c-] \m g,-[ \u c^4-] \m a,-[ \u c^2 a c8 c16-)-] | - \m c16-[( \u f c' f-] \m b,-[ \u f-] \m d-[ \u f^3 d' f^2-] \m c-[ \u f-)^4-] | - \m f,16-[( \u c16^3 f c-] \m g,-[ \u c^4-] \m a,-[ \u c^2 a c8 c16-)-] | - \m a,-[( \u c a c-] \m c-[ \u d c' d-] \m b,-[ \u d-] \m a,-[ \u d-)^3-] | - \m g,-[( \u c^2 g c-] \m b,-[ \u c b c-] \m a,-[ \u c-] \m g,-[ \u cis-)^3-] | - \m f,-[( \u d^3 f d-] \m g,-[ \u d g d-] \m g,-[ \u c-] \m a,-[ \u a-)-] | - \m g,-[( \u c g c-] \m f,-[ \u h,^2 g h,-] \m e,-[ \u c^2 g c-)-] | + \override TextScript #'extra-offset = #'(-8.0 . 2.5) + \m a,16[^\p( \u c^\markup { + \large "Einfach (" + \note #"8" #1 + \large " = 100)" } + a c ] \m g,[ \u c^3 ] \m b,[ \u c^2 b c] \m a,[ \u c^3]) | + \revert TextScript #'extra-offset + \m f,[( \u c f c] \m g,[ \u c^4] \m a,[ \u c^2 a c8 c16)] | + \m c16[( \u f c' f] \m b,[ \u f] \m d[ \u f^3 d' f^2] \m c[ \u f)^4] | + \m f,16[( \u c16^3 f c] \m g,[ \u c^4] \m a,[ \u c^2 a c8 c16)] | + \m a,[( \u c a c] \m c[ \u d c' d] \m b,[ \u d] \m a,[ \u d)^3] | + \m g,[( \u c^2 g c] \m b,[ \u c b c] \m a,[ \u c] \m g,[ \u cis)^3] | + \m f,[( \u d^3 f d] \m g,[ \u d g d] \m g,[ \u c] \m a,[ \u a)] | + \m g,[( \u c g c] \m f,[ \u h,^2 g h,] \m e,[ \u c^2 g c)] | } + \forcedBreak \stemUp \slurUp \tieUp - b4^5( <>8~<> a g^4 | - f4^5 e8^5~e d4-)^4 | - as4^4( <>8~<> g^5 f^4 | - es4^5 d8^5~d c4-)^4 | - c^4( es8^5~<> d^3 f-) | - e4^4( g8^5~<> f^3 as-) | + b4^5( 8~ a g^4 | + f4^5 e8^5~e d4)^4 | + as4^4( 8~ g^5 f^4 | + es4^5 d8^5~d c4)^4 | + c^4( es8^5~ d^3 f) | + e4^4( g8^5~ f^3 as) | g4^4 b8^5~b a c'^5~ | - c' b^4 ges^5 des^3 b,^5 \d ges,16-[^4 f,] | - e,^2^\markup { \large "ritard..." } cis,^1 \u r8 r r4 r16 \d gis,^2^"R.H."-] | + c' b^4 ges^5 des^3 b,^5 \d ges,16[^4 f,] | + e,^2^\markup { \large "ritard..." } cis,^1 \u r8 r r4 r16 \d gis,^2^"R.H."] | \forcedBreak - \m a,16-[^\p( \u c a c-] \m g,-[ \u c^3-] \m b,-[ \u c^2 b c-] \m a,-[ \u c-)^3 -]| - \m f,-[( \u c f c-] \m g,-[ \u c^4-] \m a,-[ \u c^2 a c8 c16-)-] | - \m c16-[( \u f c' f-] \m b,-[ \u f-] \m d-[ \u f^3 d' f^2-] \m c-[ \u f-)-]^4 | - \m f,-[( \u c^3 f c-] \m g,-[ \u c^4-] \m a,-[ \u c^2 a c8 cis16-)-] | - \m a,-[( \u d^2 a d-] \m c-[ \u d c' d-] \m b,-[ \u d-)^3] r8 | - \m c16-[( \u f c' f-] \m es-[ \u f es' f-] \m d-[ \u f-)^3-] \m f-[( \u as^2-] | - f'-[ as-)-] \m f-[( \u as f' as-)] r8^\fermata r16 e'^2( f' g' | \stemBoth \tieBoth - as' des'^1 c'8^\markup { \finger "2-3" } h~h c'16-) \clef F e,16-[(^2 f, g,] | + \m a,16[^\p( \u c a c] \m g,[ \u c^3] \m b,[ \u c^2 b c] \m a,[ \u c)^3 ]| + \m f,[( \u c f c] \m g,[ \u c^4] \m a,[ \u c^2 a c8 c16)] | + \m c16[( \u f c' f] \m b,[ \u f] \m d[ \u f^3 d' f^2] \m c[ \u f)]^4 | + \m f,[( \u c^3 f c] \m g,[ \u c^4] \m a,[ \u c^2 a c8 cis16)] | + \m a,[( \u d^2 a d] \m c[ \u d c' d] \m b,[ \u d)^3] r8 | + \m c16[( \u f c' f] \m es[ \u f es' f] \m d[ \u f)^3] \m f[( \u as^2] | + f'[ as)] \m f[( \u as f' as)] r8^\fermata r16 e'^2( f' g' | \stemBoth \tieBoth + as' des'^1 c'8^\markup { \finger "2-3" } h~h c'16) \clef F e,16[(^2 f, g,] | \forcedBreak - as,-[^5 h,,^2-)-] \clef G <>8-[-( <>16 c'] <>4.~ - <>8-) s4 s8 r16 h^2( c' d' | + as,[^5 h,,^2)] \clef G 8[( 16 c'] 4.~ + 8) s4 s8 r16 h^2( c' d' | es' ges-1 f-2 a-1 c'-2 f'-4 \stemUp \tieUp e'-5 d' c' b-4 a^\prall^\markup { \finger "2-4-3" } g | - f-) f'-5( e'-5 d'-4 c'-3 f'-)-5 <>4-( <>8 | - <>4 <>8 f16^4 d'^5~ d'8.-[ c'16^4] | + f) f'-5( e'-5 d'-4 c'-3 f')-5 4( 8 | + 4 8 f16^4 d'^5~ d'8.[ c'16^4] | \forcedBreak - < f8-)^3 \context Voice = another { \m a,16-[^\pp \u c8 c16] } > \m g,-[ \u c_3-] \m b,-[^\markup { \finger "2-1" } \u c8 c16-] \m a,-[ \u c]~ | \stemBoth + << f8)^3_\pp \context Voice = another { \m a,16[ \u c8 c16] } >> \m g,[ \u c_3] \m b,[^\markup { \finger "2-1" } \u c8 c16] \m a,[ \u c]~ | \stemBoth c16 c8_4 c c16~c c8_2 c c16~ | c16 c8 c c16~c c8 c c16~ | c16 c8 c c16 r4^\fermata r8 | \bar "|." @@ -92,13 +91,13 @@ rightb = \notes \transpose c cis' { \relative c { \stemDown \slurDown \repeat volta 2 { a4^1( g8^1 b4^1 a8^1 | - f8..^1 f32^1 g8^2 a4.-)^1 | + f8..^1 f32^1 g8^2 a4.)^1 | c4^1( b8 d4 c8 | - f,8.. f32^1 g8^2 a4.-) | + f,8.. f32^1 g8^2 a4.) | a4(^1 c8^1_\accent~c b^1 a^1 | - g4-) b8^1_\accent(~b a^1 g^1 | - f4-)^1 g8_\accent(~g g_. a_. | - g4 f8~f e4-) | + g4) b8^1_\accent(~b a^1 g^1 | + f4)^1 g8_\accent(~g g_. a_. | + g4 f8~f e4) | } } \u \slurUp @@ -108,37 +107,41 @@ rightb = \notes \transpose c cis' { c_3 g,_2 es, g, h,_4 g, d, g, c g,8 f,16 | c g, es, g, es c_3 as, c^2 d^3 c h, c | e des b,\< des g e_3 ces_4 d_2 f^3 d cis d | - \property Voice.Slur \override #'extra-offset = #'(0 . 3) - \property Voice.Slur \override #'beautiful = #42 - g( fes des fes b g_3 \! es_1 ges_2 a^3 ges f_1 ges_2 | - r ges_2 b des_1 ges b,_2 des ges,^1 b, \d des,^1 \stemDown \transpose c' c { b,-[_1 as,] | - g,8 b,16-[ g, e, cis,] d,-)_4 \< f, h, d_3 f_2 \! r16 } - \property Voice.Slur \revert #'extra-offset - \property Voice.Slur \revert #'beautiful + \override PhrasingSlur #'extra-offset = #'(0 . 3) + \override PhrasingSlur #'beautiful = #42 + g\( fes des fes b g_3 es_1\! ges_2 a^3 ges f_1 ges_2 | + r ges_2 b des_1 ges b,_2 des ges,^1 b, \d des,^1 \stemDown \transpose c' c { b,[_1 as,] | + g,8 b,16[ g, e, cis,] d,\)_4 \< f, h, d_3 f_2 r16\! } + \revert PhrasingSlur #'extra-offset + \revert PhrasingSlur #'beautiful - \translator Staff=mid + \change Staff=mid \relative c { \stemDown \slurDown a4^1( g8^1 b4^1 a8^1 | - f8..^1 f32^1 g8^2 a4.-)^1 | + f8..^1 f32^1 g8^2 a4.)^1 | c4^1( b8 d4 c8 | - f,8.. f32^1 g8^2 a4.-) | - a4^1( c8^1_\accent~c b g16^1( b^2 | - c4-)^1 es8^1~es d^1 f^1~ | - \property PianoStaff.Arpeggio \override #'direction = #1 - f f8.. f32^1( as4.-)^\fermata-\arpeggio ~ | - \property PianoStaff.Arpeggio \revert #'direction + f,8.. f32^1 g8^2 a4.) | + a4^1( c8^1_\accent~[c b)] g16^1([ b^2] | + c4)^1 es8^1~es d^1 f^1~ | + \override PianoStaff.Arpeggio #'direction = #1 + f f8.. f32^1( as4.)^\fermata\arpeggio ~ | + \revert PianoStaff.Arpeggio #'direction \stemUp \tieUp as r4 r8 | } s2. s - \u s4. \grace {f8(} f4-) e8 | + \u s4. \grace { + \override Stem #'stroke-style = #"grace" + f8( + \revert Stem #'stroke-style } + f4) e8 | f g16_2 b_1 a_2 gis_1 c_2 h, c cis_1 d_2 b,_1 | - \tieDown c4.~<>16-\< \tieBoth <>~ << f^3 h >>8-[-\> -\! << e b^2>> -\!] | - \translator Staff=mid + \tieDown c4.~16\< \tieBoth ~ < f^3 h >8[\>\! < e b^2> \!] | + \change Staff=mid \transpose c' c { a4^1( g8^1 b4 a8^2 | - f8..^1 f32^1 g8^2 a8..-) \slurUp <>32-( <>8 | - <>8..-) <>32-( <>8 <>4.-\>-) ~ | - a~ \! a^\fermata \bar "|." + f8..^1 f32^1 g8^2 a8..) \slurUp 32( 8 | + 8..) 32( 8 4.\>) ~ | + a~ a\!^\fermata \bar "|." } } @@ -146,49 +149,53 @@ lefta = \notes \transpose c cis { \stemUp \slurUp \tieUp \repeat volta 2 { f4^1( e8^1 g4^1 f8^1 | - d8..^1 d32^2 e8^1 f4.-) | + d8..^1 d32^2 e8^1 f4.) | a4^1( g8 b4 a8 | - d8..^1 d32^2 e8^1 f4.-) | + d8..^1 d32^2 e8^1 f4.) | fis4^1 a8^1^\accent(~a g^1 f^1 | - e4-)^1 g8^1^\accent(~g f^1 e^1 | - d4-)^1 f8^1^\accent(~f e^. dis^1^. | - e4^1 d8^1~d c4-)^1 | + e4)^1 g8^1^\accent(~g f^1 e^1 | + d4)^1 f8^1^\accent(~f e^. dis^1^. | + e4^1 d8^1~d c4)^1 | } \d \tieBoth \slurDown - < + << \transpose c' c { g4 a8~a f g | a4 g8~g f e | d4 g8~g es f | g4 f8~f es d | c4 r8 f4 as8~ | as g b as4 ces'8~ | - ces' b des' c'4 \context Voice=another { \stemUp \tieUp <>8~ | - es' des'4^1~ \stemDown des'8.-[ c'16] } + ces' b des' c'4 \context Voice=another { \stemUp \tieUp 8~ | + es' des'4^1~ \stemDown des'8.[ c'16] } } \transpose c' c, { g4(-4 a8-3~a f-5 g-4 | a4-3 g8-\markup { \finger "4-3" } ~g f-4 e-5 | - d4-)-\markup { \finger "4-5" }( g8-3~g es f-4 | g4-3 f8-4~f es d-4 | - c4-) r8 f4-4( as8-5~ | as g-4 b-)-5 as4-5( ces'8-4~ | - ces' b des'-4 c'4-)-5( <>8 | - \stemDown \tieDown des'4.-)_5~des'~ | - \property Voice.NoteColumn \override #'horizontal-shift = #-1 des' s + d4)-\markup { \finger "4-5" }( g8-3~g es f-4 | g4-3 f8-4~f es d-4 | + c4) r8 f4-4( as8-5~ | as g-4 b)-5 as4-5( ces'8-4~ | + ces' b des'-4 c'4)-5( 8 | + \stemDown \tieDown des'4.)_5~des'~ | + \override NoteColumn #'horizontal-shift = #-1 des' s } - > - \translator Staff=down \stemUp \slurUp \tieUp \phrasingSlurUp + >> + \change Staff=down \stemUp \slurUp \tieUp \phrasingSlurUp f4^1( e8^1 g4^1 f8^1 | - d8..^1 d32^2 e8^1 f4.-) | + d8..^1 d32^2 e8^1 f4.) | a4^1( g8 b4 a8 | - d8..^1 d32^2 e8^1 f4.-) | + d8..^1 d32^2 e8^1 f4.) | fis4 a8^\accent~a g s | - a4 c'8^\accent(~c' b-) d'^\accent~ | + a4 c'8^\accent(~c' b) d'^\accent~ | d' d'8..^\accent d'32-1 s4. | s2.*2 - s8 r16 h\( c' d' es' as g8-\arpeggio fis-)( - ges-)-\) f16-2( a-1 c'-3 f'-)-1 \grace {\stemDown \slurUp b,-[-( f] \stemUp } e'-)-1( d' c' b-1 a-2-\prall g - f16-)-4 f' <> d'-1 c'-2 h-1 s4. + s8 r16 h\( c' d' es' as g8\arpeggio fis( + ges)\) f16-2( a-1 c'-3 f')-1 \grace { + \override Stem #'stroke-style = #"grace" + \stemDown \slurUp b,[( f] \stemUp + \revert Stem #'stroke-style } + e')-1( d' c' b-1 a-2\prall g + f16)-4 f' d'-1 c'-2 h-1 s4. s2. f4^1( e8 g4 f8 | - d8..^1 d32-2 e8^1 f8..-) d32^2( e8^1 | - f8..-) d32-2( e8^1 f4.-)^1 ~ | - f~ f-\fermata | + d8..^1 d32-2 e8^1 f8..) d32^2( e8^1 | + f8..) d32-2( e8^1 f4.)^1 ~ | + f~ f\fermata | } leftb = \notes \transpose c cis { @@ -198,10 +205,10 @@ leftb = \notes \transpose c cis { d c f, c-3 e c f c f, c8 c16-3 | a16 c f, c g c-3 b c f, c a c | d c f, c-3 e c f c-2 f, c8 c16 | - fis d-2 d, d a-[ d] g, d g d f h,-3 | - e c-2 c, c g-[ c] f, c f c e a,-3 | - d a, d, a, f-[ g,-2] h,, g, e c, dis fis,-5 | - e c g,-4 c d g,-2 c,-[ g, c g,] c,8 | + fis d-2 d, d a[ d] g, d g d f h,-3 | + e c-2 c, c g[ c] f, c f c e a,-3 | + d a, d, a, f[ g,-2] h,, g, e c, dis fis,-5 | + e c g,-4 c d g,-2 c,[ g, c g,] c,8 | } s2.*9 | @@ -210,19 +217,19 @@ leftb = \notes \transpose c cis { d c c, c-3 e c f c f, c8 c16-3 | a16 c f, c g c-3 b c f, c a c | d c f, c-3 e c f c-2 f, c8 cis16 | - fis^1 d d, d a-[ d_2] g, d g d_3 b,-[_5( g_2] | - a-) c_3 f, c c'-[ f_2] b, f b f_3 d' as | - h, as d' as h, as( f'4.-)^\fermata-\arpeggio_2 ~ - \d \stemDown f'8. \clef G \stemBoth \tieBoth - \transpose c c' { e16-[_4( f g] as-[ des_3] c8-[_4 <>]~ | - <>} \clef F <>-[-( <>] <>8.-) h,16_4( c d | + fis^1 d d, d a[ d_2] g, d g d_3 b,[_5( g_2] | + a) c_3 f, c c'[ f_2] b, f b f_3 d' as | + h, as d' as h, as( f'4.)^\fermata\arpeggio_2 ~ + \d \stemDown f'8. \clef G \stemBoth \tieBoth \phrasingSlurDown + \transpose c c' { e16[_4( f g] as[ des_3] c8[_4 )]~ | + } \clef F [( ] 8.) h,16_4\( c d | \voiceTwo - es as,_3 g,8 fis,~fis, g,_4-\arpeggio gis,_5~ | - gis, <>16 r16 r8 r4 cis8( | - d-) e( f16_4 d_5 c4.-)_ \markup { \finger "4-3" }~ | + es as,_3 g,8 fis,~fis, g,_4\arpeggio gis,_5~ | + gis, 16\) r16 r8 r4 cis8( | + d) e( f16_4 d_5 c4.)_ \markup { \finger "4-3" }~ | \oneVoice - c16( h,_4 c_3 cis_1 d_2 b,_3 a,_4 as,_1 g,8 c,8-) | - \translator Staff = down \stemDown \tieDown + c16( h,_4 c_3 cis_1 d_2 b,_3 a,_4 as,_1 g,8 c,8) | + \change Staff = down \stemDown \tieDown f16^\pp c f, c e c-3 g c-2 f, c f c | d c f, c-3 e c f c-2 f, c-3 e c | f c-2 f, c-3 e c ~ c c8 c c16 ~ | @@ -230,42 +237,45 @@ leftb = \notes \transpose c cis { } \score { \notes - \context PianoStaff < + \context PianoStaff << \pianoCautionaries - \property PianoStaff.NoteCollision \override #'merge-differently-dotted = ##t - \property PianoStaff.connectArpeggios = ##t - \property PianoStaff.Arpeggio \override #'molecule-callback = \arpeggioBracket + \override PianoStaff.NoteCollision #'merge-differently-dotted = ##t + \set PianoStaff.connectArpeggios = ##t + \override PianoStaff.Arpeggio #'print-function = \arpeggioBracket - \property PianoStaff.InstrumentName \set #'font-relative-size = #3 - \property PianoStaff.InstrumentName \set #'font-shape = #'italic - \property PianoStaff.InstrumentName \set #'font-magnification = #3 + \override PianoStaff.InstrumentName #'font-size = #6 + \override PianoStaff.InstrumentName #'font-shape = #'italic + \override PianoStaff.InstrumentName #'font-magnification = #3 - \property PianoStaff.instrument="2. " + \set PianoStaff.instrument = "2. " \context Staff = up { - \property Staff.DynamicLineSpanner \override #'direction = #-1 - \clef G <\global \context Voice=upv \righta > + \override Staff.DynamicLineSpanner #'direction = #-1 + \clef G <<\global \context Voice=upv \righta >> } \context Staff = mid { - % \property Staff.instrument="\\begin{turn}{-90}{Rechte Hand}\\end{turn}" - \property Staff.instrument= \markup { - \column << Rechte Hand >> } - \clef F <\global \context Voice=midv \rightb> + \override Staff.InstrumentName #'font-size = #0 + \override Staff.InstrumentName #'font-shape = #'upright + \override Staff.InstrumentName #'font-magnification = #1 + \override Staff.InstrumentName #'extra-offset = #'(0 . 6) + % \set Staff.instrument = "\\begin{turn}{-90}{Rechte Hand}\\end{turn}" + \set Staff.instrument = \markup { \column < Rechte Hand > } + \clef F <<\global \context Voice=midv \rightb>> } \context Staff = down { - \property Staff.DynamicLineSpanner \override #'direction = #1 + \override Staff.DynamicLineSpanner #'direction = #1 \clef F - < \global \context Voice=lva \lefta \context Voice=lvb \leftb > + << \global \context Voice=lva \lefta \context Voice=lvb \leftb >> } - > + >> \paper { interscoreline = 0.0 interscorelinefill = 1 indent = 0.5 \in - textheight = 27.0 \cm + % textheight = 29.8 \cm pagenumber = no - + linewidth = 17.0 \cm \translator { - \HaraKiriStaffContext + \RemoveEmptyStaffContext } \translator { \ScoreContext @@ -273,10 +283,10 @@ leftb = \notes \transpose c cis { } \translator { \PianoStaffContext - VerticalAlignment \override #'forced-distance = #12.0 + VerticalAlignment \override #'forced-distance = #13.0 } } \midi { \tempo 8=100 } } -%% new-chords-done %% +