X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-head.cc;h=63bc9c342c3ab530f91018025c31155418c395d1;hb=39a23d0f6910fd0359655518ce05ad0f6bc5f73f;hp=74ee76e7321d8939672413ea157f57dcbcf1e74e;hpb=c76d27c59244a331a2873a40e0d7e40ad378d4b8;p=lilypond.git diff --git a/lily/note-head.cc b/lily/note-head.cc index 74ee76e732..63bc9c342c 100644 --- a/lily/note-head.cc +++ b/lily/note-head.cc @@ -3,18 +3,20 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2004 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys */ + +#include "note-head.hh" + #include -#include +#include +#include "directional-element-interface.hh" #include "staff-symbol.hh" #include "misc.hh" #include "dots.hh" -#include "note-head.hh" #include "warn.hh" #include "font-interface.hh" -#include "stencil.hh" #include "event.hh" #include "rhythmic-head.hh" #include "staff-symbol-referencer.hh" @@ -25,9 +27,9 @@ clean up the mess left by ledger line handling. */ static Stencil -internal_print (Grob *me) +internal_print (Grob *me, String *font_char) { - SCM style = me->get_property ("style"); + SCM style = me->get_property ("style"); if (!scm_is_symbol (style)) { return Stencil (); @@ -36,71 +38,52 @@ internal_print (Grob *me) 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); - Font_metric * fm = Font_interface::get_default_font (me); - Stencil out = fm->find_by_name (font_char); - if (out.is_empty ()) + Font_metric *fm = Font_interface::get_default_font (me); + + Direction stem_dir = CENTER; + if (Grob *stem = unsmob_grob (me->get_property ("stem"))) { - me->warning (_f ("note head `%s' not found", font_char.to_str0 ())); + stem_dir = get_grob_direction (stem); + if (stem_dir == CENTER) + programming_error ("must have stem dir for note head"); } - return out; -} - + Stencil out; -MAKE_SCHEME_CALLBACK (Note_head,print,1); -SCM -Note_head::print (SCM smob) -{ - Grob *me = unsmob_grob (smob); - - return internal_print (me).smobbed_copy (); -} - -/* - Compute the width the head without ledgers. + 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); + } - -- 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) + if (out.is_empty ()) { - Stencil mol = internal_print (me); - - if (!mol.is_empty ()) - return mol.extent (a); + me->warning (_f ("note head `%s' not found", idx.to_str0 ())); } else { - Stencil * mol = me->get_stencil (); - if (mol) - return mol->extent (a) ; + *font_char = idx; } - - return Interval (0,0); + + return out; } -/* - 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); +MAKE_SCHEME_CALLBACK (Note_head, print, 1); SCM -Note_head::extent (SCM smob, SCM axis) +Note_head::print (SCM smob) { Grob *me = unsmob_grob (smob); - return ly_interval2scm (head_extent (me, (Axis) scm_to_int (axis))); + String idx; + return internal_print (me, &idx).smobbed_copy (); } -MAKE_SCHEME_CALLBACK (Note_head,brew_ez_stencil,1); +MAKE_SCHEME_CALLBACK (Note_head, brew_ez_stencil, 1); SCM Note_head::brew_ez_stencil (SCM smob) { @@ -111,12 +94,12 @@ Note_head::brew_ez_stencil (SCM smob) SCM cause = me->get_property ("cause"); SCM spitch = unsmob_music (cause)->get_property ("pitch"); - Pitch* pit = unsmob_pitch (spitch); + 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)) + if (scm_is_vector (names)) charstr = scm_vector_ref (names, idx); else { @@ -129,7 +112,7 @@ Note_head::brew_ez_stencil (SCM smob) SCM at = scm_list_n (ly_symbol2scm ("ez-ball"), charstr, scm_int2num (b), - scm_int2num (1-b), + scm_int2num (1 - b), SCM_UNDEFINED); Box bx (Interval (0, 1.0), Interval (-0.5, 0.5)); Stencil m (bx, at); @@ -137,62 +120,52 @@ Note_head::brew_ez_stencil (SCM smob) return m.smobbed_copy (); } - 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); - + Font_metric *fm = Font_interface::get_default_font (me); + if (brewer == Note_head::print_proc) { - SCM style = me->get_property ("style"); - if (!scm_is_symbol (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) ; + String key; + internal_print (me, &key); + int k = fm->name_to_index (key); if (k >= 0) { Box b = fm->get_indexed_char (k); - Offset wxwy = fm->get_indexed_wxwy (k); + Offset wxwy = fm->attachment_point (key); 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 result = scm_call_2 (v, me->self_scm (), scm_int2num (a)); - if (!ly_c_pair_p (result)) + if (!scm_is_pair (result)) return 0.0; - result = (a == X_AXIS) ? ly_car (result) : ly_cdr (result); - - return robust_scm2double (result,0); + result = (a == X_AXIS) ? scm_car (result) : scm_cdr (result); + + return robust_scm2double (result, 0); } int -Note_head::get_balltype (Grob*me) +Note_head::get_balltype (Grob *me) { SCM s = me->get_property ("duration-log"); return scm_is_number (s) ? scm_to_int (s)