Merge branch 'master' into nested-bookparts

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

diff --git a/input/les-nereides.ly b/input/les-nereides.ly
index 72e2f8d08726e17bc0e43eba69bdba084309eca0..b96a5ce49e8f64245e2418cccba6a4c5f0824ea8 100644 (file)
--- a/input/les-nereides.ly
+++ b/input/les-nereides.ly
@@ -1,8 +1,8 @@
-\version "2.4.0"
-\encoding "latin1"
+\version "2.11.51"
+
 \header {
     composer = "ARTHUR GRAY"
-    title = "LES NÉRÉIDES"
+    title = "LES NÉRÉIDES"
     subtitle = "THE NEREIDS"
     enteredby = "JCN"
     piece = "Allegretto scherzando"
@@ -15,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?
@@ -26,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
@@ -42,12 +36,10 @@ 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
     
@@ -56,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)
@@ -80,10 +70,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
@@ -98,7 +86,7 @@ trebleTwo = \new Voice \relative c''{
     \stemDown
     \slurDown
     % \fingerDown
-    \override Fingering  #'direction = #-1
+    \override Fingering  #'direction = #DOWN
     s2
     | %1
     s1*2
@@ -108,8 +96,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 
@@ -127,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
+    %\override Staff.SustainPedalLineSpanner #'staff-padding = #5 %tweak
                           
-    <cis cis,>4\sustainDown
+    <cis cis,>4\sustainOn
     \change Staff=treble
     \stemDown
     <a'' eis cis>4)\arpeggio
@@ -137,19 +127,18 @@ 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
-    \override Stem  #'length = #5 %tweak
-    <a a,>4\sustainDown
+
+    <a a,>4\sustainOn
     \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
@@ -170,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
     }
@@ -180,28 +169,26 @@ 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>])
 
                           
-    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
-    \once \override Fingering  #'extra-offset = #'(0 . -1) %tweak
-    e,8[-5(\sustainUp
+    e,8[-5(\sustainOff
     
     | %6
-    \once \override Fingering  #'extra-offset = #'(0 . -1) %tweak
-    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)]
@@ -219,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
@@ -228,16 +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
     
     }
-
+    \textLengthOn
     s32 s-"rall." s s s8 s4
+    \textLengthOff
     | %5
     s2-"a tempo" s8
-    \once\override Dynamics.Hairpin  #'extra-offset = #'(1 . 0) %tweak
     s \> s s
     | %6 
     s8\!
@@ -248,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
@@ -268,16 +254,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 = #'(0 . 0)
 
            \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"
@@ -288,7 +274,6 @@ theScore = \score{
        \context {
            \PianoStaff
            \accepts Dynamics
-           \override VerticalAlignment #'forced-distance = #7
         }
     }
 }
@@ -298,6 +283,7 @@ theScore = \score{
 }
     
 %%% Local variables:
-%%% LilyPond-indent-level:4
+%%% coding: utf-8
+%%% LilyPond-indent-level:2
 %%% End: