+#(ly:set-option 'old-relative)
+\version "2.1.1"
+
+\header {
+ composer = "ARTHUR GRAY"
+ title = "LES N\\'ER\\'EIDES"
+ subtitle = "THE NEREIDS"
+ enteredby = "JCN"
+ piece = "Allegretto scherzando"
+ copyright = "public domain"
+}
+
%{
-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";
-}
+Nastiest piece of competition at
+http://www.orphee.com/comparison/study.html, see
+http://www.orphee.com/comparison/gray.pdf
-%% cpp: don't start on first column
- #(define (grace-beam-space-function multiplicity)
- (* (if (<= multiplicity 3) 0.816 0.844) 0.8))
+lines that contain tweaks (17 currently, not counting reverts) are
+marked with %tweak
-global = \notes{
- \partial 2;
- \key a \major;
- \skip 2;
- \skip 1*2;
+possibly more impressive to render without tweaks?
-#ifndef FAKE_GRACE
- \skip 1;
-#else % FAKE_GRACE
- \skip 2.; \partial 32*24;
- \skip 32*24;
-#endif % FAKE_GRACE
+ grep -v tweak input/les-nereides.ly >> lnnt.ly
+ lilypond lnnt.ly
+
+%}
+
+#(ly:set-point-and-click 'line-column)
+#(define (make-text-checker text)
+ (lambda (elt) (equal? text (ly:get-grob-property elt 'text))))
- \bar "||";
-}
-treble = \context Voice=treble \notes\relative c''{
- % Broken?
- \property Voice.NoteColumn \push #'horizontal-shift = #0
- \outputproperty #(make-type-checker 'text-item-interface)
- #'extra-offset = #'(-6 . 2)
- r2^"Allegretto scherzando"
- %2
- \property Voice.Stem \pop #'direction
- \property Voice.Stem \push #'direction = #1
- r4 <cis\arpeggio eis a cis> r2
- %3
- r4 <cis\arpeggio fis a cis> r8.
+treble = \new Voice \notes\relative c''{
+ \key a \major
+ r2
+ | %2
+ \stemUp
+ r4 <cis eis a cis>\arpeggio r2
+ | %3
+ r4 <cis fis a cis>\arpeggio r8.
+
\translator Staff=bass
- cis,16^2^"m.d."( <fis8 fis,> <e! e,!>
- %4
- <)dis,4 a' dis>
+
+ \once\property Voice.TextScript \set #'extra-offset = #'(-3 . -4) %tweak
+
+ cis,16^2(^\markup {\small \italic "m.d." }
+ <fis fis,>8 <e! e,!>
+ | %4
+ <dis, a' dis>4)
+
\translator Staff=treble
- \property Voice.Slur \pop #'direction
- \property Voice.Slur \push #'direction = #1
+
+ \slurUp
\property PianoStaff.connectArpeggios = ##t
- \property Voice.TextSpanner \pop #'type
- \property Voice.TextSpanner \push #'type = #"dotted-line"
- \property Voice.TextSpanner \push #'edge-height = #'(0 . 1.5)
- \property Voice.TextSpanner \push #'edge-text = #'("8va " . "")
- \property Staff."c0-position" = #-13
- cis''''4^"m.g."\arpeggio \spanrequest \start "text" (
-
-#ifndef FAKE_GRACE
- \property Voice.Stem \pop #'direction
-
- % grace is a mess
- % maybe we should fake this and put 5/4 in this bar?
+ #(set-octavation 1)
+ \once\property Voice.TextScript \set #'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 \spanrequest \stop "text" ]
- %% [cis'32 a-1 fis-4 dis] [cis a )fis-2]
- [a16-5( fis dis \spanrequest \stop "text" ]
- \property Staff."c0-position" = #-6
- [cis32 a-1 fis-4 dis] [cis a )fis-2]
+ \property Voice.Stem \override #'stroke-style = #"grace"
+
+ cis8
+
+ %\stemBoth Hmm
+
+ \property Voice.Stem \set #'direction = #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
+
+ \property Voice.Stem \revert #'stroke-style
}
-#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 \spanrequest \stop "text" ]
- %% [cis'32 a-1 fis-4 dis] [cis a )fis-2] s s s
- [a16^5( fis dis \spanrequest \stop "text" ]
- \property Staff."c0-position" = #-6
- [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 <a' a,>8(\mf <gis gis,> <fis fis,>
+
+ % \fingerUp
+ \property Voice.Fingering \set #'direction = #1
+ % Manual fix for collision with slur
+ \property Voice.Fingering \set #'extra-offset = #'(0 . 1) %tweak
+ <gis gis,> <fis fis,> e)-1-4-5 r
- \property Voice.Stem \pop #'direction
- \property Voice.Stem \push #'direction = #1
- cis'4()bis
- r8
- <a'8( a,> <gis gis,> <fis fis,> <gis gis,> <fis fis,> )e^" "^1^4^5 r|
- r<a8( a,> <gis gis,> <fis fis,> <gis gis,> <fis fis,> )e r|
+ | %6
+ r <a a,>8(\mf <gis gis,> <fis fis,>
+ <gis gis,> <fis fis,> e) r
+
+ | %7
+ \bar "||"
}
-trebleTwo = \context Voice=trebleTwo \notes\relative c''{
- % Broken?
- \property Voice.NoteColumn \push #'horizontal-shift = #1
+trebleTwo = \new Voice \notes\relative c''{
+ \stemDown
+ \slurDown
+ % \fingerDown
+ \property Voice.Fingering \set #'direction = #-1
+ \property Voice.Fingering \set #'extra-offset = #'(0 . 1.2)
s2
+ | %1
s1*2
+ | %4
s4
- \property Voice.Stem \pop #'direction
- \property Voice.Stem \push #'direction = #-1
- <cis4\arpeggio a fis dis>
-
-#ifdef FAKE_GRACE
- s32*16
-#endif
-
- \property Voice.NoteColumn \push #'force-hshift = #-0.2
- <e2 gis, e d>
- %r8 cis4. d4 [<cis8-5-4( e,-1> <b-3 d,-1> |
- r8 cis4. d4
- \property Voice.NoteColumn \pop #'force-hshift
- [<cis8( e,> <b-3 d,-1> |
- \property Voice.NoteColumn \push #'force-hshift = #-0.2
- <)a-2 cis,-1>] cis4. d4
- \property Voice.NoteColumn \pop #'force-hshift
- [<cis8( e,> <b d,> |
- <)a cis,>]
+ <cis' a fis dis>4\arpeggio
+ <e, gis, e d!>2
+ | %5
+ s8 cis4. d4
+ %%<cis e,>8[( <b-3 d,-1>
+ <cis e,>8[( <b d,>-3-1
+ | %6
+ %%<a-2 cis,-1>)] cis4. d4
+ <a cis,>)]-2-1 cis4. d4
+ <cis e,>8[( <b d,>
+ | %7
+ <a cis,>)]
}
-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( [<a8 a,> <b b,>] <cis4 cis,> |
- %2
+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
+ \slurDown
+
+ \dynamicUp
+
+ r8. e,16(\f_2 <a a,>8[ <b b,>]
+ | %2
+ <cis cis,>4
\translator Staff=treble
- \property Voice.Stem \pop #'direction
- \property Voice.Stem \push #'direction = #-1
- \property Voice.slurEndAttachment = #'stem
- <)a''4\arpeggio eis cis>
- %\stemboth
- \property Voice.slurEndAttachment = ##f
+ \stemDown
+ \property Voice.Slur \override #'attachment = #'(stem . stem) %tweak
+ <a'' eis cis>4)\arpeggio
+
+ \property Voice.Slur \revert #'attachment %tweak
\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( <fis8 fis,> <gis gis,>
- %3
- \property Voice.Stem \pop #'length
- \property Voice.Stem \push #'length = #5
- <a4 a,>
+ \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( <fis fis,>8 <gis gis,>
+
+ | %3
+ \property Voice.Stem \set #'length = #5 %tweak
+ <a a,>4
\translator Staff=treble
- \property Voice.Stem \pop #'length
- \property Voice.Stem \pop #'direction
- \property Voice.Stem \push #'direction = #-1
- <)a'\arpeggio fis cis>
+
+ \property Voice.Stem \revert #'length %tweak
+ \property Voice.Stem \revert #'direction
+ \property Voice.Stem \override #'direction = #-1
+ <a' fis cis>)\arpeggio
\translator Staff=bass
- \property Voice.Stem \pop #'direction
+ \property Voice.Stem \revert #'direction
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
- <b,,4 b,>
- \clef treble;
- \property Voice.Stem \pop #'direction
- \property Voice.Stem \push #'direction = #0
- <
+
+ | %4
+ \property Voice.Slur \revert #'beautiful %tweak
+ \property Voice.Slur \revert #'attachment-offset %tweak
+ \stemDown
+ <b,, b,>4
+ \clef treble
+ \stemBoth
+ <<
%urg: staff-change: ! on dis
- <cis''\arpeggio a fis 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 { <e,,,32( e,> } <)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 <e4-3 gis-5 d'>
- \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, <e4 gis d'>
- \property Voice.Slur \pop #'direction
- \property Voice.Slur \push #'direction = #0
- [e,8(|
- %7
- )a]
+ <cis'' a fis dis!>\arpeggio
+ >>
+
+ \grace {
+ \property Voice.Stem \override #'stroke-style = #"grace"
+
+ s8
+ s16 s s
+ s32 s s
+ s s s
+ \clef bass
+ <e,,, e,>32(
+
+ \property Voice.Stem \revert #'stroke-style
+ }
+ <gis' e>2)
+
+ | %5
+ \slurUp
+
+ % \fingerDown
+ \property Voice.Fingering \set #'direction = #-1
+
+ %%a,8 e'[-5(<a-2 cis-3>])
+ a,8 e'[-5(<a cis>])-2-3
+ %%r b,-5 <e-3 gis-5 d'>4
+ r b,-5 <e gis d'>4-3-5
+ \slurBoth
+ \once \property Voice.Fingering \set #'extra-offset = #'(0 . -1) %tweak
+ e,8[-5(
+
+ | %6
+ \once \property Voice.Fingering \set #'extra-offset = #'(0 . -1) %tweak
+ a)-2]
+ \slurUp
+ e'[(<a cis>)] r b, <e gis d'>4
+ \slurBoth
+ e,8[(
+
+ | %7
+ a)]
}
-bassTwo = \context Voice=bassTwo \notes\relative c{
- \skip 2;
- \skip 1*2;
- \skip 2;
+bassTwo = \new Voice \notes\relative c{
+ \skip 2
+ \skip 1*2
+ \skip 2
-#ifdef FAKE_GRACE
- \skip 32*16;
-#endif
+ \stemUp
+ \slurUp
- \property Voice.Stem \pop #'direction
- \property Voice.Stem \push #'direction = #1
- \property Voice.Slur \pop #'direction
- \property Voice.Slur \push #'direction = #1
-
- cis'4()bis
+ cis'4( bis)
}
-middleDynamics = \context Dynamics=middle \notes{
- s8 s16 s\f s4
+middleDynamics = \notes{
+ \property Dynamics.TextScript \set #'padding = #-1 %tweak
+ s2
s1*2
- %4
+ | %4
s2
-
-#ifdef FAKE_GRACE
- s32*12
- \outputproperty #(make-type-checker 'dynamic-interface)
- #'extra-offset = #'(0 . 1.5)
- s32\> s s \!s
-#endif
- s32
- \outputproperty #(make-type-checker 'text-item-interface)
- #'extra-offset = #'(0 . 1.5)
- s-"rall." s s
- s8 s4
-
- \outputproperty #(make-type-checker 'dynamic-interface)
- #'extra-offset = #'(0 . 3.5)
- s1\mf-"a tempo"
- s8
- \outputproperty #(make-type-checker 'dynamic-interface)
- #'extra-offset = #'(-1 . 3.5)
- s8\mf s4 s4 s8\> s32 s s \!s
+ \grace {
+ \property Voice.Stem \override #'stroke-style = #"grace"
+
+ s8
+ s16 s s
+ s32 s
+ \once\property Dynamics.Hairpin \set #'extra-offset = #'(0 . 2) %tweak
+ s\> s
+ s32 s s s\!
+
+ \property Voice.Stem \revert #'stroke-style }
+
+ s32 s-"rall." s s s8 s4
+ | %5
+ s2-"a tempo" s8
+ \once\property Dynamics.Hairpin \set #'extra-offset = #'(1 . 0) %tweak
+ s \> s s
+ | %6
+ s8\!
+ s2 s8 s\> s
+ | %7
+ s8\!
}
-lowerDynamics = \context Dynamics=lower \notes{
+lowerDynamics = \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 {
+ \property Voice.Stem \override #'stroke-style = #"grace"
+
+ s8
+ s16 s s
+ s32 s s s\sustainUp
+ s32 s s s\sustainDown
+
+ \property Voice.Stem \revert #'stroke-style }
+
+%}
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
+
+ | %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
+ | %7
}
\score{
- \context PianoStaff <
- \context Staff=treble <
- \global
+ \context PianoStaff <<
+ \context Staff=treble <<
\treble
\trebleTwo
- >
- \context Dynamics=middle <
- \global
+ >>
+ \new Dynamics <<
\middleDynamics
- >
- \context Staff=bass <
- \clef bass;
- \global
+ >>
+ \context Staff=bass <<
+ \clef bass
\bass
\bassTwo
- >
- \context Dynamics=lower <
- \global
+ >>
+ \new Dynamics <<
\lowerDynamics
- >
- >
+ >>
+ >>
\paper {
\translator {
\ScoreContext
- TimeSignature \push #'style = #"C"
+ \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)
- %VerticalAlignment \push #'threshold = #'(10 . 10)
- VerticalAlignment \push #'threshold = #'(9 . 9)
-
- startSustain = #"Ped."
- stopSustain = #"*"
- stopStartSustain = #"*Ped."
- startUnaChorda = #"una chorda"
- stopUnaChorda = #"tre chorde"
- % should make separate lists for stopsustain and startsustain
+ \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";
- %GURGURGU, text is initialised using TextScript
- TextScript \push #'style = #"italic"
- TextScript \push #'font-size = #2
+ \consists "Piano_pedal_engraver"
+ \consists "Script_engraver"
+ \consists "Dynamic_engraver"
+ \consists "Text_engraver"
+
+ TextScript \override #'font-size = #2
+ TextScript \override #'font-shape = #'italic
- \consists "Skip_req_swallow_translator";
+ \consists "Skip_event_swallow_translator"
- \consistsend "Axis_group_engraver";
+ \consistsend "Axis_group_engraver"
}
- \translator {
- \VoiceContext
- %TextScript \push #'style = #"italic"
- %TextScript \push #'font-size = #3
- TextScript \push #'size = #"Large"
- TextScript \push #'font-size = #"Large"
- }
\translator {
\PianoStaffContext
- \accepts Dynamics;
- %VerticalAlignment \push #'threshold = #'(8 . 8)
- %VerticalAlignment \push #'threshold = #'(6 . 6)
- VerticalAlignment \push #'threshold = #'(7 . 7)
- }
- \translator {
- \GraceContext
- Stem \push #'flag-style = #""
+ \accepts Dynamics
+ VerticalAlignment \override #'forced-distance = #7
}
}
}
+
+%%% Local variables:
+%%% LilyPond-indent-level:4
+%%% End:
+%% new-chords-done %%
projects / lilypond.git / blobdiff