(direction-polyphonic-grobs): new

variable, share between override and revert. This fixes script
directions in polyphonic sections.

diff --git a/ChangeLog b/ChangeLog
index 9f093a4180057fbd13218d7e01fd2183340aa7ab..5c984359f2c4e91e904c0690d000cd727e79e257 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-15  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * scm/music-functions.scm (direction-polyphonic-grobs): new
+       variable, share between override and revert. This fixes script
+       directions in polyphonic sections.
+
 2004-01-14  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
        * lily/text-spanner.cc (brew_molecule): don't do shorten-pair for

diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc
index 43f7cbecbeee038fc1009e7587402057195a4622..c495b31ce810f80e548782cabe80e45611f87c31 100644 (file)
--- a/lily/beam-engraver.cc
+++ b/lily/beam-engraver.cc
@@ -111,6 +111,9 @@ Beam_engraver::try_music (Music *m)
       if (d == STOP && !valid_end_moment ())
        return false;
 
+      if (d == STOP && !beam_)
+       return false;
+      
       if (d == START)
        {
          evs_drul_[d] = m;

diff --git a/mf/feta-bolletjes.mf b/mf/feta-bolletjes.mf
index 07b098cc3846289864908a939e6b70bf4d9bfb9b..e65a03ff00cef7620de54f0d3904d894bd9aaf2f 100644 (file)
--- a/mf/feta-bolletjes.mf
+++ b/mf/feta-bolletjes.mf
@@ -183,53 +183,55 @@ fet_beginchar("Quart notehead", "2", "quarthead")
        black_notehead_width# := charwd;
 fet_endchar;
 
-fet_beginchar("Quart notehead", "2AA", "quarthead")
-       draw_outside_ellipse (1.6 - puff_up_factor / 2.0, 32, 0.707, 0);
-       black_notehead_width# := charwd;
+fet_beginchar("Quart noteheadPQ", "2PQ", "quartheadPQ")
+       draw_outside_ellipse (1.0 - puff_up_factor / 2.0, 32, 0.707, 0);
 fet_endchar;
-fet_beginchar("Quart notehead", "2AB", "quarthead")
-       draw_outside_ellipse (1.65 - puff_up_factor / 2.0, 32, 0.707, 0);
-       black_notehead_width# := charwd;
+
+fet_beginchar("Quart noteheadAA", "2AA", "quartheadAA")
+       draw_outside_ellipse (1.2 - puff_up_factor / 2.0, 32, 0.707, 0);
 fet_endchar;
-fet_beginchar("Quart notehead", "2AC", "quarthead")
-       draw_outside_ellipse (1.7 - puff_up_factor / 2.0, 32, 0.707, 0);
-       black_notehead_width# := charwd;
+
+fet_beginchar("Quart noteheadAB", "2AB", "quartheadAB")
+       draw_outside_ellipse (1.3 - puff_up_factor / 2.0, 32, 0.707, 0);
+       
 fet_endchar;
-fet_beginchar("Quart notehead", "2AD", "quarthead")
-       draw_outside_ellipse (1.75 - puff_up_factor / 2.0, 32, 0.707, 0);
-       black_notehead_width# := charwd;
+fet_beginchar("Quart noteheadAC", "2AC", "quartheadAC")
+       draw_outside_ellipse (1.4 - puff_up_factor / 2.0, 32, 0.707, 0);
+       
 fet_endchar;
-fet_beginchar("Quart notehead", "2BA", "quarthead")
-       draw_outside_ellipse (1.6 - puff_up_factor / 2.0, 35, 0.707, 0);
-       black_notehead_width# := charwd;
+fet_beginchar("Quart noteheadAD", "2AD", "quartheadAD")
+       draw_outside_ellipse (1.5 - puff_up_factor / 2.0, 32, 0.707, 0);
+       
 fet_endchar;
-fet_beginchar("Quart notehead", "2BB", "quarthead")
-       draw_outside_ellipse (1.65 - puff_up_factor / 2.0, 35, 0.707, 0);
-       black_notehead_width# := charwd;
+fet_beginchar("Quart noteheadBA", "2BA", "quartheadBA")
+       draw_outside_ellipse (1.2 - puff_up_factor / 2.0, 35, 0.707, 0);
+       
 fet_endchar;
-fet_beginchar("Quart notehead", "2BC", "quarthead")
-       draw_outside_ellipse (1.7 - puff_up_factor / 2.0, 35, 0.707, 0);
-       black_notehead_width# := charwd;
+fet_beginchar("Quart noteheadBB", "2BB", "quartheadBB")
+       draw_outside_ellipse (1.3 - puff_up_factor / 2.0, 35, 0.707, 0);
+       
 fet_endchar;
-fet_beginchar("Quart notehead", "2BD", "quarthead")
-       draw_outside_ellipse (1.75 - puff_up_factor / 2.0, 35, 0.707, 0);
-       black_notehead_width# := charwd;
+fet_beginchar("Quart noteheadBC", "2BC", "quartheadBC")
+       draw_outside_ellipse (1.4 - puff_up_factor / 2.0, 35, 0.707, 0);
 fet_endchar;
-fet_beginchar("Quart notehead", "2CA", "quarthead")
-       draw_outside_ellipse (1.6 - puff_up_factor / 2.0, 38, 0.707, 0);
-       black_notehead_width# := charwd;
+fet_beginchar("Quart noteheadBD", "2BD", "quartheadBD")
+       draw_outside_ellipse (1.5 - puff_up_factor / 2.0, 35, 0.707, 0);
+       
 fet_endchar;
-fet_beginchar("Quart notehead", "2CB", "quarthead")
-       draw_outside_ellipse (1.65 - puff_up_factor / 2.0, 38, 0.707, 0);
-       black_notehead_width# := charwd;
+fet_beginchar("Quart noteheadCA", "2CA", "quartheadCA")
+       draw_outside_ellipse (1.2 - puff_up_factor / 2.0, 38, 0.707, 0);
+       
 fet_endchar;
-fet_beginchar("Quart notehead", "2CC", "quarthead")
-       draw_outside_ellipse (1.7 - puff_up_factor / 2.0, 38, 0.707, 0);
-       black_notehead_width# := charwd;
+fet_beginchar("Quart noteheadCB", "2CB", "quartheadCB")
+       draw_outside_ellipse (1.3 - puff_up_factor / 2.0, 38, 0.707, 0);
+       
 fet_endchar;
-fet_beginchar("Quart notehead", "2CD", "quarthead")
-       draw_outside_ellipse (1.75 - puff_up_factor / 2.0, 38, 0.707, 0);
-       black_notehead_width# := charwd;
+fet_beginchar("Quart noteheadCC", "2CC", "quartheadCC")
+       draw_outside_ellipse (1.4 - puff_up_factor / 2.0, 38, 0.707, 0);
+       
+fet_endchar;
+fet_beginchar("Quart noteheadCD", "2CD", "quartheadCD")
+       draw_outside_ellipse (1.5 - puff_up_factor / 2.0, 38, 0.707, 0);
 fet_endchar;
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index f5ed7b89cdae5a1b595b572fbfc4c88670bbbfbc..071a5dc05d446a15590ed67f3d5e141b5c84fb9d 100644 (file)
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -214,13 +214,15 @@ i.e.  this is not an override"
    
    ))
 
