From b5ae9c51455439f4fda0879196529ef341858395 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 20 Jan 2004 02:19:24 +0000 Subject: [PATCH] (overdone_heads): enlarge harmonic head. --- ChangeLog | 4 ++++ lily/ottava-engraver.cc | 2 +- lily/text-spanner.cc | 3 +-- mf/parmesan-heads.mf | 19 ++++++++++--------- scm/define-music-properties.scm | 1 + 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2021565fd6..643b316d6f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-01-20 Han-Wen Nienhuys + + * mf/parmesan-heads.mf (overdone_heads): enlarge harmonic head. + 2004-01-19 Han-Wen Nienhuys * lily/include/music-iterator.hh (class Music_iterator): add diff --git a/lily/ottava-engraver.cc b/lily/ottava-engraver.cc index c612e147ff..042cf9e5ed 100644 --- a/lily/ottava-engraver.cc +++ b/lily/ottava-engraver.cc @@ -121,7 +121,7 @@ Ottava_spanner_engraver::finalize () ENTER_DESCRIPTION(Ottava_spanner_engraver, /* descr */ "Create a text spanner when the ottavation property changes..", -/* creats*/ "OttavaSpanner", +/* creats*/ "OttavaBracket", /* accepts */ "", /* acks */ "note-column-interface", /* reads */ "ottavation", diff --git a/lily/text-spanner.cc b/lily/text-spanner.cc index c1025bd54c..41aa334d1f 100644 --- a/lily/text-spanner.cc +++ b/lily/text-spanner.cc @@ -40,7 +40,6 @@ Text_spanner::brew_molecule (SCM smob) Spanner *spanner = dynamic_cast (me); /* Ugh, must be same as Hairpin::brew_molecule. */ - Real padding = robust_scm2double ( me->get_grob_property ("if-text-padding"), 0); Grob *common = spanner->get_bound (LEFT)->common_refpoint (spanner->get_bound (RIGHT), X_AXIS); Paper_def * paper = me->get_paper(); @@ -157,5 +156,5 @@ Text_spanner::brew_molecule (SCM smob) ADD_INTERFACE (Text_spanner,"text-spanner-interface", "generic text spanner", - "text-repeat-if-broken dash-period if-text-padding dash-fraction edge-height bracket-flare edge-text shorten-pair style thickness enclose-bounds width-correct"); + "text-repeat-if-broken dash-period if-text-padding dash-fraction edge-height bracket-flare edge-text shorten-pair style thickness enclose-bounds"); diff --git a/mf/parmesan-heads.mf b/mf/parmesan-heads.mf index ac4b99d0cd..0db8f40c69 100644 --- a/mf/parmesan-heads.mf +++ b/mf/parmesan-heads.mf @@ -140,12 +140,13 @@ fet_beginchar("Brevis notehead", "-1neo_mensural", "mensuralbrevishead") draw_neo_brevis(2 staff_space#); fet_endchar; -def draw_neo_mensural_black_head (expr wid) = +def draw_neo_mensural_black_head (expr wid, height) = save head_width; head_width# = wid; - set_char_box (0, head_width#, noteheight#/2, noteheight#/2); + set_char_box (0, head_width#, height/2, height/2); + charwx := head_width# / 2; - charwy := noteheight# / 2; + charwy := height / 2; y3 = y1 =0; x2 = x4 = (x1 + x3) /2; @@ -159,8 +160,8 @@ def draw_neo_mensural_black_head (expr wid) = filldraw z1 -- z2 -- z3 -- z4 -- cycle; enddef; -def draw_neo_mensural_open_head (expr wid)= - draw_neo_mensural_black_head (wid); +def draw_neo_mensural_open_head (expr wid, height)= + draw_neo_mensural_black_head (wid, height); save diamNW, diamSW; diamNW = length (z2 - z1) + blot_diameter; diamSW = length (z4 - z1) + blot_diameter; @@ -180,22 +181,22 @@ def draw_neo_mensural_open_head (expr wid)= enddef; fet_beginchar("Neo-mensural open head","0neo_mensural","neomensuralsemibrevishead") - draw_neo_mensural_open_head (staff_space#); + draw_neo_mensural_open_head (staff_space#, noteheight#); fet_endchar; fet_beginchar("Harmonic notehead (Neo-mensural open)","0harmonic","harmonichead") - draw_neo_mensural_open_head (staff_space#); + draw_neo_mensural_open_head (1.3 staff_space#, 1.3 noteheight#); charwx := head_width#; charwy := 0; fet_endchar; fet_beginchar("Neo-mensural open head","1neo_mensural","neomensuralminimahead") - draw_neo_mensural_open_head (staff_space#); + draw_neo_mensural_open_head (staff_space#, noteheight#); fet_endchar; fet_beginchar("Neo-mensural black head","2neo_mensural","neomensuralsemiminimahead") - draw_neo_mensural_black_head (staff_space#); + draw_neo_mensural_black_head (staff_space#, noteheight#); fet_endchar; diff --git a/scm/define-music-properties.scm b/scm/define-music-properties.scm index c368355c2a..6731047090 100644 --- a/scm/define-music-properties.scm +++ b/scm/define-music-properties.scm @@ -82,6 +82,7 @@ For chord inversions, this is negative.") (music-property-description 'types list? "The types of this music object. Determines iteration in some cases.") (music-property-description 'repeat-count integer? "do a @code{\repeat} how ofen?") (music-property-description 'span-direction ly:dir? "Does this start or stop a spanner?") +(music-property-description 'split-list list? "splitting moments for part combiner.") (music-property-description 'start-moment-function procedure? "Function to compute the negative length of starting grace notes.") -- 2.39.2