X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-head.cc;h=3b80b114ba0abb21a1e4944429138a15caa8b1af;hb=3a50ddfdd7fb6a85a5266ac4adf3ff9ee6d5d378;hp=9c894986e371603f37c1bfc91d7fdbb82b2ccb62;hpb=d4bd65ce87936a9b2abdbf941ad572bda4e76768;p=lilypond.git diff --git a/lily/note-head.cc b/lily/note-head.cc index 9c894986e3..3b80b114ba 100644 --- a/lily/note-head.cc +++ b/lily/note-head.cc @@ -3,182 +3,158 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys */ -#include +#include "note-head.hh" + +#include +#include +#include // min, max +using namespace std; + +#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 "music.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; - - 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 style = me->get_property ("style"); + if (!scm_is_symbol (style)) + style = ly_symbol2scm ("default"); - Real xpos = xwid [LEFT] + len; - - while (xpos + len + thick /2 <= xwid[RIGHT]) + String suffix = to_string (min (robust_scm2int (me->get_property ("duration-log"), 2), 2)); + if (style != ly_symbol2scm ("default")) { - e->translate_axis (len, X_AXIS); - total.add_molecule (*e); - xpos += len; + SCM gn = me->get_property ("glyph-name"); + if (scm_is_string (gn)) + suffix = ly_scm2string (gn); } - return total; -} + Font_metric *fm = Font_interface::get_default_font (me); + String idx = "noteheads.s" + suffix; -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)); + Stencil out = fm->find_by_name (idx); + if (out.is_empty ()) + { + String prefix = "noteheads."; + Grob *stem = unsmob_grob (me->get_object ("stem")); + Direction stem_dir = stem ? get_grob_direction (stem) : CENTER; + + if (stem_dir == CENTER) + programming_error ("must have stem dir for note head"); - ledger.set_empty (true); - Real offs = (Staff_symbol_referencer::on_staffline (me)) - ? 0.0 - : -dir * inter_f; + idx = prefix + ((stem_dir == UP) ? "u" : "d") + suffix; + out = fm->find_by_name (idx); + } - Molecule legs; - for (int i=0; i < count; i++) + 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", idx.to_str0 ())); + out = Stencil (Box (Interval (0, 0), Interval (0, 0)), SCM_EOL); } + else + *font_char = idx; - return legs; + return out; } -MAKE_SCHEME_CALLBACK (Note_head,brew_molecule,1); - +/* + TODO: make stem X-parent of notehead. + */ +MAKE_SCHEME_CALLBACK (Note_head, stem_x_shift, 2); SCM -Note_head::brew_molecule (SCM smob) +Note_head::stem_x_shift (SCM smob, SCM axis) { + (void) axis; + Grob *me = unsmob_grob (smob); + Grob *stem = unsmob_grob (me->get_object ("stem")); + if (stem) + (void) stem->get_property ("positioning-done"); - 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 scm_from_int (0); +} - UGH: use grob-property. - */ - SCM log = gh_int2scm (Rhythmic_head::balltype_i (me)); - 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); +MAKE_SCHEME_CALLBACK (Note_head, print, 1); +SCM +Note_head::print (SCM smob) +{ + Grob *me = unsmob_grob (smob); - - if (streepjes_i) - { - 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))); - } - - return out.smobbed_copy (); + String idx; + return internal_print (me, &idx).smobbed_copy (); } -bool -Note_head::has_interface (Grob*m) +Real +Note_head::stem_attachment_coordinate (Grob *me, Axis a) { - return m&& m->has_interface (ly_symbol2scm ("note-head-interface")); + Offset off = robust_scm2offset (me->get_property ("stem-attachment"), + Offset (0,0)); + + return off [a]; } - -MAKE_SCHEME_CALLBACK (Note_head,brew_ez_molecule,1); - +MAKE_SCHEME_CALLBACK(Note_head, calc_stem_attachment, 1); SCM -Note_head::brew_ez_molecule (SCM smob) +Note_head::calc_stem_attachment (SCM smob) { - Grob *me = unsmob_grob (smob); - int l = Rhythmic_head::balltype_i (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))); - } + Grob *me = unsmob_grob (smob); + Font_metric *fm = Font_interface::get_default_font (me); + String key; + internal_print (me, &key); + + Offset att; - return m.smobbed_copy (); + int k = fm->name_to_index (key); + if (k >= 0) + { + Box b = fm->get_indexed_char (k); + Offset wxwy = fm->attachment_point (key); + for (int i = X_AXIS ; i < NO_AXES; i++) + { + Axis a = Axis (i); + + Interval v = b[a]; + if (!v.is_empty ()) + { + att[a] = (2 * (wxwy[a] - v.center ()) / v.length ()); + } + } + } + + return ly_offset2scm (att); } -Real -Note_head::stem_attachment_coordinate (Grob *me, Axis a) +int +Note_head::get_balltype (Grob *me) { - SCM v = me->get_grob_property ("stem-attachment-function"); - - if (!gh_procedure_p (v)) - return 0.0; + SCM s = me->get_property ("duration-log"); + return scm_is_number (s) ? min (scm_to_int (s), 2) : 0; +} - SCM st = me->get_grob_property ("style"); - SCM result = gh_apply (v, scm_list_n (st, SCM_UNDEFINED)); +ADD_INTERFACE (Note_head, "note-head-interface", + "Note head", - if (!gh_pair_p (result)) - return 0.0; + /* properties */ + "note-names " + "accidental-grob " + "glyph-name " + "stem-attachment " + "style " + ); - result = (a == X_AXIS) ? ly_car (result) : ly_cdr (result); - - return gh_number_p (result) ? gh_scm2double (result) : 0.0; -}