X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-head.cc;h=3f446eeff73d9caaffbcf351cf77acb8e31a033b;hb=a640ea0e23770a906ec19eda0a67e556b49597fe;hp=f8e9195607db8d576ef0cfd11cf07ab1e48c61a9;hpb=82731e802565546441c401a84a13b486e54eb760;p=lilypond.git diff --git a/lily/note-head.cc b/lily/note-head.cc index f8e9195607..3f446eeff7 100644 --- a/lily/note-head.cc +++ b/lily/note-head.cc @@ -3,118 +3,155 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys + (c) 1997--2009 Han-Wen Nienhuys */ -#include "misc.hh" -#include "dots.hh" #include "note-head.hh" -#include "debug.hh" -#include "lookup.hh" -#include "molecule.hh" -#include "musical-request.hh" -#include "stem.hh" - -void -Note_head::flip_around_stem (Direction d) -{ - translate_axis (do_width ().length () * d, X_AXIS); -} -Note_head::Note_head () -{ -} +#include +#include +#include // min, max + +using namespace std; + +#include "directional-element-interface.hh" +#include "font-interface.hh" +#include "international.hh" +#include "warn.hh" +#include "grob.hh" -void -Note_head::do_pre_processing () +static Stencil +internal_print (Grob *me, string *font_char) { - Rhythmic_head::do_pre_processing (); + SCM style = me->get_property ("style"); + if (!scm_is_symbol (style)) + style = ly_symbol2scm ("default"); - // 8 ball looks the same as 4 ball: - String type; - SCM style = get_elt_property ("style"); - if (style != SCM_UNDEFINED) + string suffix = to_string (min (robust_scm2int (me->get_property ("duration-log"), 2), 2)); + if (style != ly_symbol2scm ("default")) { - type = ly_scm2string (style); + SCM gn = me->get_property ("glyph-name"); + if (scm_is_string (gn)) + suffix = ly_scm2string (gn); } - - - if (balltype_i_ > 2 || type == "harmonic" || type == "cross") - balltype_i_ = 2; - if (dots_l_) // move into Rhythmic_head? - dots_l_->set_position(int (position_f ())); + Font_metric *fm = Font_interface::get_default_font (me); - -} + string idx_symmetric; + string idx_directed; + string idx_either; + idx_symmetric = idx_either = "noteheads.s" + suffix; + Stencil out = fm->find_by_name (idx_symmetric); + 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"); + + idx_directed = idx_either = + prefix + ((stem_dir == UP) ? "u" : "d") + suffix; + out = fm->find_by_name (idx_directed); + } -int -Note_head::compare (Note_head *const &a, Note_head * const &b) -{ - return sign(a->position_f () - b->position_f ()); + if (out.is_empty ()) + { + me->warning (_f ("none of note heads `%s' or `%s' found", + idx_symmetric.c_str (), idx_directed.c_str ())); + out = Stencil (Box (Interval (0, 0), Interval (0, 0)), SCM_EOL); + } + else + *font_char = idx_either; + + return out; } -/** - Don't account for ledgerlines in the width. +/* + TODO: make stem X-parent of notehead. */ -Interval -Note_head::do_width () const +MAKE_SCHEME_CALLBACK (Note_head, stem_x_shift, 1); +SCM +Note_head::stem_x_shift (SCM smob) { - return make_molecule ().dim_[X_AXIS]; -} + Grob *me = unsmob_grob (smob); + Grob *stem = unsmob_grob (me->get_object ("stem")); + if (stem) + (void) stem->get_property ("positioning-done"); -Molecule -Note_head::make_molecule () const -{ - String type; - SCM style = get_elt_property ("style"); - if (style != SCM_UNDEFINED) - { - type = ly_scm2string (style); - } - - return lookup_l()->afm_find (String ("noteheads-") - + to_str (balltype_i_) + type); + return scm_from_int (0); } -Molecule* -Note_head::do_brew_molecule_p() const +MAKE_SCHEME_CALLBACK (Note_head, print, 1); +SCM +Note_head::print (SCM smob) { - Real inter_f = staff_line_leading_f ()/2; - int sz = lines_i ()-1; + Grob *me = unsmob_grob (smob); - int streepjes_i = abs (position_f ()) < sz - ? 0 - : (abs((int)position_f ()) - sz) /2; - - Molecule* out = new Molecule (make_molecule ()); + string idx; + return internal_print (me, &idx).smobbed_copy (); +} - Box b = out->dim_; +Real +Note_head::stem_attachment_coordinate (Grob *me, Axis a) +{ + Offset off = robust_scm2offset (me->get_property ("stem-attachment"), + Offset (0,0)); + + return off [a]; +} - if (streepjes_i) +Offset +Note_head::get_stem_attachment (Font_metric *fm, string key) +{ + Offset att; + + int k = fm->name_to_index (key); + if (k >= 0) { - Direction dir = (Direction)sign (position_f ()); - Interval hd = out->dim_[X_AXIS]; - Real hw = hd.length ()/4; - - Molecule ledger - = lookup_l ()->ledger_line (Interval (hd[LEFT] - hw, - hd[RIGHT] + hw)); - - int parity = abs(int (position_f ())) % 2; - - for (int i=0; i < streepjes_i; i++) + Box b = fm->get_indexed_char (k); + Offset wxwy = fm->attachment_point (key); + for (int i = X_AXIS ; i < NO_AXES; i++) { - Molecule s (ledger); - s.translate_axis (-dir * inter_f * (i*2 + parity), - Y_AXIS); - out->add_molecule (s); + Axis a = Axis (i); + + Interval v = b[a]; + if (!v.is_empty ()) + { + att[a] = (2 * (wxwy[a] - v.center ()) / v.length ()); + } } } - out->dim_ = b; - return out; + return att; +} + +MAKE_SCHEME_CALLBACK (Note_head, calc_stem_attachment, 1); +SCM +Note_head::calc_stem_attachment (SCM smob) +{ + Grob *me = unsmob_grob (smob); + Font_metric *fm = Font_interface::get_default_font (me); + string key; + internal_print (me, &key); + + return ly_offset2scm (get_stem_attachment (fm, key)); } + +ADD_INTERFACE (Note_head, + "A note head. There are many possible values for" + " @code{style}. For a complete list, see" + " @ruser{Note head styles}.", + + /* properties */ + "note-names " + "accidental-grob " + "glyph-name " + "stem-attachment " + "style " + ); +