X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fles-nereides.ly;h=ea0943c7005c6d2b3e1af379f203168eb8c73148;hb=f5b1f319b1b5b7517972dfebdac2292a99531d67;hp=93702ec3fab5969abed6e143f434af4a8156e1cd;hpb=8bca46bcb5abd57557cb7c2b5665a4926289dd6b;p=lilypond.git diff --git a/input/les-nereides.ly b/input/les-nereides.ly index 93702ec3fa..ea0943c700 100644 --- a/input/les-nereides.ly +++ b/input/les-nereides.ly @@ -1,9 +1,8 @@ -#(ly:set-option 'old-relative) -\version "2.1.29" +\version "2.9.16" \header { composer = "ARTHUR GRAY" - title = "LES NÉRÉIDES" + title = "LES NÉRÉIDES" subtitle = "THE NEREIDS" enteredby = "JCN" piece = "Allegretto scherzando" @@ -16,8 +15,7 @@ Nastiest piece of competition at http://www.orphee.com/comparison/study.html, see http://www.orphee.com/comparison/gray.pdf - -lines that contain tweaks (17 currently, not counting reverts) are +Lines that contain tweaks (10 currently, not counting reverts) are marked with %tweak possibly more impressive to render without tweaks? @@ -27,12 +25,7 @@ possibly more impressive to render without tweaks? %} -#(ly:set-point-and-click 'line-column) -#(define (make-text-checker text) - (lambda (elt) (equal? text (ly:get-grob-property elt 'text)))) - - -treble = \new Voice \notes\relative c''{ +treble = \new Voice \relative c''{ \key a \major r2 | %2 @@ -63,11 +56,9 @@ treble = \new Voice \notes\relative c''{ cis''''4^\markup { \small \italic "m.g." }\arpeggio~ \grace { cis8 - \slurBoth % Tweak + \revert Stem #'direction - \override Stem #'direction = #0 - - a16[-5( fis dis] + a16[-5_( fis dis] #(set-octavation 0) cis32[ a-1 fis-4 dis] cis[ a fis)-2] @@ -83,10 +74,8 @@ treble = \new Voice \notes\relative c''{ r8 8(\mf % \fingerUp - \override Fingering #'direction = #1 + \override Fingering #'direction = #UP - % Manual fix for collision with slur - \override Fingering #'extra-offset = #'(0 . 1) %tweak e)-1-4-5 r | %6 @@ -97,12 +86,11 @@ treble = \new Voice \notes\relative c''{ \bar "||" } -trebleTwo = \new Voice \notes\relative c''{ +trebleTwo = \new Voice \relative c''{ \stemDown \slurDown % \fingerDown - \override Fingering #'direction = #-1 - \override Fingering #'extra-offset = #'(0 . 1.2) + \override Fingering #'direction = #DOWN s2 | %1 s1*2 @@ -112,67 +100,56 @@ trebleTwo = \new Voice \notes\relative c''{ 2 | %5 s8 cis4. d4 - %%8[( - 8[( -3-1 + % fair to count as one tweak? + \override Fingering #'add-stem-support = ##t %tweak + \override Fingering #'padding = #0.15 + \override Fingering #'slur-padding = #0.1 + 8[( | %6 - %%)] cis4. d4 - )]-2-1 cis4. d4 + )] cis'4. d4 8[( | %7 )] } -bass = \new Voice \notes\relative c{ +bass = \new Voice \relative c{ \partial 2 \key a \major - % Allow ugly (highly blown-up) slurs - \override Slur #'beautiful = #5.0 %tweak - \override Slur #'attachment-offset = #'((0 . 3) . (0 . -4)) %tweak \slurDown - \dynamicUp r8. e,16(\f_2 8[ ] | %2 - \override Staff.SustainPedalLineSpanner #'staff-padding = #5 + \override Staff.SustainPedalLineSpanner #'staff-padding = #5 %tweak 4\sustainDown \change Staff=treble \stemDown - \override Slur #'attachment = #'(stem . stem) %tweak 4)\arpeggio - \revert Slur #'attachment %tweak \change Staff=bass - \stemBoth + \stemNeutral - \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 - \override Stem #'length = #5 %tweak +% \once \override Stem #'length = #6 %tweak 4\sustainDown \change Staff=treble - - \revert Stem #'length %tweak - \revert Stem #'direction - \override Stem #'direction = #-1 + + \stemNeutral + \stemDown )\arpeggio \change Staff=bass - \revert Stem #'direction + \stemNeutral r2 | %4 - \revert Slur #'beautiful %tweak - \revert Slur #'attachment-offset %tweak \stemDown 4 \clef treble - \stemBoth + \stemNeutral << %urg: staff-change: ! on dis \arpeggio @@ -196,10 +173,10 @@ bass = \new Voice \notes\relative c{ \slurUp % \fingerDown - \override Fingering #'direction = #-1 + \override Fingering #'direction = #DOWN - \override Staff.SustainPedalLineSpanner #'staff-padding = #3.5 + \override Staff.SustainPedalLineSpanner #'staff-padding = #3.5 %tweak \set Staff.pedalSustainStyle = #'mixed %%a,8 e'[-5(]) @@ -207,23 +184,21 @@ bass = \new Voice \notes\relative c{ a,8\sustainDown e'[-5(])-2-3 %%r b,-5 4 r b,-5\sustainUp\sustainDown 4-3-5 - \slurBoth - \once \override Fingering #'extra-offset = #'(0 . -1) %tweak + \slurNeutral e,8[-5(\sustainUp | %6 - \once \override Fingering #'extra-offset = #'(0 . -1) %tweak a)-2]\sustainDown \slurUp e'[()] r b,\sustainUp\sustainDown 4 - \slurBoth + \slurNeutral e,8[(\sustainUp | %7 a)] } -bassTwo = \new Voice \notes\relative c{ +bassTwo = \new Voice \relative c{ \skip 2 \skip 1*2 \skip 2 @@ -234,7 +209,7 @@ bassTwo = \new Voice \notes\relative c{ cis'4( bis) } -middleDynamics = \notes{ +middleDynamics = { \override Dynamics.TextScript #'padding = #-1 %tweak s2 s1*2 @@ -249,8 +224,9 @@ middleDynamics = \notes{ s32 s s s\! } - + \fatText s32 s-"rall." s s s8 s4 + \emptyText | %5 s2-"a tempo" s8 \once\override Dynamics.Hairpin #'extra-offset = #'(1 . 0) %tweak @@ -262,55 +238,59 @@ middleDynamics = \notes{ s8\! } - -\score{ +theScore = \score{ \context PianoStaff << - \context Staff=treble << + \new Staff = "treble" << \treble \trebleTwo >> \new Dynamics << \middleDynamics >> - \context Staff=bass << + \new Staff = "bass" << \clef bass \bass \bassTwo >> >> - \paper { + \layout { \context { - \ScoreContext + \Score pedalSustainStrings = #'("Ped." "*Ped." "*") \remove Bar_number_engraver } \context { - \type "Engraver_group_engraver" + \type "Engraver_group" \name Dynamics \consists "Output_property_engraver" - minimumVerticalExtent = #'(-1 . 1) + \override VerticalAxisGroup #'minimum-Y-extent = #'(-1 . 1) \consists "Script_engraver" \consists "Dynamic_engraver" \consists "Text_engraver" - \override TextScript #'font-size = #2 + %%\override TextScript #'font-size = #1 \override TextScript #'font-shape = #'italic \consists "Skip_event_swallow_translator" - \consistsend "Axis_group_engraver" + \consists "Axis_group_engraver" } \context { - \PianoStaffContext + \PianoStaff \accepts Dynamics \override VerticalAlignment #'forced-distance = #7 } } } - + +\book{ + \score { \theScore } +} + %%% Local variables: -%%% LilyPond-indent-level:4 +%%% coding: utf-8 +%%% LilyPond-indent-level:2 %%% End: -%% new-chords-done %% +