X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-head.cc;h=08f52e2df69e3cd744b73731d1e34aa9ce1ead7d;hb=ce6631d3228ee491574ed841abc0ae06dc22f6e4;hp=b58c23cf20eca228bd81baa97cf0f1af16b56c3f;hpb=0817e0513d1016ff22a633b6fee20ddba2a062f2;p=lilypond.git diff --git a/lily/note-head.cc b/lily/note-head.cc index b58c23cf20..08f52e2df6 100644 --- a/lily/note-head.cc +++ b/lily/note-head.cc @@ -3,162 +3,137 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ #include +#include +#include "staff-symbol.hh" #include "misc.hh" #include "dots.hh" #include "note-head.hh" -#include "debug.hh" +#include "warn.hh" #include "font-interface.hh" -#include "molecule.hh" -#include "musical-request.hh" - +#include "stencil.hh" +#include "event.hh" +#include "rhythmic-head.hh" #include "staff-symbol-referencer.hh" +#include "lookup.hh" +#include "output-def.hh" /* - build a ledger line for small pieces. - */ -Molecule -Note_head::ledger_line (Interval xwid, Grob *me) + clean up the mess left by ledger line handling. +*/ +static Stencil +internal_print (Grob *me) { - Drul_array endings; - endings[LEFT] = Font_interface::get_default_font (me)->find_by_name ("noteheads-ledgerending"); - Molecule *e = &endings[LEFT]; - endings[RIGHT] = *e; - - Real thick = e->extent (Y_AXIS).length (); - Real len = e->extent (X_AXIS).length () - thick; - - Molecule total; - Direction d = LEFT; - do { - endings[d].translate_axis (xwid[d] - endings[d].extent (X_AXIS)[d], X_AXIS); - total.add_molecule (endings[d]); - } while ((flip (&d)) != LEFT); - - Real xpos = xwid [LEFT] + len; - - while (xpos + len + thick /2 <= xwid[RIGHT]) + SCM style = me->get_property ("style"); + if (!ly_c_symbol_p (style)) { - e->translate_axis (len, X_AXIS); - total.add_molecule (*e); - xpos += len; + return Stencil (); } - return total; -} - - -Molecule -Note_head::ledger_lines (Grob*me, int count, Direction dir, Interval idw) -{ - Real inter_f = Staff_symbol_referencer::staff_space (me)/2; - Molecule ledger (ledger_line (idw, me)); - - ledger.set_empty (true); - Real offs = (Staff_symbol_referencer::on_staffline (me)) - ? 0.0 - : -dir * inter_f; + SCM log = scm_int2num (Note_head::get_balltype (me)); + SCM proc = me->get_property ("glyph-name-procedure"); + SCM scm_font_char = scm_call_2 (proc, log, style); + String font_char = "noteheads-" + ly_scm2string (scm_font_char); - Molecule legs; - for (int i=0; i < count; i++) + Font_metric * fm = Font_interface::get_default_font (me); + Stencil out = fm->find_by_name (font_char); + if (out.is_empty ()) { - Molecule s (ledger); - s.translate_axis (-dir * inter_f * i*2 + offs, - Y_AXIS); - legs.add_molecule (s); + me->warning (_f ("note head `%s' not found", font_char.to_str0 ())); } - return legs; + return out; } -MAKE_SCHEME_CALLBACK (Note_head,brew_molecule,1); +MAKE_SCHEME_CALLBACK (Note_head,print,1); SCM -Note_head::brew_molecule (SCM smob) +Note_head::print (SCM smob) { Grob *me = unsmob_grob (smob); - int sz = Staff_symbol_referencer::line_count (me)-1; - int p = (int) rint (Staff_symbol_referencer::position_f (me)); - int streepjes_i = abs (p) < sz - ? 0 - : (abs (p) - sz) /2; - - SCM style = me->get_grob_property ("style"); - if (!gh_symbol_p (style)) - { - return SCM_EOL; - } - - /* - ugh: use gh_call () / scm_apply (). + return internal_print (me).smobbed_copy (); +} - UGH: use grob-property. - */ - SCM log = me->get_grob_property ("duration-log"); - SCM exp = scm_list_n (ly_symbol2scm ("find-notehead-symbol"), log, - ly_quote_scm (style), - SCM_UNDEFINED); - String name = "noteheads-" + ly_scm2string (scm_primitive_eval (exp)); - Molecule out = Font_interface::get_default_font (me)->find_by_name (name); +/* + Compute the width the head without ledgers. + -- there used to be some code from the time that ledgers + did take space. Nowadays, we can simply take the standard extent. + */ +Interval +Note_head::head_extent (Grob *me, Axis a) +{ + SCM brewer = me->get_property ("print-function"); + if (brewer == Note_head::print_proc) + { + Stencil mol = internal_print (me); - if (streepjes_i) + if (!mol.is_empty ()) + return mol.extent (a); + } + else { - Direction dir = (Direction)sign (p); - Interval hd = out.extent (X_AXIS); - Real hw = hd.length ()/4; - out.add_molecule (ledger_lines (me, streepjes_i, dir, - Interval (hd[LEFT] - hw, - hd[RIGHT] + hw))); + Stencil * mol = me->get_stencil (); + if (mol) + return mol->extent (a) ; } - return out.smobbed_copy (); + return Interval (0,0); } -bool -Note_head::has_interface (Grob*m) +/* + This is necessary to prevent a cyclic dependency: the appearance of + the ledgers depends on positioning, so the Grob::get_stencil () can + not be used for determining the note head extent. + + */ +MAKE_SCHEME_CALLBACK (Note_head,extent,2); +SCM +Note_head::extent (SCM smob, SCM axis) { - return m&& m->has_interface (ly_symbol2scm ("note-head-interface")); -} - + Grob *me = unsmob_grob (smob); -MAKE_SCHEME_CALLBACK (Note_head,brew_ez_molecule,1); + return ly_interval2scm (head_extent (me, (Axis) ly_scm2int (axis))); +} +MAKE_SCHEME_CALLBACK (Note_head,brew_ez_stencil,1); SCM -Note_head::brew_ez_molecule (SCM smob) +Note_head::brew_ez_stencil (SCM smob) { Grob *me = unsmob_grob (smob); - int l = gh_scm2int (me->get_grob_property ("duration-log")); + int l = Note_head::get_balltype (me); int b = (l >= 2); - SCM at = scm_list_n (ly_symbol2scm ("ez-ball"), - me->get_grob_property ("note-character"), - gh_int2scm (b), - gh_int2scm (1-b), - SCM_UNDEFINED); - Box bx (Interval (0, 1.0), Interval (-0.5, 0.5)); - Molecule m (bx, at); - int p = (int) rint (Staff_symbol_referencer::position_f (me)); - - int sz = Staff_symbol_referencer::line_count (me)-1; - int streepjes_i = abs (p) < sz - ? 0 - : (abs (p) - sz) /2; - - if (streepjes_i) - { - Direction dir = (Direction)sign (p); - Interval hd = m.extent (X_AXIS); - Real hw = hd.length ()/4; - m.add_molecule (ledger_lines (me, streepjes_i, dir, - Interval (hd[LEFT] - hw, - hd[RIGHT] + hw))); + + SCM cause = me->get_property ("cause"); + SCM spitch = unsmob_music (cause)->get_property ("pitch"); + Pitch* pit = unsmob_pitch (spitch); + + SCM idx = scm_int2num (pit->get_notename ()); + SCM names = me->get_property ("note-names"); + SCM charstr = SCM_EOL; + if (ly_c_vector_p (names)) + charstr = scm_vector_ref (names, idx); + else + { + char s[2] = "a"; + s[0] = (pit->get_notename () + 2)%7 + 'a'; + s[0] = toupper (s[0]); + charstr = scm_makfrom0str (s); } + SCM at = scm_list_n (ly_symbol2scm ("ez-ball"), + charstr, + scm_int2num (b), + scm_int2num (1-b), + SCM_UNDEFINED); + Box bx (Interval (0, 1.0), Interval (-0.5, 0.5)); + Stencil m (bx, at); + return m.smobbed_copy (); } @@ -166,18 +141,58 @@ Note_head::brew_ez_molecule (SCM smob) Real Note_head::stem_attachment_coordinate (Grob *me, Axis a) { - SCM v = me->get_grob_property ("stem-attachment-function"); - - if (!gh_procedure_p (v)) + SCM brewer = me->get_property ("print-function"); + Font_metric * fm = Font_interface::get_default_font (me); + + if (brewer == Note_head::print_proc) + { + SCM style = me->get_property ("style"); + if (!ly_c_symbol_p (style)) + { + return 0.0; + } + + SCM log = scm_int2num (Note_head::get_balltype (me)); + SCM proc = me->get_property ("glyph-name-procedure"); + SCM scm_font_char = scm_call_2 (proc, log, style); + String font_char = "noteheads-" + ly_scm2string (scm_font_char); + + int k = fm->name_to_index (font_char) ; + + if (k >= 0) + { + Box b = fm->get_indexed_char (k); + Offset wxwy = fm->get_indexed_wxwy (k); + Interval v = b[a]; + if (!v.is_empty ()) + return 2 * (wxwy[a] - v.center ()) / v.length (); + } + } + + /* + Fallback + */ + SCM v = me->get_property ("stem-attachment-function"); + if (!ly_c_procedure_p (v)) return 0.0; - - SCM st = me->get_grob_property ("style"); - SCM result = gh_apply (v, scm_list_n (st, SCM_UNDEFINED)); - - if (!gh_pair_p (result)) + + SCM result = scm_call_2 (v, me->self_scm (), scm_int2num (a)); + if (!ly_c_pair_p (result)) return 0.0; result = (a == X_AXIS) ? ly_car (result) : ly_cdr (result); - return gh_number_p (result) ? gh_scm2double (result) : 0.0; + return robust_scm2double (result,0); +} + +int +Note_head::get_balltype (Grob*me) +{ + SCM s = me->get_property ("duration-log"); + return ly_c_number_p (s) ? ly_scm2int (s)