* lily/font-metric.cc (get_indexed_char_stencil): Bugfix: get

[lilypond.git] / input / les-nereides.ly

diff --git a/input/les-nereides.ly b/input/les-nereides.ly
index 93702ec3fab5969abed6e143f434af4a8156e1cd..72e2f8d08726e17bc0e43eba69bdba084309eca0 100644 (file)
--- a/input/les-nereides.ly
+++ b/input/les-nereides.ly
@@ -1,6 +1,5 @@
-#(ly:set-option 'old-relative)
-\version "2.1.29"
-
+\version "2.4.0"
+\encoding "latin1"
 \header {
     composer = "ARTHUR GRAY"
     title = "LES NÉRÉIDES"
@@ -32,7 +31,7 @@ possibly more impressive to render without tweaks?
   (lambda (elt) (equal? text (ly:get-grob-property elt 'text))))
 
 
-treble = \new Voice \notes\relative c''{
+treble = \new Voice \relative c''{
     \key a \major
     r2
     | %2
@@ -63,11 +62,9 @@ treble = \new Voice \notes\relative c''{
     cis''''4^\markup { \small \italic "m.g." }\arpeggio~
     \grace {
         cis8
-       \slurBoth % Tweak
+       \override Stem #'direction = #CENTER
        
-       \override Stem  #'direction = #0
-        
-       a16[-5( fis dis]
+       a16[-5_( fis dis]
        #(set-octavation 0)
        
        cis32[ a-1 fis-4 dis]   cis[ a  fis)-2]
@@ -86,7 +83,7 @@ treble = \new Voice \notes\relative c''{
     \override Fingering  #'direction = #1
     
     % Manual fix for collision with slur
-    \override Fingering  #'extra-offset = #'(0 . 1) %tweak
+    \override Fingering  #'inside-slur = ##f
     <gis gis,> <fis fis,> e)-1-4-5 r
 
     | %6
@@ -97,12 +94,11 @@ treble = \new Voice \notes\relative c''{
     \bar "||"
 }
 
-trebleTwo = \new Voice \notes\relative c''{
+trebleTwo = \new Voice \relative c''{
     \stemDown
     \slurDown
     % \fingerDown
     \override Fingering  #'direction = #-1
-    \override Fingering  #'extra-offset = #'(0 . 1.2)
     s2
     | %1
     s1*2
@@ -112,25 +108,21 @@ trebleTwo = \new Voice \notes\relative c''{
     <e, gis, e d!>2
     | %5
     s8 cis4. d4
-    %%<cis e,>8[( <b-3 d,-1>
-    <cis e,>8[( <b d,>-3-1
+    \override Fingering #'add-stem-support = ##t
+    \override Fingering #'padding = #0.1
+    <cis e,>8[( <d,_3 b'_1>
     | %6
-    %%<a-2 cis,-1>)] cis4. d4 
-    <a cis,>)]-2-1 cis4. d4 
+    <cis_1 a'_2>)] cis'4. d4 
     <cis e,>8[( <b d,>
     | %7
     <a cis,>)]
 }
 
-bass = \new Voice \notes\relative c{
+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 <a a,>8[ <b b,>]
@@ -140,17 +132,11 @@ bass = \new Voice \notes\relative c{
     <cis cis,>4\sustainDown
     \change Staff=treble
     \stemDown
-    \override Slur  #'attachment = #'(stem . stem) %tweak
     <a'' eis cis>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 <fis fis,>8 <gis gis,>
     
     | %3
@@ -167,12 +153,10 @@ bass = \new Voice \notes\relative c{
     r2
     
     | %4
-    \revert Slur #'beautiful %tweak
-    \revert Slur #'attachment-offset %tweak
     \stemDown
     <b,, b,>4
     \clef treble
-    \stemBoth
+    \stemNeutral
     <<
         %urg: staff-change: ! on dis
         <cis'' a fis dis!>\arpeggio
@@ -207,7 +191,7 @@ bass = \new Voice \notes\relative c{
     a,8\sustainDown e'[-5(<a cis>])-2-3
     %%r b,-5 <e-3 gis-5 d'>4
     r b,-5\sustainUp\sustainDown <e gis d'>4-3-5
-    \slurBoth
+    \slurNeutral
     \once \override Fingering  #'extra-offset = #'(0 . -1) %tweak
     e,8[-5(\sustainUp
     
@@ -216,14 +200,14 @@ bass = \new Voice \notes\relative c{
     a)-2]\sustainDown
     \slurUp
     e'[(<a cis>)] r b,\sustainUp\sustainDown <e gis d'>4
-    \slurBoth
+    \slurNeutral
     e,8[(\sustainUp
     
     | %7
     a)]
 }
 
-bassTwo = \new Voice \notes\relative c{
+bassTwo = \new Voice \relative c{
     \skip 2
     \skip 1*2
     \skip 2
@@ -234,7 +218,7 @@ bassTwo = \new Voice \notes\relative c{
     cis'4( bis)
 }
 
-middleDynamics = \notes{
+middleDynamics = {
     \override Dynamics.TextScript  #'padding = #-1 %tweak
     s2
     s1*2
@@ -262,25 +246,24 @@ middleDynamics = \notes{
     s8\!
 }
 
-
-\score{
+theScore = \score{
     \context PianoStaff <<
-        \context Staff=treble <<
+        \context Staff = "treble" <<
            \treble
            \trebleTwo
         >>
        \new Dynamics <<
            \middleDynamics
        >>
-        \context Staff=bass <<
+        \context Staff = "bass" <<
            \clef bass
            \bass
            \bassTwo
         >>
     >>
-    \paper {
+    \layout {
        \context {
-           \ScoreContext
+           \Score
            pedalSustainStrings = #'("Ped." "*Ped." "*")
            \remove Bar_number_engraver
         }
@@ -299,18 +282,22 @@ middleDynamics = \notes{
 
            \consists "Skip_event_swallow_translator"
 
-           \consistsend "Axis_group_engraver"
+           \consists "Axis_group_engraver"
        }
 
        \context {
-           \PianoStaffContext
+           \PianoStaff
            \accepts Dynamics
            \override VerticalAlignment #'forced-distance = #7
         }
     }
 }
-
+                          
+\book{
+    \score { \theScore }
+}
+    
 %%% Local variables:
 %%% LilyPond-indent-level:4
 %%% End:
-%% new-chords-done %%
+