X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fles-nereides.ly;h=07d264fd2c11b115267c0f36489cb8340c142b7c;hb=bf1d08e0f49bc5b4c9b58fa6a01287937cbca26b;hp=b802151a81a59ce67c38d94cce4724874f450215;hpb=955f829883aa125b2b633b1e71f6256da5b773fa;p=lilypond.git diff --git a/input/les-nereides.ly b/input/les-nereides.ly index b802151a81..07d264fd2c 100644 --- a/input/les-nereides.ly +++ b/input/les-nereides.ly @@ -1,13 +1,13 @@ #(ly:set-option 'old-relative) -\version "1.9.0" - +\version "2.3.2" +\encoding "latin1" \header { - composer = "ARTHUR GRAY" - title = "LES N\\'ER\\'EIDES" - subtitle = "THE NEREIDS" - enteredby = "JCN" - piece = "Allegretto scherzando" - copyright = "public domain" + composer = "ARTHUR GRAY" + title = "LES NÉRÉIDES" + subtitle = "THE NEREIDS" + enteredby = "JCN" + piece = "Allegretto scherzando" + copyright = "public domain" } %{ @@ -22,8 +22,8 @@ marked with %tweak possibly more impressive to render without tweaks? - grep -v tweak input/les-nereides.ly > lnnt.ly - ly2dvi lnnt.ly + grep -v tweak input/les-nereides.ly >> lnnt.ly + lilypond lnnt.ly %} @@ -32,186 +32,198 @@ possibly more impressive to render without tweaks? (lambda (elt) (equal? text (ly:get-grob-property elt 'text)))) -treble = \context Voice=treble \notes\relative c''{ +treble = \new Voice \notes\relative c''{ \key a \major r2 | %2 \stemUp - r4 <>-\arpeggio r2 + r4 \arpeggio r2 | %3 - r4 <>-\arpeggio r8. + r4 \arpeggio r8. - \translator Staff=bass + \change Staff=bass - \once\property Voice.TextScript \set #'extra-offset = #'(-3 . -4) %tweak - - cis,16^2-(^\markup {\small \italic "m.d." } - <>8 <> + \once\override TextScript #'extra-offset = #'(-3 . -4) %tweak + + cis,16^2(^\markup {\small \italic "m.d." }\sustainUp + 8 | %4 - <>4-) + 4)\sustainDown - \translator Staff=treble + \change Staff=treble \slurUp - \property PianoStaff.connectArpeggios = ##t + \set PianoStaff.connectArpeggios = ##t #(set-octavation 1) - \once\property Voice.TextScript \set #'extra-offset = #'(-3 . -2) %tweak + \once\override TextScript #'extra-offset = #'(-3 . -2) %tweak \tieUp - cis''''4^\markup { \small \italic "m.g." }-\arpeggio-~ + cis''''4^\markup { \small \italic "m.g." }\arpeggio~ \grace { - cis8 - - %\stemBoth Hmm - \property Voice.Stem \set #'direction = #0 + cis8 + \slurBoth % Tweak + + \override Stem #'direction = #0 - a16-[-5( fis dis-] - #(set-octavation 0) + a16[-5( fis dis] + #(set-octavation 0) - cis32-[ a-1 fis-4 dis] cis-[ a fis-)-2] - % the small grace in lower staff comes after us - s32 + cis32[ a-1 fis-4 dis] cis[ a fis)-2] + % the small grace in lower staff comes after us + s32 } + \stemUp - cis'4( bis-) + cis'4( bis) | %5 - r8 <>8-(-\mf <> <> + r8 8(\mf % \fingerUp - \property Voice.Fingering \set #'direction = #1 + \override Fingering #'direction = #1 % Manual fix for collision with slur - \property Voice.Fingering \set #'extra-offset = #'(0 . 1) %tweak - <> <> e-)-1-4-5 r + \override Fingering #'extra-offset = #'(0 . 1) %tweak + e)-1-4-5 r | %6 - r <>8-(-\mf <> <> - <> <> e-) r + r 8(\mf + e) r | %7 \bar "||" } -trebleTwo = \context Voice=trebleTwo \notes\relative c''{ +trebleTwo = \new Voice \notes\relative c''{ \stemDown \slurDown % \fingerDown - \property Voice.Fingering \set #'direction = #-1 - \property Voice.Fingering \set #'extra-offset = #'(0 . 1.2) + \override Fingering #'direction = #-1 + \override Fingering #'extra-offset = #'(0 . 1.2) s2 | %1 s1*2 | %4 s4 - <>4-\arpeggio - <>2 + 4\arpeggio + 2 | %5 s8 cis4. d4 - %%<>8-[-( <> - <>8-[-( <>-3-1 + %%8[( + 8[( -3-1 | %6 - %%<>-)] cis4. d4 - <>-)-]-2-1 cis4. d4 - <>8-[-( <> + %%)] cis4. d4 + )]-2-1 cis4. d4 + 8[( | %7 - <>-)] + )] } -bass = \context Voice=bass \notes\relative c{ +bass = \new Voice \notes\relative c{ \partial 2 \key a \major % Allow ugly (highly blown-up) slurs - \property Voice.Slur \override #'beautiful = #5.0 %tweak - \property Voice.Slur \override #'attachment-offset = #'((0 . 3) . (0 . -4)) %tweak + \override Slur #'beautiful = #5.0 %tweak + \override Slur #'attachment-offset = #'((0 . 3) . (0 . -4)) %tweak \slurDown \dynamicUp - r8. e,16-(-\f_2 <>8-[ <>] + r8. e,16(\f_2 8[ ] | %2 - <>4 - \translator Staff=treble + \override Staff.SustainPedalLineSpanner #'staff-padding = #5 + + 4\sustainDown + \change Staff=treble \stemDown - \property Voice.Slur \override #'attachment = #'(stem . stem) %tweak - <>4-)-\arpeggio + \override Slur #'attachment = #'(stem . stem) %tweak + 4)\arpeggio - \property Voice.Slur \revert #'attachment %tweak - \translator Staff=bass + \revert Slur #'attachment %tweak + \change Staff=bass \stemBoth - \property Voice.Slur \revert #'y-free %tweak - \property Voice.Slur \override #'y-free = #0.1 %tweak - \property Voice.Slur \revert #'attachment-offset %tweak - \property Voice.Slur \override #'attachment-offset = #'((0 . 3) . (0 . 8)) %tweak - r8. cis,,16( <>8 <> + \revert Slur #'y-free %tweak + \override Slur #'y-free = #0.1 %tweak + \revert Slur #'attachment-offset %tweak + \override Slur #'attachment-offset = #'((0 . 3) . (0 . 8)) %tweak + r8. cis,,16(\sustainUp 8 | %3 - \property Voice.Stem \set #'length = #5 %tweak - <>4 - \translator Staff=treble + \override Stem #'length = #5 %tweak + 4\sustainDown + \change Staff=treble - \property Voice.Stem \revert #'length %tweak - \property Voice.Stem \revert #'direction - \property Voice.Stem \override #'direction = #-1 - <>-)-\arpeggio - \translator Staff=bass - \property Voice.Stem \revert #'direction + \revert Stem #'length %tweak + \revert Stem #'direction + \override Stem #'direction = #-1 + )\arpeggio + \change Staff=bass + \revert Stem #'direction r2 | %4 - \property Voice.Slur \revert #'beautiful %tweak - \property Voice.Slur \revert #'attachment-offset %tweak + \revert Slur #'beautiful %tweak + \revert Slur #'attachment-offset %tweak \stemDown - <>4 + 4 \clef treble \stemBoth - < + << %urg: staff-change: ! on dis - <>-\arpeggio - > + \arpeggio + >> \grace { + \override Stem #'stroke-style = #"grace" + s8 s16 s s s32 s s s s s \clef bass - \property Voice.fontSize = #-3 - <>32-( - } <>2-) + 32(\sustainUp\sustainDown + + \revert Stem #'stroke-style + } + 2) | %5 \slurUp % \fingerDown - \property Voice.Fingering \set #'direction = #-1 - - %%a,8 e'-[-5-(<>-]-) - a,8 e'-[-5-(<>-]-)-2-3 - %%r b,-5 <>4 - r b,-5 <>4-3-5 + \override Fingering #'direction = #-1 + + + \override Staff.SustainPedalLineSpanner #'staff-padding = #3.5 + \set Staff.pedalSustainStyle = #'mixed + %%a,8 e'[-5(]) + + + a,8\sustainDown e'[-5(])-2-3 + %%r b,-5 4 + r b,-5\sustainUp\sustainDown 4-3-5 \slurBoth - \once \property Voice.Fingering \set #'extra-offset = #'(0 . -1) %tweak - e,8-[-5-( + \once \override Fingering #'extra-offset = #'(0 . -1) %tweak + e,8[-5(\sustainUp | %6 - \once \property Voice.Fingering \set #'extra-offset = #'(0 . -1) %tweak - a-)-2] + \once \override Fingering #'extra-offset = #'(0 . -1) %tweak + a)-2]\sustainDown \slurUp - e'-[(<>-)] r b, <>4 + e'[()] r b,\sustainUp\sustainDown 4 \slurBoth - e,8-[( + e,8[(\sustainUp | %7 - a-)] + a)] } -bassTwo = \context Voice=bassTwo \notes\relative c{ +bassTwo = \new Voice \notes\relative c{ \skip 2 \skip 1*2 \skip 2 @@ -219,138 +231,88 @@ bassTwo = \context Voice=bassTwo \notes\relative c{ \stemUp \slurUp - cis'4-( bis-) + cis'4( bis) } -middleDynamics = \context Dynamics=middle \notes{ - \property Dynamics.TextScript \set #'padding = #-1 %tweak +middleDynamics = \notes{ + \override Dynamics.TextScript #'padding = #-1 %tweak s2 s1*2 | %4 s2 \grace { - s8 - s16 s s - s32 s - \once\property Dynamics.Hairpin \set #'extra-offset = #'(0 . 2) %tweak - s-\> s - s32 s s s-\! + s8 + s16 s s + s32 s + \once\override Dynamics.Hairpin #'extra-offset = #'(0 . 2) %tweak + s\> s + s32 s s s\! + } + s32 s-"rall." s s s8 s4 | %5 s2-"a tempo" s8 - \once\property Dynamics.Hairpin \set #'extra-offset = #'(1 . 0) %tweak + \once\override Dynamics.Hairpin #'extra-offset = #'(1 . 0) %tweak s \> s s | %6 - s8-\! - s2 s8 s-\> s - | %7 - s8-\! -} - -lowerDynamics = \context Dynamics=lower \notes{ - s2 - | %2 - s2-\sustainDown s8. s16-\sustainUp s4 - | %3 - s2-\sustainDown s8. s16-\sustainUp s4 - | %4 - s4-\sustainDown - \property Dynamics.pedalSustainStrings = #'("Ped." "*Ped." "*") - - % grace destroys pedal-line-spanner? - % let's do manual tweak: - \once\property Dynamics.SustainPedal \set #'extra-offset = #'(10 . 0) %tweak - s8-\sustainUp - \once\property Dynamics.SustainPedal \set #'extra-offset = #'(16 . 0) %tweak - s8-\sustainDown -%{ - s4 - \grace { - s8 - s16 s s - s32 s s s-\sustainUp - s32 s s s-\sustainDown - } -%} - s2 - - | %5 - % ugh, I don't think that 'mixed should show last edge, but rather: - % - % Ped__________/\__________ * - % - % that's what gray wants, anyway. - - \property Dynamics.pedalSustainStyle = #'mixed - s8-\sustainDown s s - s s-\sustainUp-\sustainDown s - s - \once \property Dynamics.pedalSustainStyle = #'text - s-\sustainUp - - | %6 - \property Dynamics.pedalSustainStyle = #'mixed - s8-\sustainDown s s - s s-\sustainUp-\sustainDown s - s - \once \property Dynamics.pedalSustainStyle = #'text - s-\sustainUp + s8\! + s2 s8 s\> s | %7 + s8\! } -\score{ - \context PianoStaff < - \context Staff=treble < +theScore = \score{ + \context PianoStaff << + \context Staff=treble << \treble \trebleTwo - > - \context Dynamics=middle < + >> + \new Dynamics << \middleDynamics - > - \context Staff=bass < + >> + \context Staff=bass << \clef bass \bass \bassTwo - > - \context Dynamics=lower < - \lowerDynamics - > - > + >> + >> \paper { - \translator { - \ScoreContext + \context { + \Score + pedalSustainStrings = #'("Ped." "*Ped." "*") \remove Bar_number_engraver } - \translator { + \context { \type "Engraver_group_engraver" \name Dynamics \consists "Output_property_engraver" minimumVerticalExtent = #'(-1 . 1) - pedalSustainStrings = #'("Ped." "*Ped." "*") - - \consists "Piano_pedal_engraver" \consists "Script_engraver" \consists "Dynamic_engraver" \consists "Text_engraver" - TextScript \override #'font-relative-size = #1 - TextScript \override #'font-shape = #'italic + \override TextScript #'font-size = #2 + \override TextScript #'font-shape = #'italic \consists "Skip_event_swallow_translator" \consistsend "Axis_group_engraver" } - \translator { - \PianoStaffContext + \context { + \PianoStaff \accepts Dynamics - VerticalAlignment \override #'forced-distance = #7 + \override VerticalAlignment #'forced-distance = #7 } } } - + +\book{ + \score { \theScore } +} + %%% Local variables: %%% LilyPond-indent-level:4 %%% End: