X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fmutopia%2FR.Schumann%2Fromanze-op28-2.ly;h=1c0eec1c99880930d0a26df1cf87f39474c1a5eb;hb=9e7b53f94e1e3bd7b3f7a14ba11a6cae6c8e9a73;hp=2d32473ee1cd217757c266c8235bc29ed2ed6fee;hpb=05fabaaf86fd44f9bd903f282bb98d343a991e40;p=lilypond.git diff --git a/input/mutopia/R.Schumann/romanze-op28-2.ly b/input/mutopia/R.Schumann/romanze-op28-2.ly index 2d32473ee1..1c0eec1c99 100644 --- a/input/mutopia/R.Schumann/romanze-op28-2.ly +++ b/input/mutopia/R.Schumann/romanze-op28-2.ly @@ -1,15 +1,15 @@ -#(ly:set-option 'old-relative) % NOT FINISHED!!!! \include "deutsch.ly" #(set-global-staff-size 16) -\version "2.1.21" + +\version "2.11.38" \header { title = "Romanzen" opus = "op. 28/2" - composer = "R. Schumann (1810-1856)" + composer = "Robert Schumann (1810-1856)" enteredby="Rune Zedeler" maintainer="rune@zedeler.dk" mutopiatitle = "Romanzen - op. 28/2" @@ -21,27 +21,30 @@ u = { \change Staff = up \stemDown } m = { \change Staff = mid \stemUp } -d = { \change Staff = down \stemUp } + +% +% d = .. complains about note names. +% +#(define d #{ \change Staff = down \stemUp #}) forcedBreak = \break -global = \notes { \key fis \major \time 6/8 - \property Score.beatLength = #(ly:make-moment 3 8) +global = { \key fis \major \time 6/8 + \set Score.beatLength = #(ly:make-moment 3 8) \repeat volta 2 { s2.*8 } s2.*26 \bar "|." } -righta = \notes \transpose c cis' { +righta = \transpose c cis' { % \stemUp \slurUp \tieUp \stemUp - \property Voice.Slur \override #'attachment = #'(stem . stem) \repeat volta 2 { - \property Voice.TextScript \override #'extra-offset = #'(-8.0 . 2.5) + \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]) | - \property Voice.TextScript \revert #'extra-offset + \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)] | @@ -70,7 +73,7 @@ righta = \notes \transpose c cis' { \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 + f'[ as)] \m f[( \u as f' as)] r8^\fermata r16 e'^2( f' g' | \stemNeutral \tieNeutral as' des'^1 c'8^\markup { \finger "2-3" } h~h c'16) \clef F e,16[(^2 f, g,] | \forcedBreak @@ -80,14 +83,14 @@ righta = \notes \transpose c cis' { 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_\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 + << f8)^3_\pp \new 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]~ | \stemNeutral 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 "|." } -rightb = \notes \transpose c cis' { +rightb = \transpose c cis' { \relative c { \stemDown \slurDown \repeat volta 2 { a4^1( g8^1 b4^1 a8^1 | @@ -107,13 +110,10 @@ 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.PhrasingSlur \override #'extra-offset = #'(0 . 3) - \property Voice.PhrasingSlur \override #'beautiful = #42 + \once \override PhrasingSlur #'extra-offset = #'(0 . 3) 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.PhrasingSlur \revert #'extra-offset - \property Voice.PhrasingSlur \revert #'beautiful \change Staff=mid \relative c { \stemDown \slurDown @@ -123,19 +123,19 @@ rightb = \notes \transpose c cis' { 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 + \override PianoStaff.Arpeggio #'direction = #UP f f8.. f32^1( as4.)^\fermata\arpeggio ~ | - \property PianoStaff.Arpeggio \revert #'direction + \revert PianoStaff.Arpeggio #'direction \stemUp \tieUp as r4 r8 | } s2. s \u s4. \grace { - \property Voice.Stem \override #'stroke-style = #"grace" + \override Stem #'stroke-style = #"grace" f8( - \property Voice.Stem \revert #'stroke-style } + \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> \!] | + \tieDown c4.~16\< \tieNeutral ~ < f^3 h >8[\>\! < e b^2> \!] | \change Staff=mid \transpose c' c { a4^1( g8^1 b4 a8^2 | @@ -145,7 +145,7 @@ rightb = \notes \transpose c cis' { } } -lefta = \notes \transpose c cis { +lefta = \transpose c cis { \stemUp \slurUp \tieUp \repeat volta 2 { f4^1( e8^1 g4^1 f8^1 | @@ -157,13 +157,13 @@ lefta = \notes \transpose c cis { d4)^1 f8^1^\accent(~f e^. dis^1^. | e4^1 d8^1~d c4)^1 | } - \d \tieBoth \slurDown + \d \tieNeutral \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~ | + ces' b des' c'4 \new Voice = "another" { \stemUp \tieUp 8~ | es' des'4^1~ \stemDown des'8.[ c'16] } } \transpose c' c, { @@ -172,7 +172,7 @@ lefta = \notes \transpose c cis { 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 + \override NoteColumn #'horizontal-shift = #-1 des' s } >> \change Staff=down \stemUp \slurUp \tieUp \phrasingSlurUp @@ -186,9 +186,9 @@ lefta = \notes \transpose c cis { s2.*2 s8 r16 h\( c' d' es' as g8\arpeggio fis( ges)\) f16-2( a-1 c'-3 f')-1 \grace { - \property Voice.Stem \override #'stroke-style = #"grace" + \override Stem #'stroke-style = #"grace" \stemDown \slurUp b,[( f] \stemUp - \property Voice.Stem \revert #'stroke-style } + \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. @@ -198,7 +198,7 @@ lefta = \notes \transpose c cis { f~ f\fermata | } -leftb = \notes \transpose c cis { +leftb = \transpose c cis { \stemDown \slurDown \tieDown \repeat volta 2 { f16^\p c f, c e c-3 g c-2 f, c f c | @@ -220,7 +220,7 @@ leftb = \notes \transpose c cis { 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 + \d \stemDown f'8. \clef G \stemNeutral \tieNeutral \phrasingSlurDown \transpose c c' { e16[_4( f g] as[ des_3] c8[_4 )]~ | } \clef F [( ] 8.) h,16_4\( c d | \voiceTwo @@ -236,57 +236,63 @@ leftb = \notes \transpose c cis { c c8 c c16 r4_\fermata r8 \bar "|." | } -\score { \notes + +\paper { + indent = 0.5 \in + % textheight = 29.8 \cm + pagenumber = no + line-width = 17.0 \cm +} + +\score { \context PianoStaff << - \pianoCautionaries - \property PianoStaff.NoteCollision \override #'merge-differently-dotted = ##t - \property PianoStaff.connectArpeggios = ##t - \property PianoStaff.Arpeggio \override #'print-function = \arpeggioBracket + #(set-accidental-style 'piano-cautionary) + \override PianoStaff.NoteCollision #'merge-differently-dotted = ##t + \set PianoStaff.connectArpeggios = ##t + \override PianoStaff.Arpeggio #'stencil = #ly:arpeggio::brew-chord-bracket - \property PianoStaff.InstrumentName \set #'font-size = #6 - \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. " - \context Staff = up { - \property Staff.DynamicLineSpanner \override #'direction = #-1 - \clef G <<\global \context Voice=upv \righta >> + \set PianoStaff.instrumentName = " 2." + \new Staff = "up" { + \override Staff.DynamicLineSpanner #'direction = #DOWN + \clef G <<\global \new Voice = "upv" \righta >> } - \context Staff = mid { - \property Staff.InstrumentName \set #'font-size = #0 - \property Staff.InstrumentName \set #'font-shape = #'upright - \property Staff.InstrumentName \set #'font-magnification = #1 - \property Staff.InstrumentName \set #'extra-offset = #'(0 . 6) - % \property Staff.instrument="\\begin{turn}{-90}{Rechte Hand}\\end{turn}" - \property Staff.instrument= \markup { \column < Rechte Hand > } - \clef F <<\global \context Voice=midv \rightb>> + \new Staff = "mid" { + \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.instrumentName = "\\begin{turn}{-90}{Rechte Hand}\\end{turn}" + \set Staff.instrumentName = \markup { \column { Rechte Hand } \hspace #2 } + \clef F <<\global \new Voice = "midv" \rightb>> } - \context Staff = down { - \property Staff.DynamicLineSpanner \override #'direction = #1 + \new Staff = "down" { + \override Staff.DynamicLineSpanner #'direction = #UP \clef F - << \global \context Voice=lva \lefta \context Voice=lvb \leftb >> + << \global \new Voice \lefta \new Voice \leftb >> } >> - \paper { - interscoreline = 0.0 - interscorelinefill = 1 - indent = 0.5 \in - % textheight = 29.8 \cm - pagenumber = no - linewidth = 17.0 \cm - \translator { + \layout { + \context { \RemoveEmptyStaffContext } - \translator { - \ScoreContext - SpacingSpanner \override #'common-shortest-duration = #(ly:make-moment 1 8) - } - \translator { - \PianoStaffContext - VerticalAlignment \override #'forced-distance = #13.0 + \context { + \Score + \override SpacingSpanner #'common-shortest-duration = #(ly:make-moment 1 8) } } - \midi { \tempo 8=100 } + + \midi { + \context { + \Score + tempoWholesPerMinute = #(ly:make-moment 100 8) + } + } + + }