X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-head.cc;h=17db761f2f88463a97463fc3b02a6abffa00a7ce;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=9f2dff2c80782b72bcbd1fb0927e961b7751c8ec;hpb=0849262a1fd57ad3e68d879e7d129a3bf99273cd;p=lilypond.git diff --git a/lily/note-head.cc b/lily/note-head.cc index 9f2dff2c80..17db761f2f 100644 --- a/lily/note-head.cc +++ b/lily/note-head.cc @@ -3,174 +3,153 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2004 Han-Wen Nienhuys + (c) 1997--2008 Han-Wen Nienhuys */ #include "note-head.hh" -#include +#include #include +#include // min, max + +using namespace std; #include "directional-element-interface.hh" -#include "staff-symbol.hh" -#include "misc.hh" -#include "dots.hh" -#include "warn.hh" #include "font-interface.hh" -#include "event.hh" -#include "rhythmic-head.hh" -#include "staff-symbol-referencer.hh" -#include "lookup.hh" -#include "output-def.hh" +#include "international.hh" +#include "warn.hh" +#include "grob.hh" -/* - clean up the mess left by ledger line handling. -*/ static Stencil -internal_print (Grob *me, String * font_char) +internal_print (Grob *me, string *font_char) { - SCM style = me->get_property ("style"); + SCM style = me->get_property ("style"); if (!scm_is_symbol (style)) + style = ly_symbol2scm ("default"); + + string suffix = to_string (min (robust_scm2int (me->get_property ("duration-log"), 2), 2)); + if (style != ly_symbol2scm ("default")) { - return Stencil (); + SCM gn = me->get_property ("glyph-name"); + if (scm_is_string (gn)) + suffix = ly_scm2string (gn); } - 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); + Font_metric *fm = Font_interface::get_default_font (me); - Font_metric * fm = Font_interface::get_default_font (me); - - Direction stem_dir = CENTER; - if (Grob *stem = unsmob_grob (me->get_property ("stem"))) + 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 ()) { - stem_dir = get_grob_direction (stem); + 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"); - } + 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); } - - 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 ())); + 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; - } + *font_char = idx_either; return out; } - -MAKE_SCHEME_CALLBACK (Note_head,print,1); +/* + TODO: make stem X-parent of notehead. + */ +MAKE_SCHEME_CALLBACK (Note_head, stem_x_shift, 1); SCM -Note_head::print (SCM smob) +Note_head::stem_x_shift (SCM smob) { Grob *me = unsmob_grob (smob); + Grob *stem = unsmob_grob (me->get_object ("stem")); + if (stem) + (void) stem->get_property ("positioning-done"); - String idx; - return internal_print (me, &idx).smobbed_copy (); + return scm_from_int (0); } - -MAKE_SCHEME_CALLBACK (Note_head,brew_ez_stencil,1); +MAKE_SCHEME_CALLBACK (Note_head, print, 1); SCM -Note_head::brew_ez_stencil (SCM smob) +Note_head::print (SCM smob) { Grob *me = unsmob_grob (smob); - int l = Note_head::get_balltype (me); - - 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 - { - 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 (); + string idx; + return internal_print (me, &idx).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); + Offset off = robust_scm2offset (me->get_property ("stem-attachment"), + Offset (0,0)); - if (brewer == Note_head::print_proc) - { - String key; - internal_print (me, &key); + return off [a]; +} - int k = fm->name_to_index (key) ; - if (k >= 0) +Offset +Note_head::get_stem_attachment (Font_metric *fm, string key) +{ + Offset att; + + 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++) { - Box b = fm->get_indexed_char (k); - Offset wxwy = fm->attachment_point (key); + Axis a = Axis (i); + Interval v = b[a]; if (!v.is_empty ()) - return 2 * (wxwy[a] - v.center ()) / v.length (); + { + att[a] = (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 (!scm_is_pair (result)) - return 0.0; - result = (a == X_AXIS) ? scm_car (result) : scm_cdr (result); - - return robust_scm2double (result,0); + return att; } -int -Note_head::get_balltype (Grob*me) +MAKE_SCHEME_CALLBACK (Note_head, calc_stem_attachment, 1); +SCM +Note_head::calc_stem_attachment (SCM smob) { - SCM s = me->get_property ("duration-log"); - return scm_is_number (s) ? scm_to_int (s)