Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/input/les-nereides.ly b/input/les-nereides.ly
index c6c0806058d35b0971913251318fab6e47488406..c987b46d5ae83c760fb38ce4361a06ecd5fdff8a 100644 (file)
--- a/input/les-nereides.ly
+++ b/input/les-nereides.ly
@@ -1,9 +1,8 @@
-#(ly:set-option 'old-relative)
-\version "2.3.8"
-\encoding "latin1"
+\version "2.7.39"
+
 \header {
     composer = "ARTHUR GRAY"
-    title = "LES NÉRÉIDES"
+    title = "LES NÉRÉIDES"
     subtitle = "THE NEREIDS"
     enteredby = "JCN"
     piece = "Allegretto scherzando"
@@ -16,8 +15,7 @@ Nastiest piece of competition at
 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
+Lines that contain tweaks (10 currently, not counting reverts) are
 marked with %tweak
 
 possibly more impressive to render without tweaks?
@@ -27,11 +25,6 @@ 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))))
-
-
 treble = \new Voice \relative c''{
     \key a \major
     r2
@@ -63,11 +56,9 @@ treble = \new Voice \relative c''{
     cis''''4^\markup { \small \italic "m.g." }\arpeggio~
     \grace {
         cis8
-       \slurBoth % Tweak
+       \revert Stem #'direction
        
-       \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]
@@ -83,10 +74,8 @@ treble = \new Voice \relative c''{
     r8 <a' a,>8(\mf <gis gis,> <fis fis,>
     
     % \fingerUp
-    \override Fingering  #'direction = #1
+    \override Fingering  #'direction = #UP
     
-    % Manual fix for collision with slur
-    \override Fingering  #'extra-offset = #'(0 . 1) %tweak
     <gis gis,> <fis fis,> e)-1-4-5 r
 
     | %6
@@ -101,8 +90,7 @@ trebleTwo = \new Voice \relative c''{
     \stemDown
     \slurDown
     % \fingerDown
-    \override Fingering  #'direction = #-1
-    \override Fingering  #'extra-offset = #'(0 . 1.2)
+    \override Fingering  #'direction = #DOWN
     s2
     | %1
     s1*2
@@ -112,11 +100,13 @@ trebleTwo = \new Voice \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
+    % fair to count as one tweak?
+    \override Fingering #'add-stem-support = ##t %tweak
+    \override Fingering #'padding = #0.15
+    \override Fingering #'slur-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,>)]
@@ -126,53 +116,40 @@ 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,>]
     | %2
-    \override Staff.SustainPedalLineSpanner #'staff-padding = #5
+    \override Staff.SustainPedalLineSpanner #'staff-padding = #5 %tweak
                           
     <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
-    \override Stem  #'length = #5 %tweak
+%    \once \override Stem  #'length = #6 %tweak
     <a a,>4\sustainDown
     \change Staff=treble
-                           
-    \revert Stem #'length %tweak
-    \revert Stem #'direction
-    \override Stem  #'direction = #-1
+                       
+    \stemNeutral
+    \stemDown    
     <a' fis cis>)\arpeggio
     \change Staff=bass
-    \revert Stem #'direction
+    \stemNeutral
     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
@@ -196,10 +173,10 @@ bass = \new Voice \relative c{
     \slurUp
     
     % \fingerDown
-    \override Fingering  #'direction = #-1
+    \override Fingering  #'direction = #DOWN
 
                           
-    \override Staff.SustainPedalLineSpanner #'staff-padding = #3.5
+    \override Staff.SustainPedalLineSpanner #'staff-padding = #3.5 %tweak
     \set Staff.pedalSustainStyle = #'mixed
     %%a,8 e'[-5(<a-2 cis-3>])
 
@@ -207,16 +184,14 @@ bass = \new Voice \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
-    \once \override Fingering  #'extra-offset = #'(0 . -1) %tweak
+    \slurNeutral
     e,8[-5(\sustainUp
     
     | %6
-    \once \override Fingering  #'extra-offset = #'(0 . -1) %tweak
     a)-2]\sustainDown
     \slurUp
     e'[(<a cis>)] r b,\sustainUp\sustainDown <e gis d'>4
-    \slurBoth
+    \slurNeutral
     e,8[(\sustainUp
     
     | %7
@@ -249,8 +224,9 @@ middleDynamics = {
        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
@@ -264,36 +240,36 @@ middleDynamics = {
 
 theScore = \score{
     \context PianoStaff <<
-        \context Staff=treble <<
+        \new Staff = "treble" <<
            \treble
            \trebleTwo
         >>
        \new Dynamics <<
            \middleDynamics
        >>
-        \context Staff=bass <<
+        \new Staff = "bass" <<
            \clef bass
            \bass
            \bassTwo
         >>
     >>
-    \paper {
+    \layout {
        \context {
            \Score
            pedalSustainStrings = #'("Ped." "*Ped." "*")
            \remove Bar_number_engraver
         }
        \context {
-           \type "Engraver_group_engraver"
+           \type "Engraver_group"
            \name Dynamics
            \consists "Output_property_engraver"
-           minimumVerticalExtent = #'(-1 . 1)
+           \override VerticalAxisGroup #'minimum-Y-extent = #'(-1 . 1)
 
            \consists "Script_engraver"
            \consists "Dynamic_engraver"
            \consists "Text_engraver"
 
-           \override TextScript #'font-size = #2
+           %%\override TextScript #'font-size = #1
            \override TextScript #'font-shape = #'italic
 
            \consists "Skip_event_swallow_translator"
@@ -314,6 +290,7 @@ theScore = \score{
 }
     
 %%% Local variables:
-%%% LilyPond-indent-level:4
+%%% coding: utf-8
+%%% LilyPond-indent-level:2
 %%% End:
-%% new-chords-done %%
+