-\version "1.7.18"
+#(ly:set-option 'old-relative)
+\version "2.1.1"
\header {
composer = "ARTHUR GRAY"
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
+marked with %tweak
+
+possibly more impressive to render without tweaks?
+
+ grep -v tweak input/les-nereides.ly >> lnnt.ly
+ lilypond lnnt.ly
+
%}
#(ly:set-point-and-click 'line-column)
(lambda (elt) (equal? text (ly:get-grob-property elt 'text))))
-treble = \context Voice=treble \notes\relative c''{
+treble = \new Voice \notes\relative c''{
\key a \major
r2
| %2
\stemUp
- r4 <<cis eis a cis>>-\arpeggio r2
+ r4 <cis eis a cis>\arpeggio r2
| %3
- r4 <<cis fis a cis>>-\arpeggio r8.
+ r4 <cis fis a cis>\arpeggio r8.
\translator Staff=bass
- \once\property Voice.TextScript \set #'extra-offset = #'(-3 . -4)
+ \once\property Voice.TextScript \set #'extra-offset = #'(-3 . -4) %tweak
- % currently, this can't be (small italic,-) because in the paperblock
- % we set italic_magnifictation to get large italics.
- cis,16^2^"m.d."( <<fis fis,>>8 <<e! e,!>>
+ cis,16^2(^\markup {\small \italic "m.d." }
+ <fis fis,>8 <e! e,!>
| %4
- <<dis, a' dis>>4-)
+ <dis, a' dis>4)
\translator Staff=treble
#(set-octavation 1)
- \once\property Voice.TextScript \set #'extra-offset = #'(-3 . -2)
+ \once\property Voice.TextScript \set #'extra-offset = #'(-3 . -2) %tweak
\tieUp
- cis''''4^\markup { \small \italic "m.g." }-\arpeggio-~
+ cis''''4^\markup { \small \italic "m.g." }\arpeggio~
\grace {
+ \property Voice.Stem \override #'stroke-style = #"grace"
+
cis8
%\stemBoth Hmm
+
\property Voice.Stem \set #'direction = #0
- a16-[-5( fis dis-]
+ a16[-5( fis dis]
#(set-octavation 0)
- cis32-[ a-1 fis-4 dis] cis-[ a fis-)-2]
+ 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
}
+
\stemUp
- cis'4( bis-)
+ cis'4( bis)
| %5
- r8 <<a' a,>>8-(-\mf <<gis gis,>> <<fis fis,>>
+ r8 <a' a,>8(\mf <gis gis,> <fis fis,>
% \fingerUp
\property Voice.Fingering \set #'direction = #1
% Manual fix for collision with slur
- % padding \once does not work??
- \once \property Voice.Fingering \set #'padding = #1
- <<gis gis,>> <<fis fis,>> e-)-1-4-5 r
+ \property Voice.Fingering \set #'extra-offset = #'(0 . 1) %tweak
+ <gis gis,> <fis fis,> e)-1-4-5 r
| %6
- r <<a a,>>8-(-\mf <<gis gis,>> <<fis fis,>>
- <<gis gis,>> <<fis fis,>> e-) r
+ r <a a,>8(\mf <gis gis,> <fis fis,>
+ <gis gis,> <fis fis,> e) r
| %7
\bar "||"
}
-trebleTwo = \context Voice=trebleTwo \notes\relative c''{
+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
- <<cis' a fis dis>>4-\arpeggio
- <<e, gis, e d!>>2
+ <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-3 d,-1>
+ <cis e,>8[( <b d,>-3-1
| %6
- <<a-2 cis,-1>>-)] cis4. d4
- <<cis e,>>8-[-( <<b d,>>
+ %%<a-2 cis,-1>)] cis4. d4
+ <a cis,>)]-2-1 cis4. d4
+ <cis e,>8[( <b d,>
| %7
- <<a cis,>>-)]
+ <a cis,>)]
}
-bass = \context Voice=bass \notes\relative c{
+bass = \new Voice \notes\relative c{
\partial 2
\key a \major
% Allow ugly (highly blown-up) slurs
- \property Voice.Slur \override #'beautiful = #5.0
- \property Voice.Slur \override #'attachment-offset = #'((0 . 3) . (0 . -4))
+ \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,>>]
+ r8. e,16(\f_2 <a a,>8[ <b b,>]
| %2
- <<cis cis,>>4
+ <cis cis,>4
\translator Staff=treble
\stemDown
- \property Voice.Slur \override #'attachment = #'(stem . stem)
- <<a'' eis cis>>4-)-\arpeggio
+ \property Voice.Slur \override #'attachment = #'(stem . stem) %tweak
+ <a'' eis cis>4)\arpeggio
- \property Voice.Slur \revert #'attachment
+ \property Voice.Slur \revert #'attachment %tweak
\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( <<fis fis,>>8 <<gis gis,>>
+ \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
- <<a a,>>4
+ \property Voice.Stem \set #'length = #5 %tweak
+ <a a,>4
\translator Staff=treble
- \property Voice.Stem \revert #'length
+ \property Voice.Stem \revert #'length %tweak
\property Voice.Stem \revert #'direction
\property Voice.Stem \override #'direction = #-1
- <<a' fis cis>>-)-\arpeggio
+ <a' fis cis>)\arpeggio
\translator Staff=bass
\property Voice.Stem \revert #'direction
r2
| %4
- \property Voice.Slur \revert #'beautiful
- \property Voice.Slur \revert #'attachment-offset
+ \property Voice.Slur \revert #'beautiful %tweak
+ \property Voice.Slur \revert #'attachment-offset %tweak
\stemDown
- <<b,, b,>>4
+ <b,, b,>4
\clef treble
\stemBoth
- <
+ <<
%urg: staff-change: ! on dis
- <<cis'' a fis dis!>>-\arpeggio
-% { s8. \clef bass}
- >
-
- %Hmm
- %\grace { s16 s s s s32 s s s s \clef bass s }
- \clef bass
- \grace { <<e,,, e,>>32-( } <<gis' e>>2-)
+ <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
- \property Thread.Fingering \set #'direction = #-1
- % hmm, ik ben blond?
- a,8 e'-[-5-(<<a-2 cis-3>>-]-)
- r b,-5 <<e-3 gis-5 d'>>4
+ %%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
- e,8-[-5-(
+ \once \property Voice.Fingering \set #'extra-offset = #'(0 . -1) %tweak
+ e,8[-5(
| %6
- a-)-2]
+ \once \property Voice.Fingering \set #'extra-offset = #'(0 . -1) %tweak
+ a)-2]
\slurUp
- e'-[(<<a cis>>-)] r b, <<e gis d'>>4
+ e'[(<a cis>)] r b, <e gis d'>4
\slurBoth
- e,8-[(
+ e,8[(
| %7
- a-)]
+ a)]
}
-bassTwo = \context Voice=bassTwo \notes\relative c{
+bassTwo = \new Voice \notes\relative c{
\skip 2
\skip 1*2
\skip 2
\stemUp
\slurUp
- cis'4-( bis-)
+ cis'4( bis)
}
-middleDynamics = \context Dynamics=middle \notes{
- \property Dynamics.TextScript \set #'padding = #-1
-
+middleDynamics = \notes{
+ \property Dynamics.TextScript \set #'padding = #-1 %tweak
s2
s1*2
| %4
- s2 s32 s-"rall." s s s8 s4
+ s2
+ \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)
+ \once\property Dynamics.Hairpin \set #'extra-offset = #'(1 . 0) %tweak
s \> s s
| %6
- s8-\!
- s2 s8 s-\> s
+ s8\!
+ s2 s8 s\> s
| %7
- s8-\!
+ 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
-
- 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
+
+ | %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 <
+ \context PianoStaff <<
+ \context Staff=treble <<
\treble
\trebleTwo
- >
- \context Dynamics=middle <
+ >>
+ \new Dynamics <<
\middleDynamics
- >
- \context Staff=bass <
+ >>
+ \context Staff=bass <<
\clef bass
\bass
\bassTwo
- >
- \context Dynamics=lower <
+ >>
+ \new Dynamics <<
\lowerDynamics
- >
- >
+ >>
+ >>
\paper {
\translator {
\ScoreContext
minimumVerticalExtent = #'(-1 . 1)
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-size = #2
TextScript \override #'font-shape = #'italic
\consists "Skip_event_swallow_translator"
projects / lilypond.git / blobdiff