Run sort-lines on .gitignore.

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

diff --git a/input/les-nereides.ly b/input/les-nereides.ly
index 73ff6b60de4a2e484b55fa870008aca0114508ae..9f91786efeb9c91742ee8109b88c5c5de7f834fb 100644 (file)
--- a/input/les-nereides.ly
+++ b/input/les-nereides.ly
@@ -1,4 +1,4 @@
-\version "2.6.0"
+\version "2.10.0"
 
 \header {
     composer = "ARTHUR GRAY"
@@ -36,8 +36,6 @@ treble = \new Voice \relative c''{
 
     \change Staff=bass
 
-    \once\override TextScript  #'extra-offset = #'(-3 . -4) %tweak
-    
     cis,16^2(^\markup {\small \italic "m.d." }\sustainUp
     <fis fis,>8 <e! e,!>
     | %4
@@ -50,13 +48,11 @@ treble = \new Voice \relative c''{
 
     #(set-octavation 1)
 
-    \once\override TextScript  #'extra-offset = #'(-3 . -2) %tweak
-           
     \tieUp
     cis''''4^\markup { \small \italic "m.g." }\arpeggio~
     \grace {
         cis8
-       \override Stem #'direction = #CENTER
+       \revert Stem #'direction
        
        a16[-5_( fis dis]
        #(set-octavation 0)
@@ -74,7 +70,7 @@ treble = \new Voice \relative c''{
     r8 <a' a,>8(\mf <gis gis,> <fis fis,>
     
     % \fingerUp
-    \override Fingering  #'direction = #1
+    \override Fingering  #'direction = #UP
     
     <gis gis,> <fis fis,> e)-1-4-5 r
 
@@ -90,7 +86,7 @@ trebleTwo = \new Voice \relative c''{
     \stemDown
     \slurDown
     % \fingerDown
-    \override Fingering  #'direction = #-1
+    \override Fingering  #'direction = #DOWN
     s2
     | %1
     s1*2
@@ -121,7 +117,7 @@ bass = \new Voice \relative c{
 
     r8. e,16(\f_2 <a a,>8[ <b b,>]
     | %2
-    \override Staff.SustainPedalLineSpanner #'staff-padding = #5 %tweak
+    %\override Staff.SustainPedalLineSpanner #'staff-padding = #5 %tweak
                           
     <cis cis,>4\sustainDown
     \change Staff=treble
@@ -134,15 +130,15 @@ bass = \new Voice \relative c{
     r8. cis,,16(\sustainUp <fis fis,>8 <gis gis,>
     
     | %3
-%    \once \override Stem  #'length = #6 %tweak
+
     <a a,>4\sustainDown
     \change Staff=treble
-                           
-    \revert Stem #'direction
-    \override Stem  #'direction = #-1
+                       
+    \stemNeutral
+    \stemDown    
     <a' fis cis>)\arpeggio
     \change Staff=bass
-    \revert Stem #'direction
+    \stemNeutral
     r2
     
     | %4
@@ -173,10 +169,10 @@ bass = \new Voice \relative c{
     \slurUp
     
     % \fingerDown
-    \override Fingering  #'direction = #-1
+    \override Fingering  #'direction = #DOWN
 
                           
-    \override Staff.SustainPedalLineSpanner #'staff-padding = #3.5 %tweak
+    %\override Staff.SustainPedalLineSpanner #'staff-padding = #3.5 %tweak
     \set Staff.pedalSustainStyle = #'mixed
     %%a,8 e'[-5(<a-2 cis-3>])
 
@@ -210,7 +206,7 @@ bassTwo = \new Voice \relative c{
 }
 
 middleDynamics = {
-    \override Dynamics.TextScript  #'padding = #-1 %tweak
+    %\override Dynamics.TextScript  #'padding = #-1 %tweak
     s2
     s1*2
     | %4
@@ -219,9 +215,8 @@ middleDynamics = {
        s8
        s16 s s
        s32 s
-       \once\override Dynamics.Hairpin  #'extra-offset = #'(0 . 2) %tweak
        s\> s
-       s32 s s s\!
+       s32 s s\! s
     
     }
     \fatText
@@ -229,7 +224,6 @@ middleDynamics = {
     \emptyText
     | %5
     s2-"a tempo" s8
-    \once\override Dynamics.Hairpin  #'extra-offset = #'(1 . 0) %tweak
     s \> s s
     | %6 
     s8\!
@@ -240,14 +234,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
@@ -260,10 +254,10 @@ 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 = #'(0 . 0)
 
            \consists "Script_engraver"
            \consists "Dynamic_engraver"
@@ -280,7 +274,6 @@ theScore = \score{
        \context {
            \PianoStaff
            \accepts Dynamics
-           \override VerticalAlignment #'forced-distance = #7
         }
     }
 }