X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-head.cc;h=63bc9c342c3ab530f91018025c31155418c395d1;hb=57be7394ffa2e7d7ba6d60548dba563f3409d472;hp=7c399f9d85c4e034eda57d305cb72a7aeeeb6568;hpb=df4a7c4a55148e065d878dcc2f7e09ac27ea9c32;p=lilypond.git diff --git a/lily/note-head.cc b/lily/note-head.cc index 7c399f9d85..63bc9c342c 100644 --- a/lily/note-head.cc +++ b/lily/note-head.cc @@ -3,109 +3,169 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys */ +#include "note-head.hh" + +#include +#include + +#include "directional-element-interface.hh" +#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 "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, String *font_char) { - 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; + SCM style = me->get_property ("style"); + if (!scm_is_symbol (style)) + { + return Stencil (); + } - 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); + 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); - Real xpos = xwid [LEFT] + len; + Font_metric *fm = Font_interface::get_default_font (me); - while (xpos + len + thick /2 <= xwid[RIGHT]) + Direction stem_dir = CENTER; + if (Grob *stem = unsmob_grob (me->get_property ("stem"))) + { + stem_dir = get_grob_direction (stem); + if (stem_dir == CENTER) + programming_error ("must have stem dir for note head"); + } + + Stencil out; + + String prefix = "noteheads."; + String idx + = prefix + ((stem_dir == UP) ? "u" : "d") + ly_scm2string (scm_font_char); + out = fm->find_by_name (idx); + if (out.is_empty ()) + { + idx = prefix + "s" + ly_scm2string (scm_font_char); + out = fm->find_by_name (idx); + } + + if (out.is_empty ()) + { + me->warning (_f ("note head `%s' not found", idx.to_str0 ())); + } + else { - e->translate_axis (len, X_AXIS); - total.add_molecule (*e); - xpos += len; + *font_char = idx; } - return total; + return out; } +MAKE_SCHEME_CALLBACK (Note_head, print, 1); +SCM +Note_head::print (SCM smob) +{ + Grob *me = unsmob_grob (smob); -MAKE_SCHEME_CALLBACK(Note_head,brew_molecule,1); + String idx; + return internal_print (me, &idx).smobbed_copy (); +} +MAKE_SCHEME_CALLBACK (Note_head, brew_ez_stencil, 1); SCM -Note_head::brew_molecule (SCM smob) +Note_head::brew_ez_stencil (SCM smob) { - Grob *me = unsmob_element (smob); + Grob *me = unsmob_grob (smob); + int l = Note_head::get_balltype (me); - - Real inter_f = Staff_symbol_referencer::staff_space (me)/2; - int sz = Staff_symbol_referencer::line_count (me)-1; - int p = (int)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)) + int b = (l >= 2); + + 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 (scm_is_vector (names)) + charstr = scm_vector_ref (names, idx); + else { - return SCM_EOL; + 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 (); +} - // ugh: use gh_call () - Molecule out = Font_interface::get_default_font (me)->find_by_name (String ("noteheads-") + - ly_scm2string (scm_eval2 (gh_list (ly_symbol2scm("find-notehead-symbol"), - me->get_grob_property ("duration-log"), - ly_quote_scm(style), - SCM_UNDEFINED), - SCM_EOL))); +Real +Note_head::stem_attachment_coordinate (Grob *me, Axis a) +{ + SCM brewer = me->get_property ("print-function"); + Font_metric *fm = Font_interface::get_default_font (me); - if (streepjes_i) + if (brewer == Note_head::print_proc) { - Direction dir = (Direction)sign (p); - Interval hd = out.extent (X_AXIS); - Real hw = hd.length ()/4; - Molecule ledger (ledger_line (Interval (hd[LEFT] - hw, - hd[RIGHT] + hw), me)); - - - ledger.set_empty (true); - Real offs = (Staff_symbol_referencer::on_staffline (me)) - ? 0.0 - : -dir * inter_f; - - for (int i=0; i < streepjes_i; i++) + String key; + internal_print (me, &key); + + int k = fm->name_to_index (key); + if (k >= 0) { - Molecule s (ledger); - s.translate_axis (-dir * inter_f * i*2 + offs, - Y_AXIS); - out.add_molecule (s); + Box b = fm->get_indexed_char (k); + Offset wxwy = fm->attachment_point (key); + Interval v = b[a]; + if (!v.is_empty ()) + return 2 * (wxwy[a] - v.center ()) / v.length (); } } - return out.smobbed_copy(); + + /* + Fallback + */ + SCM v = me->get_property ("stem-attachment-function"); + if (!ly_c_procedure_p (v)) + return 0.0; + + SCM result = scm_call_2 (v, me->self_scm (), scm_int2num (a)); + if (!scm_is_pair (result)) + return 0.0; + + result = (a == X_AXIS) ? scm_car (result) : scm_cdr (result); + + return robust_scm2double (result, 0); } -bool -Note_head::has_interface (Grob*m) +int +Note_head::get_balltype (Grob *me) { - return m&& m->has_interface (ly_symbol2scm ("note-head-interface")); + SCM s = me->get_property ("duration-log"); + return scm_is_number (s) ? scm_to_int (s)