From: Han-Wen Nienhuys Date: Tue, 30 Sep 2003 10:51:20 +0000 (+0000) Subject: * ly/params-init.ly (blotdiameter): set blotdiameter to 2/3 of X-Git-Tag: release/2.1.0~9 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d670b9cd2b2987bb3dcadd7590d25b15b9c33302;p=lilypond.git * ly/params-init.ly (blotdiameter): set blotdiameter to 2/3 of stafflinethickness (in the default) * lily/stem.cc (brew_molecule): use round_filled_box for stem. * lily/lily-guile.cc (parse_symbol_list): strip spaces at the end. * lily/stem.cc: remove #'up-to-staff ; use #'stem-end-position for forcing up to staff. remove #'support-head property (brew_molecule): small cleanup. (flag): remove #'grace property. --- diff --git a/ChangeLog b/ChangeLog index 428b85ea91..8267371e92 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2003-09-30 Han-Wen Nienhuys + * ly/params-init.ly (blotdiameter): set blotdiameter to 2/3 of + stafflinethickness (in the default) + + * lily/stem.cc (brew_molecule): use round_filled_box for stem. + * lily/lily-guile.cc (parse_symbol_list): strip spaces at the end. * Documentation/topdocs/INSTALL.texi (Top): reorder. diff --git a/lily/grob-interface.cc b/lily/grob-interface.cc index a2ae4b8389..18f699c4a4 100644 --- a/lily/grob-interface.cc +++ b/lily/grob-interface.cc @@ -59,7 +59,6 @@ check_interfaces_for_property (Grob const *me, SCM sym) } SCM ifs = me->get_grob_property ("interfaces"); - bool found = false; for (; !found && gh_pair_p (ifs); ifs =gh_cdr (ifs)) { diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index fe940add80..a91937a2ff 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -188,7 +188,7 @@ void add_scm_init_func (void (*f) ()) void -ly_init_ly_module (void *data) +ly_init_ly_module (void *) { for (int i=scm_init_funcs_->size () ; i--;) (scm_init_funcs_->elem (i)) (); diff --git a/lily/stem.cc b/lily/stem.cc index 10b2eccc6b..e3740bf96d 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -735,9 +735,12 @@ Stem::brew_molecule (SCM smob) Real stem_width = gh_scm2double (me->get_grob_property ("thickness")) // URG * me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness")); - - Molecule ss =Lookup::filledbox (Box (Interval (-stem_width/2, stem_width/2), - Interval (stem_y[DOWN]*dy, stem_y[UP]*dy))); + Real blot = + me->get_paper ()->get_realvar (ly_symbol2scm ("blotdiameter")); + Box b = Box (Interval (-stem_width/2, stem_width/2), + Interval (stem_y[DOWN]*dy, stem_y[UP]*dy)); + + Molecule ss = Lookup::round_filled_box (b, blot); mol.add_molecule (ss); } diff --git a/ly/params-init.ly b/ly/params-init.ly index fca26b7b3c..c38b63d05a 100644 --- a/ly/params-init.ly +++ b/ly/params-init.ly @@ -25,8 +25,9 @@ ledgerlinethickness = #(* 2.0 linethickness) -% blotdiameter = 0.4 \pt -blotdiameter = 0.04 \pt +% 2/3 stafflinethickness in 20pt staffheight +% this parameter is independent of the output size. +blotdiameter = 0.33 \pt interscoreline = 4. \mm