X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-head.cc;h=e32c1a663f0e4172e85d74ac9234afc001ad80f9;hb=fceacfbaa44cdf0eafcfbcce0ea97ebf5d823c4e;hp=5f88f5c52db2d5e26069101c792fc21476c3669c;hpb=6d143896ed61a7171a8faba2d10f0605b8b14d10;p=lilypond.git diff --git a/lily/note-head.cc b/lily/note-head.cc index 5f88f5c52d..e32c1a663f 100644 --- a/lily/note-head.cc +++ b/lily/note-head.cc @@ -3,129 +3,254 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ +#include +#include #include "misc.hh" #include "dots.hh" #include "note-head.hh" -#include "debug.hh" -#include "lookup.hh" +#include "warn.hh" +#include "font-interface.hh" #include "molecule.hh" -#include "musical-request.hh" -#include "dimension-cache.hh" +#include "event.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: -/* - build a ledger line for small pieces. - */ -Molecule -Note_head::ledger_line (Interval xwid) const -{ - Drul_array endings; - endings[LEFT] = lookup_l()->afm_find ("noteheads-ledgerending"); - Molecule *e = &endings[LEFT]; - endings[RIGHT] = *e; + 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. - Real thick = e->dim_[Y_AXIS].length(); - Real len = e->dim_[X_AXIS].length () - thick; + 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. - Molecule total; - Direction d = LEFT; - do { - endings[d].translate_axis (xwid[d] - endings[d].dim_[X_AXIS][d], X_AXIS); - total.add_molecule (endings[d]); - } while ((flip(&d)) != LEFT); + (Besides a separate ledger seems overkill. For what else would + it be useful?) - Real xpos = xwid [LEFT] + len; +*/ - while (xpos + len + thick /2 <= xwid[RIGHT]) +Molecule +Note_head::brew_ledger_lines (Grob *me, + int pos, + int interspaces, + Interval x_extent, + bool take_space) +{ + Real inter_f = Staff_symbol_referencer::staff_space (me)/2; + int lines_i = abs (pos) < interspaces + ? 0 + : (abs (pos) - interspaces) / 2; + Molecule molecule = Molecule(); + + if (lines_i) { - e->translate_axis (len, X_AXIS); - total.add_molecule (*e); - xpos += len; + 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); + } } - return total; + return molecule; } - -void -Note_head::before_line_breaking () +Molecule +internal_brew_molecule (Grob *me, bool ledger_take_space) { - // 8 ball looks the same as 4 ball: - String type; - SCM style = get_elt_property ("style"); - if (gh_string_p (style)) + SCM style = me->get_grob_property ("style"); + if (!gh_symbol_p (style)) { - type = ly_scm2string (style); + return Molecule(); } - - - if (balltype_i () > 2 || type == "harmonic" || type == "cross") - set_elt_property ("duration-log", gh_int2scm (2)); - if (Dots *d = dots_l ()) - { // move into Rhythmic_head? - Staff_symbol_referencer_interface si (d); - Staff_symbol_referencer_interface me (this); - - si.set_position(int (me.position_f ())); + SCM log = gh_int2scm (Note_head::get_balltype (me)); + SCM proc = me->get_grob_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); + Molecule out = fm->find_by_name (font_char); + if (out.empty_b()) + { + me->warning (_f ("note head `%s' not found", font_char.to_str0 ())); } + + 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; + + 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); +SCM +Note_head::brew_molecule (SCM smob) +{ + Grob *me = unsmob_grob (smob); + + /* + 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) +{ + Molecule * mol = me->get_molecule(); + return mol ? mol ->extent (a) : Interval(0,0); } +MAKE_SCHEME_CALLBACK (Note_head,brew_ez_molecule,1); -Molecule -Note_head::do_brew_molecule() const +SCM +Note_head::brew_ez_molecule (SCM smob) { - Staff_symbol_referencer_interface si (this); - - Real inter_f = si.staff_space ()/2; - int sz = si.line_count ()-1; - Real p = si.position_f (); - int streepjes_i = abs (p) < sz - ? 0 - : (abs((int)p) - sz) /2; + Grob *me = unsmob_grob (smob); + int l = Note_head::get_balltype (me); - SCM style = get_elt_property ("style"); - if (style == SCM_UNDEFINED) - { - style = ly_str02scm(""); - } - - Molecule out = lookup_l()->afm_find (String ("noteheads-") + - ly_scm2string (scm_eval (gh_list (ly_symbol2scm("noteheadsymbol"), - gh_int2scm(balltype_i ()), - style, - SCM_UNDEFINED)))); + int b = (l >= 2); - Box ledgerless = out.dim_; + SCM cause = me->get_grob_property ("cause"); + SCM spitch = unsmob_music (cause)->get_mus_property ("pitch"); + Pitch* pit = unsmob_pitch (spitch); - if (streepjes_i) + char s[2] = "a"; + s[0] = (pit->notename_ + 2)%7 + 'a'; + s[0] = toupper (s[0]); + + SCM charstr = scm_makfrom0str (s); + + 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); + + int pos = (int)rint (Staff_symbol_referencer::get_position (me)); + int interspaces = Staff_symbol_referencer::line_count (me)-1; + if (abs (pos) - interspaces > 1) { - Direction dir = (Direction)sign (p); - Interval hd = out.dim_[X_AXIS]; + Interval hd = m.extent (X_AXIS); Real hw = hd.length ()/4; - - Molecule ledger (ledger_line (Interval (hd[LEFT] - hw, - hd[RIGHT] + hw))); - - int parity = abs(int (p)) % 2; - - for (int i=0; i < streepjes_i; i++) - { - Molecule s (ledger); - s.translate_axis (-dir * inter_f * (i*2 + parity), - Y_AXIS); - out.add_molecule (s); - } + Interval extent = Interval (hd[LEFT] - hw, hd[RIGHT] + hw); + m.add_molecule (brew_ledger_lines (me, pos, interspaces, extent, false)); } - out.dim_ = ledgerless; - return out; + return m.smobbed_copy (); +} + + +Real +Note_head::stem_attachment_coordinate (Grob *me, Axis a) +{ + 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 log = gh_int2scm (get_balltype (me)); + SCM result = gh_apply (v, scm_list_n (st, log, SCM_UNDEFINED)); + + 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; } +int +Note_head::get_balltype (Grob*me) +{ + SCM s = me->get_grob_property ("duration-log"); + return gh_number_p (s) ? gh_scm2int (s)