X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-head.cc;h=5f86f6e401d7ee869fcab4062d4e02051aeda8a7;hb=15d8d2d6cbb2b56cbac9485578dd9d3e626fef92;hp=39aeb99c7a170ddcabc45fb44d392d601318c879;hpb=a6ee9dcd388111e842064a8d46ab06c4897a00d2;p=lilypond.git diff --git a/lily/note-head.cc b/lily/note-head.cc index 39aeb99c7a..5f86f6e401 100644 --- a/lily/note-head.cc +++ b/lily/note-head.cc @@ -3,257 +3,160 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2002 Han-Wen Nienhuys + (c) 1997--2006 Han-Wen Nienhuys */ -#include -#include -#include "misc.hh" -#include "dots.hh" #include "note-head.hh" -#include "warn.hh" + +#include +#include +#include // min, max +using namespace std; + +#include "directional-element-interface.hh" +#include "dots.hh" #include "font-interface.hh" -#include "molecule.hh" -#include "musical-request.hh" +#include "international.hh" +#include "lookup.hh" +#include "misc.hh" +#include "music.hh" +#include "output-def.hh" #include "rhythmic-head.hh" #include "staff-symbol-referencer.hh" -#include "lookup.hh" -#include "paper-def.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.hh" +#include "warn.hh" -Molecule -Note_head::brew_ledger_lines (Grob *me, - int pos, - int interspaces, - Interval x_extent, - bool take_space) +static Stencil +internal_print (Grob *me, string *font_char) { - Real inter_f = Staff_symbol_referencer::staff_space (me)/2; - int lines_i = abs (pos) < interspaces - ? 0 - : (abs (pos) - interspaces) / 2; - Molecule molecule = Molecule(); + SCM style = me->get_property ("style"); + if (!scm_is_symbol (style)) + style = ly_symbol2scm ("default"); - if (lines_i) + string suffix = to_string (min (robust_scm2int (me->get_property ("duration-log"), 2), 2)); + if (style != ly_symbol2scm ("default")) { - Real ledgerlinethickness = - (me->get_paper ()->get_var ("ledgerlinethickness")); - Real blotdiameter = ledgerlinethickness; - // (me->get_paper ()->get_var ("blotdiameter")); - Interval y_extent = - Interval (-0.5*(ledgerlinethickness), - +0.5*(ledgerlinethickness)); - Box ledger_line (x_extent, y_extent); - - Molecule proto_ledger_line = - Lookup::roundfilledbox (ledger_line, blotdiameter); - - if (!take_space) - proto_ledger_line.set_empty (true); - - Direction dir = (Direction)sign (pos); - Real offs = (Staff_symbol_referencer::on_staffline (me, pos)) - ? 0.0 - : -dir * inter_f; - for (int i = 0; i < lines_i; i++) - { - Molecule ledger_line (proto_ledger_line); - ledger_line.translate_axis (-dir * inter_f * i * 2 + offs, Y_AXIS); - molecule.add_molecule (ledger_line); - } + SCM gn = me->get_property ("glyph-name"); + if (scm_is_string (gn)) + suffix = ly_scm2string (gn); } - return molecule; -} + Font_metric *fm = Font_interface::get_default_font (me); -Molecule -internal_brew_molecule (Grob *me, bool ledger_take_space) -{ - SCM style = me->get_grob_property ("style"); - if (!gh_symbol_p (style)) + string idx = "noteheads.s" + suffix; + Stencil out = fm->find_by_name (idx); + if (out.is_empty ()) { - return Molecule(); + 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 = prefix + ((stem_dir == UP) ? "u" : "d") + suffix; + out = fm->find_by_name (idx); } - /* - ugh: use gh_call () / scm_apply (). - UGH: use grob-property. - */ - SCM log = gh_int2scm (Note_head::get_balltype (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 (out.empty_b()) + if (out.is_empty ()) { - warning (_f("Symbol not found, ", name.to_str0 ())); + me->warning (_f ("note head `%s' not found", idx.c_str ())); + out = Stencil (Box (Interval (0, 0), Interval (0, 0)), SCM_EOL); } - - int interspaces = Staff_symbol_referencer::line_count (me)-1; - int pos = (int)rint (Staff_symbol_referencer::get_position (me)); - if (abs (pos) - interspaces > 1) - { - Interval hd = out.extent (X_AXIS); - Real left_ledger_protusion = hd.length ()/4; - Real right_ledger_protusion = left_ledger_protusion; + else + *font_char = idx; - if (unsmob_grob(me->get_grob_property ("accidental-grob"))) - { - /* - make a little room for accidentals. - - TODO: this will look silly if a chord has ledger lines, - and only the bottom note has an accidental. - */ - - left_ledger_protusion *= 0.66; - right_ledger_protusion *= 0.9; - } - - Interval l_extents = Interval (hd[LEFT] - left_ledger_protusion, - hd[RIGHT] + right_ledger_protusion); - out.add_molecule (Note_head::brew_ledger_lines (me, pos, interspaces, - l_extents, - ledger_take_space)); - } 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, 1); SCM -Note_head::brew_molecule (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"); - /* - ledgers don't take space. See top of file. - */ - return internal_brew_molecule (me, false).smobbed_copy (); -} - -/* - Compute the width the head without ledgers. - - -- 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) -{ - return me->get_molecule()->extent (a); + return scm_from_int (0); } - - -MAKE_SCHEME_CALLBACK (Note_head,brew_ez_molecule,1); - +MAKE_SCHEME_CALLBACK (Note_head, print, 1); SCM -Note_head::brew_ez_molecule (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_grob_property ("cause"); - SCM spitch = unsmob_music (cause)->get_mus_property ("pitch"); - Pitch* pit = unsmob_pitch (spitch); + string idx; + return internal_print (me, &idx).smobbed_copy (); +} - char s[2] = "a"; - s[0] = (pit->notename_ + 2)%7 + 'a'; - s[0] = toupper (s[0]); - - SCM charstr = ly_str02scm (s); +Real +Note_head::stem_attachment_coordinate (Grob *me, Axis a) +{ + Offset off = robust_scm2offset (me->get_property ("stem-attachment"), + Offset (0,0)); - SCM at = scm_list_n (ly_symbol2scm ("ez-ball"), - charstr, - gh_int2scm (b), - gh_int2scm (1-b), - SCM_UNDEFINED); - Box bx (Interval (0, 1.0), Interval (-0.5, 0.5)); - Molecule m (bx, at); + return off [a]; +} - int pos = (int)rint (Staff_symbol_referencer::get_position (me)); - int interspaces = Staff_symbol_referencer::line_count (me)-1; - if (abs (pos) - interspaces > 1) +Offset +Note_head::get_stem_attachment (Font_metric *fm, string key) +{ + Offset att; + + int k = fm->name_to_index (key); + if (k >= 0) { - Interval hd = m.extent (X_AXIS); - Real hw = hd.length ()/4; - Interval extent = Interval (hd[LEFT] - hw, hd[RIGHT] + hw); - m.add_molecule (brew_ledger_lines (me, pos, interspaces, extent, false)); + 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 m.smobbed_copy (); + return att; } - -Real -Note_head::stem_attachment_coordinate (Grob *me, Axis a) +MAKE_SCHEME_CALLBACK(Note_head, calc_stem_attachment, 1); +SCM +Note_head::calc_stem_attachment (SCM smob) { - SCM v = me->get_grob_property ("stem-attachment-function"); - - if (!gh_procedure_p (v)) - return 0.0; - - SCM st = me->get_grob_property ("style"); - SCM result = gh_apply (v, scm_list_n (st, SCM_UNDEFINED)); + Grob *me = unsmob_grob (smob); + Font_metric *fm = Font_interface::get_default_font (me); + string key; + internal_print (me, &key); - if (!gh_pair_p (result)) - return 0.0; - - result = (a == X_AXIS) ? ly_car (result) : ly_cdr (result); - - return gh_number_p (result) ? gh_scm2double (result) : 0.0; + return ly_offset2scm (get_stem_attachment (fm, key)); } - int -Note_head::get_balltype (Grob*me) +Note_head::get_balltype (Grob *me) { - SCM s = me->get_grob_property ("duration-log"); - return gh_number_p (s) ? gh_scm2int (s) get_property ("duration-log"); + return scm_is_number (s) ? min (int (scm_to_int (s)), 2) : 0; } -ADD_INTERFACE (Note_head,"note-head-interface", - "Note head", - "accidental-grob style stem-attachment-function"); +ADD_INTERFACE (Note_head, "note-head-interface", + "Note head", + + /* properties */ + "note-names " + "accidental-grob " + "glyph-name " + "stem-attachment " + "style " + );