X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fles-nereides.ly;h=ea0943c7005c6d2b3e1af379f203168eb8c73148;hb=ce6e56a8510206bff0d329bb79b9c0211999636f;hp=59a1cc1a746463ab731cdf52cb1e734edd824201;hpb=98781dd292bb9bc43ca766adb85fb388b886a061;p=lilypond.git diff --git a/input/les-nereides.ly b/input/les-nereides.ly index 59a1cc1a74..ea0943c700 100644 --- a/input/les-nereides.ly +++ b/input/les-nereides.ly @@ -1,367 +1,296 @@ -%{ -cpp -P -traditional -o l.ly les-nereides.ly -cpp -P -traditional -o l-fake.ly -DFAKE_GRACE les-nereides.ly -%} - -\header{ - composer = "ARTHUR GRAY"; - title = "LES N\\'ER\\'EIDES"; - subtitle = "THE NEREIDS"; - enteredby = "JCN"; - piece = "Allegretto scherzando"; - copyright = "public domain"; - description = "Natiest piece of competition at http://www.orphee.com/comparison/study.html, see http://www.orphee.com/comparison/gray.pdf"; - comment = "LilyPond (1.3.93) can't really do this yet, I guess"; +\version "2.9.16" + +\header { + composer = "ARTHUR GRAY" + title = "LES NÉRÉIDES" + subtitle = "THE NEREIDS" + enteredby = "JCN" + piece = "Allegretto scherzando" + copyright = "public domain" } +%{ -%% cpp: don't start on first column - #(define (grace-beam-space-function multiplicity) - (* (if (<= multiplicity 3) 0.816 0.844) 0.8)) +Nastiest piece of competition at +http://www.orphee.com/comparison/study.html, see +http://www.orphee.com/comparison/gray.pdf -global = \notes{ - \partial 2; - \key a \major; - \skip 2; - \skip 1*2; +Lines that contain tweaks (10 currently, not counting reverts) are +marked with %tweak -#ifndef FAKE_GRACE - \skip 1; -#else % FAKE_GRACE - \skip 2.; \partial 32*24; - \skip 32*24; -#endif % FAKE_GRACE +possibly more impressive to render without tweaks? - \bar "||"; -} + grep -v tweak input/les-nereides.ly >> lnnt.ly + lilypond lnnt.ly + +%} -treble = \context Voice=treble \notes\relative c''{ - % Broken? - \property Voice.NoteColumn \push #'horizontal-shift = #0 +treble = \new Voice \relative c''{ + \key a \major r2 - %2 - \property Voice.Stem \pop #'direction - \property Voice.Stem \push #'direction = #1 - r4 r2 - %3 - r4 r8. - \translator Staff=bass - cis,16^2^"m.d."( - %4 - <)dis,4 a' dis> - \translator Staff=treble - \property Voice.Slur \pop #'direction - \property Voice.Slur \push #'direction = #1 - %% 8va - cis''''4^"m.g." ( - -#ifndef FAKE_GRACE - - \property Voice.Stem \pop #'direction - - % grace is a mess - % maybe we should fake this and put 5/4 in this bar? + | %2 + \stemUp + r4 \arpeggio r2 + | %3 + r4 \arpeggio r8. + + \change Staff=bass + + \once\override TextScript #'extra-offset = #'(-3 . -4) %tweak + + cis,16^2(^\markup {\small \italic "m.d." }\sustainUp + 8 + | %4 + 4)\sustainDown + + \change Staff=treble + + \slurUp + \set PianoStaff.connectArpeggios = ##t + + #(set-octavation 1) + \once\override TextScript #'extra-offset = #'(-3 . -2) %tweak + + \tieUp + cis''''4^\markup { \small \italic "m.g." }\arpeggio~ \grace { - )cis8 - \property Grace.Stem \pop #'direction - \property Grace.Stem \push #'direction = #0 - \property Grace.Beam \push #'space-function = #grace-beam-space-function - %urg, dim. during grace dumps core here - %%[a16-5( fis dis] [cis'32 a-1 fis-4 dis] [cis a )fis-2] - [a16-5( fis dis] [cis32 a-1 fis-4 dis] [cis a )fis-2] + cis8 + \revert Stem #'direction + + 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 } -#else % FAKE_GRACE - - \property Voice.NoteHead \push #'font-size = #-1 - \property Voice.Stem \push #'font-size = #-1 - \property Voice.Beam \push #'font-size = #-1 - \property Voice.TextScript \push #'font-size = #-1 - \property Voice.Slur \push #'font-size = #-1 - \property Voice.LocalKey \push #'font-size = #-1 - \property Voice.Beam \push #'space-function = #grace-beam-space-function - - )cis16 - \property Voice.Stem \pop #'direction - \property Voice.Stem \push #'direction = #0 - %%[a16^5( fis dis] [cis'32 a-1 fis-4 dis] [cis a )fis-2] s s s - [a16^5( fis dis] [cis32 a^1 fis^4 dis] [cis a )fis-2] s % s s - - \property Voice.NoteHead \pop #'font-size - \property Voice.Stem \pop #'font-size - \property Voice.Beam \pop #'font-size - \property Voice.TextScript \pop #'font-size - \property Voice.Slur \pop #'font-size - \property Voice.LocalKey \pop #'font-size - \property Voice.Beam \pop #'space-function - -#endif % FAKE_GRACE + + \stemUp + cis'4( bis) + + | %5 + r8 8(\mf + % \fingerUp + \override Fingering #'direction = #UP + + e)-1-4-5 r - \property Voice.Stem \pop #'direction - \property Voice.Stem \push #'direction = #1 - cis'4()bis - r8 - )e^" "^1^4^5 r| - r )e r| + | %6 + r 8(\mf + e) r + + | %7 + \bar "||" } -trebleTwo = \context Voice=trebleTwo \notes\relative c''{ - % Broken? - \property Voice.NoteColumn \push #'horizontal-shift = #1 +trebleTwo = \new Voice \relative c''{ + \stemDown + \slurDown + % \fingerDown + \override Fingering #'direction = #DOWN s2 + | %1 s1*2 + | %4 s4 - \property Voice.Stem \pop #'direction - \property Voice.Stem \push #'direction = #-1 - - -#ifdef FAKE_GRACE - s32*16 -#endif - - \property Voice.NoteColumn \push #'force-hshift = #-0.2 - - %r8 cis4. d4 [ | - r8 cis4. d4 - \property Voice.NoteColumn \pop #'force-hshift - [ | - \property Voice.NoteColumn \push #'force-hshift = #-0.2 - <)a-2 cis,-1>] cis4. d4 - \property Voice.NoteColumn \pop #'force-hshift - [ | - <)a cis,>] + 4\arpeggio + 2 + | %5 + s8 cis4. d4 + % 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{ - \property Voice.Slur \pop #'details - \property Voice.Slur \push #'details = -% #'((height-limit . 2.0) (ratio . 0.333) (force-blowfit . 0.5) (beautiful . 1.0)) - #'((height-limit . 6.0) (ratio . 0.333) (force-blowfit . 1.0) (beautiful . 0.1)) - \property Voice.Slur \pop #'de-uglify-parameters - \property Voice.Slur \push #'de-uglify-parameters = -% #'(1.5 0.8 -2.0) - #'(2.4 0.8 4.0) - \property Voice.Stem \pop #'direction - \property Voice.Slur \push #'direction = #-1 - % huh, auto-beamer? - r8. e,16-2( [ ] | - %2 - \translator Staff=treble - \property Voice.Stem \pop #'direction - \property Voice.Stem \push #'direction = #-1 - \property Voice.slurEndAttachment = #'stem - <)a''4 eis cis> - %\stemboth - \property Voice.slurEndAttachment = ##f - \translator Staff=bass - \property Voice.Stem \pop #'direction - \property Voice.Slur \pop #'y-free - \property Voice.Slur \push #'y-free = #0.1 - r8. cis,,16( - %3 - \property Voice.Stem \pop #'length - \property Voice.Stem \push #'length = #5 - - \translator Staff=treble - \property Voice.Stem \pop #'length - \property Voice.Stem \pop #'direction - \property Voice.Stem \push #'direction = #-1 - <)a' fis cis> - \translator Staff=bass - \property Voice.Stem \pop #'direction +bass = \new Voice \relative c{ + \partial 2 + \key a \major + + \slurDown + \dynamicUp + + r8. e,16(\f_2 8[ ] + | %2 + \override Staff.SustainPedalLineSpanner #'staff-padding = #5 %tweak + + 4\sustainDown + \change Staff=treble + \stemDown + 4)\arpeggio + + \change Staff=bass + \stemNeutral + + r8. cis,,16(\sustainUp 8 + + | %3 +% \once \override Stem #'length = #6 %tweak + 4\sustainDown + \change Staff=treble + + \stemNeutral + \stemDown + )\arpeggio + \change Staff=bass + \stemNeutral r2 - %4 - \property Voice.Slur \pop #'details - \property Voice.Slur \push #'details = - #'((height-limit . 2.0) (ratio . 0.333) (force-blowfit . 0.5) (beautiful . 0.5)) - \property Voice.Stem \pop #'direction - \property Voice.Stem \push #'direction = #-1 - - \clef treble; - \property Voice.Stem \pop #'direction - \property Voice.Stem \push #'direction = #0 - < + + | %4 + \stemDown + 4 + \clef treble + \stemNeutral + << %urg: staff-change: ! on dis - -% { s8. \clef bass;} - > - -#ifndef FAKE_GRACE - %Hmm - %\grace { s16 s s s s32 s s s s \clef bass; s } - \clef bass; -#else - s4 s8 s32 s s \clef bass; s -#endif - - \grace { } <)gis'2 e> - %5% - \property Voice.Slur \pop #'direction - \property Voice.Slur \push #'direction = #1 - a,8 [e'-5(<)a-2 cis-3>] - r b,-5 - \property Voice.Slur \pop #'direction - \property Voice.Slur \push #'direction = #0 - [e,8-5(| - %6 - )a-2] - \property Voice.Slur \pop #'direction - \property Voice.Slur \push #'direction = #1 - [e'(<)a cis>] r b, - \property Voice.Slur \pop #'direction - \property Voice.Slur \push #'direction = #0 - [e,8(| - %7 - )a] + \arpeggio + >> + + \grace { + \override Stem #'stroke-style = #"grace" + + s8 + s16 s s + s32 s s + s s s + \clef bass + 32(\sustainUp\sustainDown + + \revert Stem #'stroke-style + } + 2) + + | %5 + \slurUp + + % \fingerDown + \override Fingering #'direction = #DOWN + + + \override Staff.SustainPedalLineSpanner #'staff-padding = #3.5 %tweak + \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 + \slurNeutral + e,8[-5(\sustainUp + + | %6 + a)-2]\sustainDown + \slurUp + e'[()] r b,\sustainUp\sustainDown 4 + \slurNeutral + e,8[(\sustainUp + + | %7 + a)] } -bassTwo = \context Voice=bassTwo \notes\relative c{ - \skip 2; - \skip 1*2; - \skip 2; - -#ifdef FAKE_GRACE - \skip 32*16; -#endif +bassTwo = \new Voice \relative c{ + \skip 2 + \skip 1*2 + \skip 2 - \property Voice.Stem \pop #'direction - \property Voice.Stem \push #'direction = #1 - \property Voice.Slur \pop #'direction - \property Voice.Slur \push #'direction = #1 + \stemUp + \slurUp - cis'4()bis + cis'4( bis) } -middleDynamics = \context Dynamics=middle \notes{ - s8 s16 s\f s4 - s1*2 - %4 +middleDynamics = { + \override Dynamics.TextScript #'padding = #-1 %tweak s2 - -#ifdef FAKE_GRACE - s32*12 - s32\> s s \!s -#endif - - s32 s-"rall." s s - s8 s4 - - \outputproperty #(make-type-checker 'dynamic-interface) - #'extra-offset = #'(0 . 10) - s1\mf-"a tempo" - s8 s8\mf s4 s4 s8\> s32 s s \!s -} - -lowerDynamics = \context Dynamics=lower \notes{ + s1*2 + | %4 s2 - %2 - s2\sustaindown s8. s16\sustainup s4 - %3 - s2\sustaindown s8. s16\sustainup s4 - %3 - -#ifndef FAKE_GRACE - s4\sustaindown s16 - s32 s s\sustainup s - s32\sustaindown s s s - s8 -#else - s2\sustaindown - s32*12 - s32 s s\sustainup s - s32\sustaindown s s s -#endif - - \property Dynamics.stopSustain = #"" - s4 s16. s32\sustainup - - %5 - s8\sustaindown s s - \property Dynamics.stopSustain = #"*" - \property Dynamics.stopStartSustain = #"-P" - s s\sustainup\sustaindown s s - s\sustainup - - %6 - \property Dynamics.stopStartSustain = #"" - s8\sustaindown s s - \property Dynamics.stopStartSustain = #"-P" - s s\sustainup\sustaindown s s - s\sustainup + \grace { + s8 + s16 s s + s32 s + \once\override Dynamics.Hairpin #'extra-offset = #'(0 . 2) %tweak + s\> s + 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 + s \> s s + | %6 + s8\! + s2 s8 s\> s + | %7 + s8\! } -\score{ - \context PianoStaff < - \context Staff=treble < - \global +theScore = \score{ + \context PianoStaff << + \new Staff = "treble" << \treble \trebleTwo - > - %\context Dynamics=middle < - % \global - % \middleDynamics - %> - \middleDynamics - \context Staff=bass < - \clef bass; - \global + >> + \new Dynamics << + \middleDynamics + >> + \new Staff = "bass" << + \clef bass \bass \bassTwo - > - \context Dynamics=lower < - \global - \lowerDynamics - > - > - \paper { - \translator { - \ScoreContext - TimeSignature \push #'style = #"C" + >> + >> + \layout { + \context { + \Score + pedalSustainStrings = #'("Ped." "*Ped." "*") + \remove Bar_number_engraver } - \translator { - \type "Engraver_group_engraver"; - \name Dynamics; - \consists "Output_property_engraver"; - Generic_property_list = #generic-voice-properties - %Generic_property_list = #generic-lyrics-properties - \consists "Property_engraver"; - DynamicsMinimumVerticalExtent = #(cons -3 -3) - VerticalAlignment \push #'threshold = #'(8 . 8) - - startSustain = #"Ped." - stopSustain = #"*" - stopStartSustain = #"*Ped." - startUnaChorda = #"una chorda" - stopUnaChorda = #"tre chorde" - % should make separate lists for stopsustain and startsustain - - \consists "Piano_pedal_engraver"; - \consists "Script_engraver"; - \consists "Dynamic_engraver"; - \consists "Text_engraver"; - %GURGURGU, text is initialised using TextScript - TextScript \push #'style = #"italic" - TextScript \push #'font-size = #2 + \context { + \type "Engraver_group" + \name Dynamics + \consists "Output_property_engraver" + \override VerticalAxisGroup #'minimum-Y-extent = #'(-1 . 1) + + \consists "Script_engraver" + \consists "Dynamic_engraver" + \consists "Text_engraver" - \consists "Skip_req_swallow_translator"; + %%\override TextScript #'font-size = #1 + \override TextScript #'font-shape = #'italic - \consistsend "Axis_group_engraver"; + \consists "Skip_event_swallow_translator" + + \consists "Axis_group_engraver" } - \translator { - \VoiceContext - TextScript \push #'style = #"italic" - } - \translator { - \PianoStaffContext - \accepts Dynamics; - VerticalAlignment \push #'threshold = #'(8 . 8) - } - \translator { - \GraceContext - Stem \push #'flag-style = #"" + \context { + \PianoStaff + \accepts Dynamics + \override VerticalAlignment #'forced-distance = #7 } } } + +\book{ + \score { \theScore } +} + +%%% Local variables: +%%% coding: utf-8 +%%% LilyPond-indent-level:2 +%%% End: +