Merge master into nested-bookparts

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

diff --git a/input/les-nereides.ly b/input/les-nereides.ly
index a7bab52f5a720a124069f567a75ba6181c4ba2e0..7a420afbd3327a0424f2416ad6a3cbef1166bcf2 100644 (file)
--- a/input/les-nereides.ly
+++ b/input/les-nereides.ly
@@ -1,4 +1,4 @@
-\version "2.10.0"
+\version "2.11.61"
 
 \header {
     composer = "ARTHUR GRAY"
@@ -36,22 +36,18 @@ 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
+    cis,16^2(^\markup {\small \italic "m.d." }\sustainOff
     <fis fis,>8 <e! e,!>
     | %4
-    <dis, a' dis>4)\sustainDown
+    <dis, a' dis>4)\sustainOn
     
     \change Staff=treble
     
     \slurUp
     \set PianoStaff.connectArpeggios = ##t
 
-    #(set-octavation 1)
+    \ottava #1
 
-%    \once\override TextScript  #'extra-offset = #'(-3 . -2) %tweak
-           
     \tieUp
     cis''''4^\markup { \small \italic "m.g." }\arpeggio~
     \grace {
@@ -59,7 +55,7 @@ treble = \new Voice \relative c''{
        \revert Stem #'direction
        
        a16[-5_( fis dis]
-       #(set-octavation 0)
+       \ottava #0
        
        cis32[ a-1 fis-4 dis]   cis[ a  fis)-2]
                                % the small grace in lower staff comes after us
@@ -121,9 +117,9 @@ 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
+    <cis cis,>4\sustainOn
     \change Staff=treble
     \stemDown
     <a'' eis cis>4)\arpeggio
@@ -131,11 +127,11 @@ bass = \new Voice \relative c{
     \change Staff=bass
     \stemNeutral
     
-    r8. cis,,16(\sustainUp <fis fis,>8 <gis gis,>
+    r8. cis,,16(\sustainOff <fis fis,>8 <gis gis,>
     
     | %3
-%    \once \override Stem  #'length = #6 %tweak
-    <a a,>4\sustainDown
+
+    <a a,>4\sustainOn
     \change Staff=treble
                        
     \stemNeutral
@@ -163,7 +159,7 @@ bass = \new Voice \relative c{
        s32 s s
        s s s
        \clef bass
-       <e,,, e,>32(\sustainUp\sustainDown
+       <e,,, e,>32(\sustainOff\sustainOn
     
        \revert Stem #'stroke-style
     }
@@ -176,23 +172,23 @@ bass = \new Voice \relative c{
     \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>])
 
                           
-    a,8\sustainDown e'[-5(<a cis>])-2-3
+    a,8\sustainOn 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
+    r b,-5\sustainOff\sustainOn <e gis d'>4-3-5
     \slurNeutral
-    e,8[-5(\sustainUp
+    e,8[-5(\sustainOff
     
     | %6
-    a)-2]\sustainDown
+    a)-2]\sustainOn
     \slurUp
-    e'[(<a cis>)] r b,\sustainUp\sustainDown <e gis d'>4
+    e'[(<a cis>)] r b,\sustainOff\sustainOn <e gis d'>4
     \slurNeutral
-    e,8[(\sustainUp
+    e,8[(\sustainOff
     
     | %7
     a)]
@@ -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,17 +215,15 @@ 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
+    \textLengthOn
     s32 s-"rall." s s s8 s4
-    \emptyText
+    \textLengthOff
     | %5
     s2-"a tempo" s8
-    %\once\override Dynamics.Hairpin  #'extra-offset = #'(1 . 0) %tweak
     s \> s s
     | %6 
     s8\!
@@ -263,7 +257,7 @@ theScore = \score{
            \type "Engraver_group"
            \name Dynamics
            \consists "Output_property_engraver"
-           \override VerticalAxisGroup #'minimum-Y-extent = #'(-1 . 1)
+           \override VerticalAxisGroup #'minimum-Y-extent = #'(0 . 0)
 
            \consists "Script_engraver"
            \consists "Dynamic_engraver"