X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-head.cc;h=63bc9c342c3ab530f91018025c31155418c395d1;hb=39a23d0f6910fd0359655518ce05ad0f6bc5f73f;hp=01276185ebb6b61998c13da7e27bbbce2f70e9a4;hpb=5ca271301d3af557f4720223736dc2d7b981c12b;p=lilypond.git diff --git a/lily/note-head.cc b/lily/note-head.cc index 01276185eb..63bc9c342c 100644 --- a/lily/note-head.cc +++ b/lily/note-head.cc @@ -3,260 +3,169 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2002 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 "debug.hh" +#include "warn.hh" #include "font-interface.hh" -#include "molecule.hh" -#include "musical-request.hh" +#include "event.hh" #include "rhythmic-head.hh" - -/* - Note_head contains the code for printing note heads. - - Ledger lines: - - It also contains the ledger lines, for historical reasons. Ledger - lines are somewhat of a PITA. In some cases, they take up no space, in - some cases they don't: - - DO take space: - - - when ledgered notes are juxtaposed: there should be some white - space between the ledger lines. - - - when accidentals are near: the accidentals should not be on the - ledger lines - - [both tips by Heinz Stolba from Universal Edition]. - - DO NOT take space into account: - - - for basically everything else, e.g. swapping ledgered notes on - clustered chords, spacing between ledgered and unledgered notes. - - TODO: fix this. It is not feasible to have a special grob for - ledgers, since you basically don't know if there will be ledgers, - unless you know at interpretation phase already 1. the Y-position, - 2. the number of staff lines. It's not yet specced when both pieces - of information are there, so for now, it is probably better to build - special support for ledgers into the accidental and separation-item - code. - - (Besides a separate ledger seems overkill. For what else would - it be useful?) - -*/ - #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); - - Real xpos = xwid [LEFT] + len; - - while (xpos + len + thick /2 <= xwid[RIGHT]) + SCM style = me->get_property ("style"); + if (!scm_is_symbol (style)) { - e->translate_axis (len, X_AXIS); - total.add_molecule (*e); - xpos += len; + return Stencil (); } - return total; -} - + 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); -Molecule -Note_head::ledger_lines (Grob*me, - bool take_space, - int count, Direction dir, Interval idw) -{ - Real inter_f = Staff_symbol_referencer::staff_space (me)/2; - - /* - idw ? + Font_metric *fm = Font_interface::get_default_font (me); - (who's that ? :-) - - - --hwn - */ - Molecule ledger (ledger_line (idw, me)); - - if (!take_space) - ledger.set_empty (true); - - Real offs = (Staff_symbol_referencer::on_staffline (me)) - ? 0.0 - : -dir * inter_f; - - Molecule legs; - for (int i=0; i < count; i++) + Direction stem_dir = CENTER; + if (Grob *stem = unsmob_grob (me->get_property ("stem"))) { - Molecule s (ledger); - s.translate_axis (-dir * inter_f * i*2 + offs, - Y_AXIS); - legs.add_molecule (s); + stem_dir = get_grob_direction (stem); + if (stem_dir == CENTER) + programming_error ("must have stem dir for note head"); } - return legs; -} - -Molecule -internal_brew_molecule (Grob *me, bool ledger_take_space) -{ - 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; + Stencil out; - SCM style = me->get_grob_property ("style"); - if (!gh_symbol_p (style)) + 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 ()) { - return Molecule(); + idx = prefix + "s" + ly_scm2string (scm_font_char); + out = fm->find_by_name (idx); } - /* - ugh: use gh_call () / scm_apply (). - - 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); - - if (streepjes_i) + if (out.is_empty ()) + { + me->warning (_f ("note head `%s' not found", idx.to_str0 ())); + } + else { - Direction dir = (Direction)sign (p); - Interval hd = out.extent (X_AXIS); - Real hw = hd.length ()/4; - out.add_molecule (Note_head::ledger_lines (me, ledger_take_space, streepjes_i, dir, - Interval (hd[LEFT] - hw, - hd[RIGHT] + hw))); + *font_char = idx; } + return out; } - -MAKE_SCHEME_CALLBACK (Note_head,brew_molecule,1); +MAKE_SCHEME_CALLBACK (Note_head, print, 1); SCM -Note_head::brew_molecule (SCM smob) +Note_head::print (SCM smob) { Grob *me = unsmob_grob (smob); - /* - ledgers don't take space. See top of file. - */ - return internal_brew_molecule (me, false).smobbed_copy (); + String idx; + return internal_print (me, &idx).smobbed_copy (); } -/* - Compute the width the head without ledgers. - */ -Interval -Note_head::head_extent (Grob *me, Axis a) -{ - return internal_brew_molecule (me, false).extent (a); -} - -bool -Note_head::has_interface (Grob*m) -{ - return m&& m->has_interface (ly_symbol2scm ("note-head-interface")); -} - - -MAKE_SCHEME_CALLBACK (Note_head,brew_ez_molecule,1); - +MAKE_SCHEME_CALLBACK (Note_head, brew_ez_stencil, 1); SCM -Note_head::brew_ez_molecule (SCM smob) +Note_head::brew_ez_stencil (SCM smob) { Grob *me = unsmob_grob (smob); - int l = Rhythmic_head::balltype_i (me); + int l = Note_head::get_balltype (me); int b = (l >= 2); - SCM cause = me->get_grob_property ("cause"); - SCM spitch = unsmob_music (cause)->get_mus_property ("pitch"); - Pitch* pit = unsmob_pitch (spitch); + SCM cause = me->get_property ("cause"); + SCM spitch = unsmob_music (cause)->get_property ("pitch"); + Pitch *pit = unsmob_pitch (spitch); - char s[2] = "a"; - s[0] = (pit->notename_i_ + 2)%7 + 'a'; - s[0] = toupper (s[0]); - - SCM charstr = ly_str02scm (s); + 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, - gh_int2scm (b), - gh_int2scm (1-b), + scm_int2num (b), + scm_int2num (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; + Stencil m (bx, at); - 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, false, streepjes_i, dir, - Interval (hd[LEFT] - hw, - hd[RIGHT] + hw))); - } - return m.smobbed_copy (); } - Real Note_head::stem_attachment_coordinate (Grob *me, Axis a) { - SCM v = me->get_grob_property ("stem-attachment-function"); + SCM brewer = me->get_property ("print-function"); + Font_metric *fm = Font_interface::get_default_font (me); - if (!gh_procedure_p (v)) - return 0.0; + if (brewer == Note_head::print_proc) + { + 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->attachment_point (key); + Interval v = b[a]; + if (!v.is_empty ()) + return 2 * (wxwy[a] - v.center ()) / v.length (); + } + } - SCM st = me->get_grob_property ("style"); - SCM result = gh_apply (v, scm_list_n (st, SCM_UNDEFINED)); + /* + Fallback + */ + SCM v = me->get_property ("stem-attachment-function"); + if (!ly_c_procedure_p (v)) + return 0.0; - if (!gh_pair_p (result)) + SCM result = scm_call_2 (v, me->self_scm (), scm_int2num (a)); + if (!scm_is_pair (result)) return 0.0; - result = (a == X_AXIS) ? ly_car (result) : ly_cdr (result); - - return gh_number_p (result) ? gh_scm2double (result) : 0.0; + result = (a == X_AXIS) ? scm_car (result) : scm_cdr (result); + + return robust_scm2double (result, 0); } + +int +Note_head::get_balltype (Grob *me) +{ + SCM s = me->get_property ("duration-log"); + return scm_is_number (s) ? scm_to_int (s)