X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fnote-head.cc;h=18ac2fd43e3020f6100dcd9d26f3409e25417b5c;hb=f530eeb5bbaf470235e17161a3a4605ecdcfb8dd;hp=01276185ebb6b61998c13da7e27bbbce2f70e9a4;hpb=5ca271301d3af557f4720223736dc2d7b981c12b;p=lilypond.git diff --git a/lily/note-head.cc b/lily/note-head.cc index 01276185eb..18ac2fd43e 100644 --- a/lily/note-head.cc +++ b/lily/note-head.cc @@ -1,262 +1,195 @@ /* - notehead.cc -- implement Note_head + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2010 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 "font-interface.hh" -#include "molecule.hh" -#include "musical-request.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: + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - - when ledgered notes are juxtaposed: there should be some white - space between the ledger lines. + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - - 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: + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ - - 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. +#include "note-head.hh" - (Besides a separate ledger seems overkill. For what else would - it be useful?) +#include +#include +#include // min, max -*/ +using namespace std; +#include "directional-element-interface.hh" +#include "font-interface.hh" +#include "grob.hh" +#include "international.hh" +#include "staff-symbol.hh" #include "staff-symbol-referencer.hh" +#include "warn.hh" -/* - build a ledger line for small pieces. - */ -Molecule -Note_head::ledger_line (Interval xwid, Grob *me) +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); + SCM style = me->get_property ("style"); + if (!scm_is_symbol (style)) + style = ly_symbol2scm ("default"); - Real xpos = xwid [LEFT] + len; - - while (xpos + len + thick /2 <= xwid[RIGHT]) + string suffix = to_string (min (robust_scm2int (me->get_property ("duration-log"), 2), 2)); + if (style != ly_symbol2scm ("default")) { - e->translate_axis (len, X_AXIS); - total.add_molecule (*e); - xpos += len; + SCM gn = me->get_property ("glyph-name"); + if (scm_is_string (gn)) + suffix = ly_scm2string (gn); } - return total; -} - - -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++) + 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 ()) { - Molecule s (ledger); - s.translate_axis (-dir * inter_f * i*2 + offs, - Y_AXIS); - legs.add_molecule (s); + 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_directed = idx_either = + prefix + ((stem_dir == UP) ? "u" : "d") + suffix; + out = fm->find_by_name (idx_directed); } - 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; - - SCM style = me->get_grob_property ("style"); - if (!gh_symbol_p (style)) + if (out.is_empty ()) { - return Molecule(); + 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_either; - /* - 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) - { - 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))); - } 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 (); + return scm_from_int (0); } -/* - Compute the width the head without ledgers. - */ -Interval -Note_head::head_extent (Grob *me, Axis a) +MAKE_SCHEME_CALLBACK (Note_head, print, 1); +SCM +Note_head::print (SCM smob) { - return internal_brew_molecule (me, false).extent (a); -} + Grob *me = unsmob_grob (smob); -bool -Note_head::has_interface (Grob*m) -{ - return m&& m->has_interface (ly_symbol2scm ("note-head-interface")); + string idx; + return internal_print (me, &idx).smobbed_copy (); } - -MAKE_SCHEME_CALLBACK (Note_head,brew_ez_molecule,1); - +MAKE_SCHEME_CALLBACK (Note_head, include_ledger_line_height, 1); SCM -Note_head::brew_ez_molecule (SCM smob) +Note_head::include_ledger_line_height (SCM smob) { Grob *me = unsmob_grob (smob); - int l = Rhythmic_head::balltype_i (me); + Grob *staff = Staff_symbol_referencer::get_staff_symbol (me); - int b = (l >= 2); + if (staff) + { + Real ss = Staff_symbol::staff_space (staff); + Interval lines = Staff_symbol::line_span (staff) * (ss / 2.0); + Real my_pos = Staff_symbol_referencer::get_position (me) * ss / 2.0; + Interval my_ext = me->extent (me, Y_AXIS) + my_pos; + + // The +1 and -1 come from the fact that we only want to add + // the interval between the note and the first ledger line, not + // the whole interval between the note and the staff. + Interval iv (min (0.0, lines[UP] - my_ext[DOWN] + 1), + max (0.0, lines[DOWN] - my_ext[UP] - 1)); + return ly_interval2scm (iv); + } - SCM cause = me->get_grob_property ("cause"); - SCM spitch = unsmob_music (cause)->get_mus_property ("pitch"); - Pitch* pit = unsmob_pitch (spitch); + return ly_interval2scm (Interval (0, 0)); +} - char s[2] = "a"; - s[0] = (pit->notename_i_ + 2)%7 + 'a'; - s[0] = toupper (s[0]); +Real +Note_head::stem_attachment_coordinate (Grob *me, Axis a) +{ + Offset off = robust_scm2offset (me->get_property ("stem-attachment"), + Offset (0,0)); - SCM charstr = ly_str02scm (s); + return off [a]; +} + +Offset +Note_head::get_stem_attachment (Font_metric *fm, string key) +{ + Offset att; - 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 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; - - 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))); + int k = fm->name_to_index (key); + if (k >= 0) + { + Box b = fm->get_indexed_char_dimensions (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"); + Grob *me = unsmob_grob (smob); + Font_metric *fm = Font_interface::get_default_font (me); + string key; + internal_print (me, &key); - if (!gh_procedure_p (v)) - return 0.0; + return ly_offset2scm (get_stem_attachment (fm, key)); +} - SCM st = me->get_grob_property ("style"); - SCM result = gh_apply (v, scm_list_n (st, SCM_UNDEFINED)); - if (!gh_pair_p (result)) - return 0.0; +ADD_INTERFACE (Note_head, + "A note head. There are many possible values for" + " @code{style}. For a complete list, see" + " @ruser{Note head styles}.", + + /* properties */ + "note-names " + "accidental-grob " + "glyph-name " + "stem-attachment " + "style " + ); - result = (a == X_AXIS) ? ly_car (result) : ly_cdr (result); - - return gh_number_p (result) ? gh_scm2double (result) : 0.0; -}