+(define direction-polyphonic-grobs
+   '(Tie Slur Script TextScript Stem Dots DotColumn))
 
 (define-public (make-voice-props-set n)
   (make-sequential-music
    (append
       (map (lambda (x) (make-grob-property-set x 'direction
                                               (if (odd? n) -1 1)))
-          '(Tie Slur Script TextScript Stem Dots DotColumn))
+          direction-polyphonic-grobs)
       (list
        (make-grob-property-set 'NoteColumn 'horizontal-shift (quotient n 2))
        (make-grob-property-set 'MultiMeasureRest 'staff-position
@@ -231,15 +233,13 @@ i.e.  this is not an override"
    )
   ))
 
-
 (define-public (make-voice-props-revert)
   (make-sequential-music
-   (list
-      (make-grob-property-revert 'Tie 'direction)
-      (make-grob-property-revert 'Dots 'direction)
-      (make-grob-property-revert 'Stem 'direction)
-      (make-grob-property-revert 'Slur 'direction)         
-      (make-grob-property-revert 'NoteColumn 'horizontal-shift)
+   (append
+    (map (lambda (x) (make-grob-property-revert x 'direction))
+        direction-polyphonic-grobs)
+      
+      (list (make-grob-property-revert 'NoteColumn 'horizontal-shift))
    ))
   )