From: Rune Zedeler Date: Thu, 8 Aug 2002 20:15:11 +0000 (+0000) Subject: 2002-08-08 Rune Zedeler X-Git-Tag: release/1.5.72~25 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=864dad49c35470fa67a8917552d9a54383647a08;p=lilypond.git 2002-08-08 Rune Zedeler * ly/property-init.ly: Added phrasingSlurUp, phrasingSlurDown and phrasingSlurBoth. * input/mutopia/R.Schumann/SchumannRomanzenOp28.2.ly: Added. --- diff --git a/ChangeLog b/ChangeLog index 2034382be9..1d4acc266e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-08-08 Rune Zedeler + + * ly/property-init.ly: Added phrasingSlurUp, phrasingSlurDown and + phrasingSlurBoth. + + * input/mutopia/R.Schumann/SchumannRomanzenOp28.2.ly: Added. + 2002-08-08 Han-Wen Nienhuys * lily/beam.cc (struct Int_set): typo. diff --git a/input/mutopia/R.Schumann/SchumannRomanzenOp28.2.ly b/input/mutopia/R.Schumann/SchumannRomanzenOp28.2.ly new file mode 100644 index 0000000000..e111d28fa3 --- /dev/null +++ b/input/mutopia/R.Schumann/SchumannRomanzenOp28.2.ly @@ -0,0 +1,270 @@ +% NOT FINISHED!!!! + +\include "deutsch.ly" +\include "paper19.ly" +\version "1.5.71" + +\header { + title = "Romanzen" + opus = "op. 28/2" + composer = "R. Schumann (1810-1856)" + % latexpackages="rotating" + enteredby="Rune Zedeler" + maintainer="rune@zedeler.dk" + mutopiatitle = "Romanzen - op. 28/2" + mutopiacomposer = "R. Schumann 1810-1856" + mutopiainstrument = "Piano" + style = "Romantic" + copyright = "Public Domain" +} + +#(define note '((font-relative-size . -2) (rows (music "noteheads-2" ((kern . -0.1) "flags-stem"))))) +#(define eight-note `((font-relative-size . -2) (rows ,note ((kern . -0.03) (music ((raise . 2.5) "flags-u3")))))) + + +u = { \translator Staff = up \stemDown } +m = { ] \translator Staff = mid \stemUp [ } +% u = { } +% m = { ] [ } +d = { \translator Staff = down \stemUp } + +global = \notes { \key fis \major \time 6/8 + \property Score.beatLength = #(make-moment 3 8) + \repeat volta 2 { s2.*8 } s2.*26 \bar "|." +} + +righta = \notes \transpose cis'' { + % \stemUp \slurUp \tieUp + \stemUp + \repeat volta 2 { + \property Voice.TextScript \override #'extra-offset = #'(-8.0 . 2.5) + \m a,16^\p( \u c^#`((rows (Large "Einfach. (") ,eight-note (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 + \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] | + } + \stemUp \slurUp \tieUp \break + b4^5( ~ a g^4 | + f4^5 e8^5~e )d4^4 | + as4^4( ~ 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^#'(large "ritard...") cis,^1 \u r8 r r4 r16 \d gis,^2^"R.H." | + + + \break + \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^#'(finger "2-3") h~h )c'16 \clef F [e,16(^2 f, g,] | + \break + + [as,^5 )h,,^2] \clef G [ c'] ~ + <)c8 es ges c'> 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^#'(finger "2-4-3") g | + )f f'-5( e'-5 d'-4 c'-3 )f'-5 | + f16^4 d'^5~[d'8. c'16^4] | + \break + <)f8^3 \context Voice = another { \m a,16^\pp \u c8 c16] } > \m g, \u c_3 \m b,^#'(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 "|." + +} + +rightb = \notes \transpose cis'' { + \relative c { \stemDown \slurDown + \repeat volta 2 { + a4^1( g8^1 b4^1 a8^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^1 a^1 | + )g4 b8^1_\accent(~b a^1 g^1 | + )f4^1 g8_\accent(~g g_. a_. | + g4 f8~f )e4 | + } + } + \u \slurUp + g16_4 d b, d g e cis g_4 f_3 d_1 e_2 b, | + d_3 a,_2 f, a, cis_4 a, e, a, d a,8 g,16 | + f_4 c as, c f d h, f_4 es_3 c_1 d_2 as, | + 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 {[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 + + \translator Staff=mid + \relative c { \stemDown \slurDown + a4^1( g8^1 b4^1 a8^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 + \stemUp \tieUp as r4 r8 | + } + s2. s + \u s4. \grace {f8(} )f4 e8 | + f g16_2 b_1 a_2 gis_1 c_2 h, c cis_1 d_2 b,_1 | + \tieDown c4.~ \tieBoth ~[< \! f8^3 h \> > < \! e b^2>] | + \translator Staff=mid + \transpose c { + a4^1( g8^1 b4 a8^2 | + f8..^1 f32^1 g8^2 )a8.. | + <)a8.. a'^5> <)a4. a'^5 \> > ~ | + a~ \! a^\fermata \bar "|." + } +} + +lefta = \notes \transpose cis' { + \stemUp \slurUp \tieUp + \repeat volta 2 { + f4^1( e8^1 g4^1 f8^1 | + d8..^1 d32^2 e8^1 )f4. | + a4^1( g8 b4 a8 | + 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 | + } + \d \tieBoth \slurDown + < + \transpose 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 ~ | + es' des'4^1~ \stemDown [des'8. c'16] } + } + \transpose c, { + g4(-4 a8-3~a f-5 g-4 | a4-3 g8-#'(finger "4-3") ~g f-4 e-5 | + )d4-#'(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( | + \stemDown \tieDown )des'4._5~des'~ | + \property Voice.NoteColumn \override #'horizontal-shift = #-1 des' s + } + > + \translator Staff=down \stemUp \slurUp \tieUp \phrasingSlurUp + f4^1( e8^1 g4^1 f8^1 | + d8..^1 d32^2 e8^1 )f4. | + a4^1( g8 b4 a8 | + d8..^1 d32^2 e8^1 )f4. | + fis4 a8^\accent~a g s | + 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. + 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 | +} + +leftb = \notes \transpose cis' { + \stemDown \slurDown \tieDown + \repeat volta 2 { + f16^\p c f, c e c-3 g c-2 f, c f c | + 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 | + } + + s2.*9 | + + f16^\p c c, c e c-3 g c-2 c, c f c | + 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'' {[e16_4( f g] [as des_3] [c8_4 ]~ | + } \clef F [ ] <)a,8._5 eis^1> h,16_4( c d | + \voiceTwo + es as,_3 g,8 fis,~fis, g,_4-\arpeggio gis,_5~ | + gis, r16 r8 r4 cis8( | + )d e( f16_4 d_5 )c4._ #'(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 + 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 ~ | + c c8 c c16 r4_\fermata r8 \bar "|." | +} + +\score { \notes + \context PianoStaff < + \pianoCautionaries + \property PianoStaff.NoteCollision \override #'merge-differently-dotted = ##t + \property PianoStaff.connectArpeggios = ##t + \property PianoStaff.Arpeggio \override #'molecule-callback = \arpeggioBracket + + \property PianoStaff.instrument="\Huge\bf\it 2." + \context Staff = up { + \property Staff.DynamicLineSpanner \override #'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=#'(rows ((raise . -7.5) "") ((raise . 7.5) (lines "Rechte " "Hand."))) + \clef F <\global \context Voice=midv \rightb> + } + \context Staff = down { + \property Staff.DynamicLineSpanner \override #'direction = #1 + \clef F + < \global \context Voice=lva \lefta \context Voice=lvb \leftb > + } + > + \paper { + interscoreline = 0.0 + interscorelinefill = 1 + indent = 0.5 \in + textheight = 27.0 \cm + pagenumber = no + \translator { + \HaraKiriStaffContext + } + \translator { + \ScoreContext + SpacingSpanner \override #'common-shortest-duration = #(make-moment 1 8) + } + \translator { + \PianoStaffContext + VerticalAlignment \override #'forced-distance = #12.0 + } + } + \midi { \tempo 8=100 } +} diff --git a/ly/property-init.ly b/ly/property-init.ly index fcd29dda61..5162620244 100644 --- a/ly/property-init.ly +++ b/ly/property-init.ly @@ -10,6 +10,10 @@ slurUp = \property Voice.Slur \set #'direction = #1 slurDown = \property Voice.Slur \set #'direction = #-1 slurBoth = \property Voice.Slur \revert #'direction +phrasingSlurUp = \property Voice.PhrasingSlur \set #'direction = #1 +phrasingSlurDown = \property Voice.PhrasingSlur \set #'direction = #-1 +phrasingSlurBoth = \property Voice.PhrasingSlur \revert #'direction + shiftOn = \property Voice.NoteColumn \set #'horizontal-shift = #1 shiftOnn = \property Voice.NoteColumn \set #'horizontal-shift = #2 shiftOnnn = \property Voice.NoteColumn \set #'horizontal-shift = #3