X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fles-nereides.ly;h=3d88381fc5a039ee1601667cf03bdb76a7f11d97;hb=8162d1bf9166b2ed784db6ae9280ba64a2812341;hp=d8ee23019ea9748ae83a6b87554b6c5207aee9a6;hpb=51159f8679de00e6cd526ca2a16e1ea4d4294f81;p=lilypond.git diff --git a/input/les-nereides.ly b/input/les-nereides.ly index d8ee23019e..3d88381fc5 100644 --- a/input/les-nereides.ly +++ b/input/les-nereides.ly @@ -1,9 +1,8 @@ -#(ly:set-option 'old-relative) -\version "2.3.4" -\encoding "latin1" +\version "2.12.0" + \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,11 +25,6 @@ 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 \relative c''{ \key a \major r2 @@ -43,32 +36,26 @@ treble = \new Voice \relative c''{ \change Staff=bass - \once\override TextScript #'extra-offset = #'(-3 . -4) %tweak - - cis,16^2(^\markup {\small \italic "m.d." }\sustainUp + cis,16^2(^\markup {\small \italic "m.d." }\sustainOff 8 | %4 - 4)\sustainDown + 4)\sustainOn \change Staff=treble \slurUp \set PianoStaff.connectArpeggios = ##t - #(set-octavation 1) + \ottava #1 - \once\override TextScript #'extra-offset = #'(-3 . -2) %tweak - \tieUp cis''''4^\markup { \small \italic "m.g." }\arpeggio~ \grace { cis8 - \slurBoth % Tweak + \revert Stem #'direction - \override Stem #'direction = #0 - - a16[-5( fis dis] - #(set-octavation 0) + a16[-5_( fis dis] + \ottava #0 cis32[ a-1 fis-4 dis] cis[ a fis)-2] % the small grace in lower staff comes after us @@ -83,10 +70,8 @@ treble = \new Voice \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 @@ -101,8 +86,7 @@ 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,11 +96,13 @@ trebleTwo = \new Voice \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 )] @@ -126,53 +112,40 @@ 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 + 4\sustainOn \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 + r8. cis,,16(\sustainOff 8 | %3 - \override Stem #'length = #5 %tweak - 4\sustainDown + + 4\sustainOn \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 @@ -186,7 +159,7 @@ bass = \new Voice \relative c{ s32 s s s s s \clef bass - 32(\sustainUp\sustainDown + 32(\sustainOff\sustainOn \revert Stem #'stroke-style } @@ -196,28 +169,26 @@ bass = \new Voice \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(]) - a,8\sustainDown e'[-5(])-2-3 + a,8\sustainOn 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 - e,8[-5(\sustainUp + r b,-5\sustainOff\sustainOn 4-3-5 + \slurNeutral + e,8[-5(\sustainOff | %6 - \once \override Fingering #'extra-offset = #'(0 . -1) %tweak - a)-2]\sustainDown + a)-2]\sustainOn \slurUp - e'[()] r b,\sustainUp\sustainDown 4 - \slurBoth - e,8[(\sustainUp + e'[()] r b,\sustainOff\sustainOn 4 + \slurNeutral + e,8[(\sustainOff | %7 a)] @@ -235,7 +206,7 @@ bassTwo = \new Voice \relative c{ } middleDynamics = { - \override Dynamics.TextScript #'padding = #-1 %tweak + %\override Dynamics.TextScript #'padding = #-1 %tweak s2 s1*2 | %4 @@ -244,16 +215,15 @@ middleDynamics = { s8 s16 s s s32 s - \once\override Dynamics.Hairpin #'extra-offset = #'(0 . 2) %tweak s\> s - s32 s s s\! + s32 s s\! s } - + \textLengthOn s32 s-"rall." s s s8 s4 + \textLengthOff | %5 s2-"a tempo" s8 - \once\override Dynamics.Hairpin #'extra-offset = #'(1 . 0) %tweak s \> s s | %6 s8\! @@ -264,47 +234,46 @@ middleDynamics = { 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 { \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 = #'(0 . 0) \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 { \PianoStaff \accepts Dynamics - \override VerticalAlignment #'forced-distance = #7 } } } @@ -314,6 +283,7 @@ theScore = \score{ } %%% Local variables: -%%% LilyPond-indent-level:4 +%%% coding: utf-8 +%%% LilyPond-indent-level:2 %%% End: -%% new-chords-done %% +