X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fles-nereides.ly;h=3d88381fc5a039ee1601667cf03bdb76a7f11d97;hb=9e6f16dddf9e21b29eed1717efe4bac6c20774ba;hp=b40514c0a6a9f77b0ac0f7dcc80fbc94bff6730a;hpb=3f213f4f1df4101287534a6669fc29edd022aec0;p=lilypond.git diff --git a/input/les-nereides.ly b/input/les-nereides.ly index b40514c0a6..3d88381fc5 100644 --- a/input/les-nereides.ly +++ b/input/les-nereides.ly @@ -1,12 +1,12 @@ -\version "1.7.18" +\version "2.12.0" \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" } %{ @@ -15,147 +15,186 @@ Nastiest piece of competition at http://www.orphee.com/comparison/study.html, see http://www.orphee.com/comparison/gray.pdf -%} +Lines that contain tweaks (10 currently, not counting reverts) are +marked with %tweak + +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)))) + grep -v tweak input/les-nereides.ly >> lnnt.ly + lilypond lnnt.ly +%} -treble = \context Voice=treble \notes\relative c''{ +treble = \new Voice \relative c''{ \key a \major r2 - %2 + | %2 \stemUp - r4 <>-\arpeggio r2 - %3 - r4 <>-\arpeggio r8. - - \translator Staff=bass - - \once\property Voice.TextScript \set #'extra-offset = #'(-3 . -4) - - % currently, this can't be (small italic,-) because in the paperblock - % we set italic_magnifictation to get large italics. - cis,16^2^"m.d."( <>8 <> - %4 - <>4-) + r4 \arpeggio r2 + | %3 + r4 \arpeggio r8. + + \change Staff=bass + + cis,16^2(^\markup {\small \italic "m.d." }\sustainOff + 8 + | %4 + 4)\sustainOn - \translator Staff=treble + \change Staff=treble - \slurUp - \property PianoStaff.connectArpeggios = ##t + \slurUp + \set PianoStaff.connectArpeggios = ##t - #(set-octavation 1) + \ottava #1 - \once\property Voice.TextScript \set #'extra-offset = #'(-3 . -2) - \tieUp - cis''''4^\markup { \small \italic "m.g." }-\arpeggio-~ + cis''''4^\markup { \small \italic "m.g." }\arpeggio~ \grace { - cis8 - \stemBoth - a16-[-5( fis dis-] - #(set-octavation 0) + cis8 + \revert Stem #'direction - cis32-[ a-1 fis-4 dis] cis-[ a fis-)-2] + 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 + s32 } + \stemUp - cis'4( bis-) - r8 - <>8-( <> <> <> <> e-)^" "^1^4^5 r| - r <>8-( <> <> <> <> e-) r| + cis'4( bis) - \bar "||" + | %5 + r8 8(\mf + + % \fingerUp + \override Fingering #'direction = #UP + + e)-1-4-5 r + | %6 + r 8(\mf + e) r + + | %7 + \bar "||" } -trebleTwo = \context Voice=trebleTwo \notes\relative c''{ +trebleTwo = \new Voice \relative c''{ + \stemDown + \slurDown + % \fingerDown + \override Fingering #'direction = #DOWN s2 + | %1 s1*2 + | %4 s4 - \stemDown - <>4-\arpeggio - - <>2 + 4\arpeggio + 2 + | %5 s8 cis4. d4 - <>8-[-( <> | - <>-)] cis4. d4 - <>8-[-( <> | - <>-)] + % 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 + )] cis'4. d4 + 8[( + | %7 + )] } -bass = \context Voice=bass \notes\relative c{ - % Allow ugly slurs +bass = \new Voice \relative c{ \partial 2 \key a \major - \property Voice.Slur \override #'beautiful = #5.0 - \property Voice.Slur \override #'attachment-offset = #'((0 . 3) . (0 . -4)) \slurDown - r8. e,16_2( <>8-[ <>] | - %2 - <>4 - \translator Staff=treble + \dynamicUp + + r8. e,16(\f_2 8[ ] + | %2 + %\override Staff.SustainPedalLineSpanner #'staff-padding = #5 %tweak + + 4\sustainOn + \change Staff=treble \stemDown - \property Voice.Slur \override #'attachment = #'(stem . stem) - <>4-)-\arpeggio - %\stemBoth - \property Voice.Slur \revert #'attachment - \translator Staff=bass - \stemBoth - \property Voice.Slur \revert #'y-free - \property Voice.Slur \override #'y-free = #0.1 - \property Voice.Slur \revert #'attachment-offset - \property Voice.Slur \override #'attachment-offset = #'((0 . 3) . (0 . 8)) - r8. cis,,16( <>8 <> - %3 - \property Voice.Stem \set #'length = #5 - <>4 - \translator Staff=treble - - \property Voice.Stem \revert #'length - \property Voice.Stem \revert #'direction - \property Voice.Stem \override #'direction = #-1 - <>-)-\arpeggio - \translator Staff=bass - \property Voice.Stem \revert #'direction + 4)\arpeggio + + \change Staff=bass + \stemNeutral + + r8. cis,,16(\sustainOff 8 + + | %3 + + 4\sustainOn + \change Staff=treble + + \stemNeutral + \stemDown + )\arpeggio + \change Staff=bass + \stemNeutral r2 - %4 - \property Voice.Slur \revert #'beautiful - \property Voice.Slur \revert #'attachment-offset + + | %4 \stemDown - <>4 + 4 \clef treble - \stemBoth - < + \stemNeutral + << %urg: staff-change: ! on dis - <>-\arpeggio -% { s8. \clef bass} - > - - %Hmm - %\grace { s16 s s s s32 s s s s \clef bass s } - \clef bass - \grace { <>32-( } <>2-) - %5 + \arpeggio + >> + + \grace { + \override Stem #'stroke-style = #"grace" + + s8 + s16 s s + s32 s s + s s s + \clef bass + 32(\sustainOff\sustainOn + + \revert Stem #'stroke-style + } + 2) + + | %5 \slurUp - a,8 e'-[-5(<>-)] - r b,-5 <>4 - \slurBoth - e,8-[-5(| - %6 - a-)-2] + + % \fingerDown + \override Fingering #'direction = #DOWN + + + %\override Staff.SustainPedalLineSpanner #'staff-padding = #3.5 %tweak + \set Staff.pedalSustainStyle = #'mixed + %%a,8 e'[-5(]) + + + a,8\sustainOn e'[-5(])-2-3 + %%r b,-5 4 + r b,-5\sustainOff\sustainOn 4-3-5 + \slurNeutral + e,8[-5(\sustainOff + + | %6 + a)-2]\sustainOn \slurUp - e'-[(<>-)] r b, <>4 - \slurBoth - e,8-[(| - %7 - a-)] + e'[()] r b,\sustainOff\sustainOn 4 + \slurNeutral + e,8[(\sustainOff + + | %7 + a)] } -bassTwo = \context Voice=bassTwo \notes\relative c{ +bassTwo = \new Voice \relative c{ \skip 2 \skip 1*2 \skip 2 @@ -163,112 +202,88 @@ bassTwo = \context Voice=bassTwo \notes\relative c{ \stemUp \slurUp - cis'4( bis-) + cis'4( bis) } -middleDynamics = \context Dynamics=middle \notes{ - s8 s16 s-\f s4 +middleDynamics = { + %\override Dynamics.TextScript #'padding = #-1 %tweak + s2 s1*2 - %4 + | %4 s2 - - s32 - \once \property Dynamics.TextScript \set #'extra-offset = #'(0 . 1.5) - s-"rall." s s - s8 s4 + \grace { + s8 + s16 s s + s32 s + s\> s + s32 s s\! s - %s1-\mf-"a tempo" - s2-\mf-"a tempo" s8 -%% s\> s8-\! - s16 s32 s64 \> s s8 s s8-\! -%% s8-\mf s4 s4 s8\> s32 s s s-\! - s8-\mf s4 s8 s16 s32 s64 \> s s16 s8 s32 s s s s128-\! -} - -lowerDynamics = \context Dynamics=lower \notes{ - s2 - %2 - s2-\sustainDown s8. s16-\sustainUp s4 - %3 - s2-\sustainDown s8. s16-\sustainUp s4 - %3 - - s4-\sustainDown s16 - s32 s s-\sustainUp s - s32-\sustainDown s s s - s8 - - \property Dynamics.pedalSustainStrings = #'("Ped." "*Ped." "") - s4 s16. s32--\sustainUp - - %5 - s8-\sustainDown s s - \property Dynamics.pedalSustainStrings = #'("Ped." "-P" "*") - s s-\sustainUp-\sustainDown s s - s-\sustainUp - - %6 - \property Dynamics.pedalSustainStrings = #'("Ped." "*Ped." "") - s8-\sustainDown s s - \property Dynamics.pedalSustainStrings = #'("Ped." "-P" "*") - s s-\sustainUp-\sustainDown s s - s-\sustainUp + } + \textLengthOn + s32 s-"rall." s s s8 s4 + \textLengthOff + | %5 + s2-"a tempo" s8 + s \> s s + | %6 + s8\! + s2 s8 s\> s + | %7 + s8\! } -\score{ - \context PianoStaff < - \context Staff=treble < +theScore = \score{ + \context PianoStaff << + \new Staff = "treble" << \treble \trebleTwo - > - \context Dynamics=middle < + >> + \new Dynamics << \middleDynamics - > - \context Staff=bass < + >> + \new Staff = "bass" << \clef bass \bass \bassTwo - > - \context Dynamics=lower < - \lowerDynamics - > - > - \paper { - \translator { - \ScoreContext + >> + >> + \layout { + \context { + \Score + pedalSustainStrings = #'("Ped." "*Ped." "*") \remove Bar_number_engraver } - \translator { - \type "Engraver_group_engraver" + \context { + \type "Engraver_group" \name Dynamics \consists "Output_property_engraver" - minimumVerticalExtent = #'(-1 . 1) + \override VerticalAxisGroup #'minimum-Y-extent = #'(0 . 0) - pedalSustainStrings = #'("Ped." "*Ped." "*") - pedalUnaCordaStrings = #'("una corda" "" "tre corde") - - \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 = #1 + \override TextScript #'font-shape = #'italic \consists "Skip_event_swallow_translator" - \consistsend "Axis_group_engraver" + \consists "Axis_group_engraver" } - \translator { - \PianoStaffContext + \context { + \PianoStaff \accepts Dynamics - VerticalAlignment \override #'forced-distance = #7 } } } - + +\book{ + \score { \theScore } +} + %%% Local variables: -%%% LilyPond-indent-level:4 +%%% coding: utf-8 +%%% LilyPond-indent-level:2 %%% End: -%% new-chords-done %% +