X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fles-nereides.ly;h=c39e7f37b526d4bc22062a512fc7ef1c40eab1ee;hb=c17db6fef557649f47c69ed11811231557a6179e;hp=cdbeaf7ed84505ab028f90a14efba4d4a318a3d3;hpb=f5889770b05d6ed2bab79cdb82b65cea238b92df;p=lilypond.git

diff --git a/input/les-nereides.ly b/input/les-nereides.ly
index cdbeaf7ed8..c39e7f37b5 100644
--- a/input/les-nereides.ly
+++ b/input/les-nereides.ly
@@ -1,4 +1,5 @@
-\version "2.5.13"
+\version "2.10.0"
+
 \header {
     composer = "ARTHUR GRAY"
     title = "LES NÉRÉIDES"
@@ -14,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?
@@ -25,10 +25,6 @@ possibly more impressive to render without tweaks?
 
 %}
 
-#(define (make-text-checker text)
-  (lambda (elt) (equal? text (ly:get-grob-property elt 'text))))
-
-
 treble = \new Voice \relative c''{
     \key a \major
     r2
@@ -60,7 +56,7 @@ treble = \new Voice \relative c''{
     cis''''4^\markup { \small \italic "m.g." }\arpeggio~
     \grace {
         cis8
-	\override Stem #'direction = #CENTER
+	\revert Stem #'direction
 	
 	a16[-5_( fis dis]
 	#(set-octavation 0)
@@ -78,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  #'inside-slur = ##f
     <gis gis,> <fis fis,> e)-1-4-5 r
 
     | %6
@@ -96,7 +90,7 @@ trebleTwo = \new Voice \relative c''{
     \stemDown
     \slurDown
     % \fingerDown
-    \override Fingering  #'direction = #-1
+    \override Fingering  #'direction = #DOWN
     s2
     | %1
     s1*2
@@ -106,8 +100,10 @@ trebleTwo = \new Voice \relative c''{
     <e, gis, e d!>2
     | %5
     s8 cis4. d4
-    \override Fingering #'add-stem-support = ##t
-    \override Fingering #'padding = #0.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
     <cis_1 a'_2>)] cis'4. d4 
@@ -125,7 +121,7 @@ bass = \new Voice \relative c{
 
     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
@@ -138,16 +134,15 @@ bass = \new Voice \relative c{
     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
@@ -178,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>])
 
@@ -190,11 +185,9 @@ bass = \new Voice \relative c{
     %%r b,-5 <e-3 gis-5 d'>4
     r b,-5\sustainUp\sustainDown <e gis d'>4-3-5
     \slurNeutral
-    \once \override Fingering  #'extra-offset = #'(0 . -1) %tweak
     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
@@ -231,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
@@ -246,14 +240,14 @@ 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
@@ -266,16 +260,16 @@ theScore = \score{
 	    \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"
@@ -296,6 +290,7 @@ theScore = \score{
 }
     
 %%% Local variables:
-%%% LilyPond-indent-level:4
+%%% coding: utf-8
+%%% LilyPond-indent-level:2
 %%% End: