X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-head.cc;h=73a2255d9040a91199e994cf05c2fe0e6f9a74b5;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=4b2596c298f19376dcf4b35d74e51fa5a44cb3d9;hpb=3c64b04040ae18b98bed7b9b95f156aae1cf4420;p=lilypond.git diff --git a/lily/note-head.cc b/lily/note-head.cc index 4b2596c298..73a2255d90 100644 --- a/lily/note-head.cc +++ b/lily/note-head.cc @@ -1,268 +1,216 @@ /* - 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--2015 Han-Wen Nienhuys - (c) 1997--2002 Han-Wen Nienhuys -*/ -#include -#include - -#include "misc.hh" -#include "dots.hh" -#include "note-head.hh" -#include "warn.hh" -#include "font-interface.hh" -#include "molecule.hh" -#include "musical-request.hh" -#include "rhythmic-head.hh" -#include "staff-symbol-referencer.hh" -#include "lookup.hh" -#include "paper-def.hh" + 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. -/* - Note_head contains the code for printing note heads. + 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. - Ledger lines: + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ - 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: +#include "note-head.hh" - DO take space: +#include +#include +#include // min, max - - when ledgered notes are juxtaposed: there should be some white - space between the ledger lines. +using namespace std; - - when accidentals are near: the accidentals should not be on the - ledger lines +#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" - [both tips by Heinz Stolba from Universal Edition]. +static Stencil +internal_print (Grob *me, string *font_char) +{ + string style = robust_symbol2string (me->get_property ("style"), "default"); - DO NOT take space into account: + string suffix = ::to_string (min (robust_scm2int (me->get_property ("duration-log"), 2), 2)); + if (style != "default") + suffix = robust_scm2string (me->get_property ("glyph-name"), ""); - - 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. + Font_metric *fm = Font_interface::get_default_font (me); - (Besides a separate ledger seems overkill. For what else would - it be useful?) + string prefix = "noteheads."; + string idx_symmetric; + string idx_directed; + string idx_either = idx_symmetric = prefix + "s"; + Stencil out = fm->find_by_name (idx_either + suffix); + if (out.is_empty ()) + { + Grob *stem = unsmob (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"); -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(); + idx_either = idx_directed = prefix + (stem_dir == UP ? "u" : "d"); + out = fm->find_by_name (idx_either + suffix); + } - if (lines_i) + if (style == "mensural" + || style == "neomensural" + || style == "petrucci" + || style == "baroque" + || style == "kievan") { - 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++) + if (!Staff_symbol_referencer::on_line + (me, + robust_scm2int (me->get_property ("staff-position"), 0))) { - Molecule ledger_line (proto_ledger_line); - ledger_line.translate_axis (-dir * inter_f * i * 2 + offs, Y_AXIS); - molecule.add_molecule (ledger_line); + Stencil test = fm->find_by_name (idx_either + "r" + suffix); + if (!test.is_empty ()) + { + idx_either += "r"; + out = test; + } } } - return molecule; -} - -Molecule -internal_brew_molecule (Grob *me, bool ledger_take_space) -{ - SCM style = me->get_grob_property ("style"); - if (!gh_symbol_p (style)) + if (style == "kievan" + && 3 == robust_scm2int (me->get_property ("duration-log"), 2)) { - return Molecule(); + Grob *stem = unsmob (me->get_object ("stem")); + Grob *beam = unsmob (stem->get_object ("beam")); + if (beam) + out = fm->find_by_name (idx_either + "2kievan"); } - /* - 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); - SCM scm_pair = scm_primitive_eval (exp); - SCM scm_font_char = ly_car (scm_pair); - SCM scm_font_family = ly_cdr (scm_pair); - String font_char = "noteheads-" + ly_scm2string (scm_font_char); - String font_family = ly_scm2string (scm_font_family); - - me->set_grob_property("font-family", ly_symbol2scm (font_family.to_str0 ())); - Molecule out = - Font_interface::get_default_font (me)->find_by_name (font_char); - if (out.empty_b()) - { - warning (_f("Symbol 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) + idx_either += suffix; + if (out.is_empty ()) { - 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)); + 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; + 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 *me = unsmob (smob); + Grob *stem = unsmob (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. - - -- 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) +MAKE_SCHEME_CALLBACK (Note_head, print, 1); +SCM +Note_head::print (SCM smob) { - Molecule * mol = me->get_molecule(); - return mol ? mol ->extent (a) : Interval(0,0); -} - - + Grob *me = unsmob (smob); -MAKE_SCHEME_CALLBACK (Note_head,brew_ez_molecule,1); + string idx; + return internal_print (me, &idx).smobbed_copy (); +} +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 = 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); - - 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) + Grob *me = unsmob (smob); + Grob *staff = Staff_symbol_referencer::get_staff_symbol (me); + + if (staff) { - 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)); + 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); } - return m.smobbed_copy (); + return ly_interval2scm (Interval (0, 0)); } - Real Note_head::stem_attachment_coordinate (Grob *me, Axis a) { - SCM v = me->get_grob_property ("stem-attachment-function"); + Offset off = robust_scm2offset (me->get_property ("stem-attachment"), + Offset (0, 0)); - if (!gh_procedure_p (v)) - return 0.0; + return off [a]; +} - 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)); +Offset +Note_head::get_stem_attachment (Font_metric *fm, const string &key) +{ + Offset att; - if (!gh_pair_p (result)) - return 0.0; + 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); - result = (a == X_AXIS) ? ly_car (result) : ly_cdr (result); - - return gh_number_p (result) ? gh_scm2double (result) : 0.0; -} + Interval v = b[a]; + if (!v.is_empty ()) + { + att[a] = (2 * (wxwy[a] - v.center ()) / v.length ()); + } + } + } + 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_grob_property ("duration-log"); - return gh_number_p (s) ? gh_scm2int (s) (smob); + Font_metric *fm = Font_interface::get_default_font (me); + string key; + internal_print (me, &key); + + return ly_offset2scm (get_stem_attachment (fm, key)); } -ADD_INTERFACE (Note_head,"note-head-interface", - "Note head", - "accidental-grob style stem-attachment-function"); +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 */ + "duration-log " + "note-names " + "accidental-grob " + "ignore-ambitus " + "glyph-name " + "stem-attachment " + "style " + "ledger-positions " + );