Updates.

diff --git a/ChangeLog b/ChangeLog
index a0969db0fc612ba0daea2f5b6bba887bffcd56f0..23b76fc9a4dccceff0e177a538c084659cacc3e6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-02  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * input/les-nereides.ly: Updates.
+
 2003-08-02  Heikki Junes <hjunes@cc.hut.fi>
 
        * lilypond-mode.el (LilyPond-insert-tag-current): new function,

diff --git a/input/les-nereides.ly b/input/les-nereides.ly
index b40514c0a6a9f77b0ac0f7dcc80fbc94bff6730a..9b8c1af6605040cce596bd76b04946259cf5155d 100644 (file)
--- a/input/les-nereides.ly
+++ b/input/les-nereides.ly
@@ -25,10 +25,10 @@ http://www.orphee.com/comparison/gray.pdf
 treble =  \context Voice=treble \notes\relative c''{
     \key a \major
     r2
-    %2
+    | %2
     \stemUp
     r4 <<cis eis a cis>>-\arpeggio r2
-    %3
+    | %3
     r4 <<cis fis a cis>>-\arpeggio r8.
 
     \translator Staff=bass
@@ -38,12 +38,12 @@ treble =  \context Voice=treble \notes\relative c''{
     % currently, this can't be (small italic,-) because in the paperblock
     % we set italic_magnifictation to get large italics.
     cis,16^2^"m.d."( <<fis fis,>>8 <<e! e,!>>
-    %4
+    | %4
     <<dis, a' dis>>4-)
     
     \translator Staff=treble
     
-    \slurUp 
+    \slurUp
     \property PianoStaff.connectArpeggios = ##t
 
     #(set-octavation 1)
@@ -54,7 +54,10 @@ treble =  \context Voice=treble \notes\relative c''{
     cis''''4^\markup { \small \italic "m.g." }-\arpeggio-~
     \grace {
          cis8
-       \stemBoth
+        
+         %\stemBoth Hmm
+        \property Voice.Stem \set #'direction = #0
+        
           a16-[-5( fis dis-]
         #(set-octavation 0)
        
@@ -63,54 +66,72 @@ treble =  \context Voice=treble \notes\relative c''{
 
     \stemUp
     cis'4( bis-)
-    r8
-    <<a' a,>>8-( <<gis gis,>> <<fis fis,>> <<gis gis,>> <<fis fis,>>  e-)^" "^1^4^5 r|
-    r <<a a,>>8-( <<gis gis,>> <<fis fis,>> <<gis gis,>> <<fis fis,>>  e-) r|
 
+    | %5
+    r8 <<a' a,>>8-(-\mf <<gis gis,>> <<fis fis,>>
+    % \fingerUp
+    \property Voice.Fingering \set #'direction = #1
+    % padding \once does not work??
+    \once \property Voice.Fingering \set #'padding = #1
+    <<gis gis,>> <<fis fis,>> e-)-1-4-5 r
+
+    | %6
+    r <<a a,>>8-(-\mf <<gis gis,>> <<fis fis,>>
+    <<gis gis,>> <<fis fis,>>  e-) r
+    
+    | %7
     \bar "||"
-
 }
 
 trebleTwo =  \context Voice=trebleTwo \notes\relative c''{
+    \stemDown
     s2
+    | %1
     s1*2
+    | %4
     s4
-    \stemDown
     <<cis' a fis dis>>4-\arpeggio
-
     <<e, gis, e d!>>2
+    | %5
     s8 cis4. d4
-    <<cis e,>>8-[-( <<b-3 d,-1>> |
+    <<cis e,>>8-[-( <<b-3 d,-1>>
+    | %6
     <<a-2 cis,-1>>-)] cis4. d4 
-    <<cis e,>>8-[-( <<b d,>> |
+    <<cis e,>>8-[-( <<b d,>>
+    | %7
     <<a cis,>>-)]
 }
 
 bass =  \context Voice=bass \notes\relative c{
-    % Allow ugly slurs
     \partial 2
     \key a \major
     
+    % Allow ugly (highly blown-up) slurs
     \property Voice.Slur \override #'beautiful = #5.0
     \property Voice.Slur \override #'attachment-offset = #'((0 . 3) . (0 . -4))
     \slurDown
-    r8. e,16_2( <<a a,>>8-[ <<b b,>>] |
-    %2
+    
+    \dynamicUp
+
+    r8. e,16-(-\f_2 <<a a,>>8-[ <<b b,>>]
+    | %2
     <<cis cis,>>4
     \translator Staff=treble
     \stemDown
     \property Voice.Slur \override #'attachment = #'(stem . stem)
-    <<a'' eis cis>>4-)-\arpeggio 
-    %\stemBoth
+    <<a'' eis cis>>4-)-\arpeggio
+    
     \property Voice.Slur \revert #'attachment
     \translator Staff=bass
     \stemBoth
+    
     \property Voice.Slur \revert #'y-free
     \property Voice.Slur \override #'y-free = #0.1
     \property Voice.Slur \revert #'attachment-offset
     \property Voice.Slur \override #'attachment-offset = #'((0 . 3) . (0 . 8))
     r8. cis,,16( <<fis fis,>>8 <<gis gis,>>
-    %3
+    
+    | %3
     \property Voice.Stem \set #'length = #5
     <<a a,>>4
     \translator Staff=treble
@@ -122,7 +143,8 @@ bass =  \context Voice=bass \notes\relative c{
     \translator Staff=bass
     \property Voice.Stem \revert #'direction
     r2
-    %4
+    
+    | %4
     \property Voice.Slur \revert #'beautiful
     \property Voice.Slur \revert #'attachment-offset
     \stemDown
@@ -139,20 +161,29 @@ bass =  \context Voice=bass \notes\relative c{
     %\grace { s16 s s s s32 s s s s \clef bass s }
     \clef bass
     \grace { <<e,,, e,>>32-( } <<gis' e>>2-)
-    %5
+    
+    | %5
     \slurUp
-    a,8   e'-[-5(<<a-2 cis-3>>-)]
+    
+    % \fingerDown
+    \property Voice.Fingering \set #'direction = #-1
+    \property Thread.Fingering \set #'direction = #-1
+    % hmm, ik ben blond?
+    
+    a,8 e'-[-5-(<<a-2 cis-3>>-]-)
     r b,-5 <<e-3 gis-5 d'>>4
     \slurBoth
-      e,8-[-5(|
-    %6
-     a-)-2]
+    e,8-[-5-(
+    
+    | %6
+    a-)-2]
     \slurUp
-      e'-[(<<a cis>>-)] r b, <<e gis d'>>4
+    e'-[(<<a cis>>-)] r b, <<e gis d'>>4
     \slurBoth
-      e,8-[(|
-    %7
-     a-)]
+    e,8-[(
+    
+    | %7
+    a-)]
 }
 
 bassTwo =  \context Voice=bassTwo \notes\relative c{
@@ -163,26 +194,25 @@ bassTwo =  \context Voice=bassTwo \notes\relative c{
     \stemUp
     \slurUp
 
-    cis'4( bis-)
+    cis'4-( bis-)
 }
 
 middleDynamics =  \context Dynamics=middle \notes{
-    s8 s16 s-\f s4
-    s1*2
-    %4
-    s2
-
-    s32 
-    \once \property Dynamics.TextScript \set #'extra-offset = #'(0 . 1.5)
-    s-"rall." s s
-    s8 s4
+    \property Dynamics.TextScript \set #'padding = #-1
     
-    %s1-\mf-"a tempo"
-    s2-\mf-"a tempo" s8
-%%    s\>  s8-\!
-    s16 s32 s64 \> s s8  s  s8-\!
-%%    s8-\mf s4 s4 s8\> s32 s s  s-\!
-    s8-\mf s4 s8 s16 s32 s64 \> s s16 s8 s32 s s s s128-\!
+    s2
+    s1*2
+    | %4
+    s2 s32 s-"rall." s s s8 s4
+    | %5
+    s2-"a tempo" s8
+    \once\property Dynamics.Hairpin \set #'extra-offset = #'(1 . 0)
+    s \> s s
+    | %6 
+    s8-\!
+    s2 s8 s-\> s
+    | %7
+    s8-\!
 }
 
 lowerDynamics =  \context Dynamics=lower \notes{