From: hanwen Date: Thu, 15 Jan 2004 14:20:30 +0000 (+0000) Subject: (direction-polyphonic-grobs): new X-Git-Tag: release/2.1.10~13 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=eb0b403eab011431b2457156497d45b231a61d0b;p=lilypond.git (direction-polyphonic-grobs): new variable, share between override and revert. This fixes script directions in polyphonic sections. --- diff --git a/ChangeLog b/ChangeLog index 9f093a4180..5c984359f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-01-15 Han-Wen Nienhuys + + * 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 * 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 43f7cbecbe..c495b31ce8 100644 --- 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 07b098cc38..e65a03ff00 100644 --- 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 f5ed7b89cd..071a5dc05d 100644 --- 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)) )) )