X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-head.cc;h=5d8352e72df32240749dcaa3d0f80dda8d16e6df;hb=refs%2Fheads%2Fdebian;hp=8e8da2d500aadcb6015c8949d29da00d6ca84bb1;hpb=f93a69795ef171d9a486c46d6d2a0480aee4e438;p=lilypond.git diff --git a/lily/note-head.cc b/lily/note-head.cc index 8e8da2d500..5d8352e72d 100644 --- a/lily/note-head.cc +++ b/lily/note-head.cc @@ -1,176 +1,213 @@ /* - 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--2012 Han-Wen Nienhuys - (c) 1997--2004 Han-Wen Nienhuys + 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. + + 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. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "note-head.hh" #include #include +#include // min, max + +using namespace std; #include "directional-element-interface.hh" -#include "staff-symbol.hh" -#include "misc.hh" -#include "dots.hh" -#include "warn.hh" #include "font-interface.hh" -#include "event.hh" -#include "rhythmic-head.hh" +#include "grob.hh" +#include "international.hh" +#include "staff-symbol.hh" #include "staff-symbol-referencer.hh" -#include "lookup.hh" -#include "output-def.hh" +#include "warn.hh" -/* - clean up the mess left by ledger line handling. -*/ static Stencil -internal_print (Grob *me, String * font_char) +internal_print (Grob *me, string *font_char) { - SCM style = me->get_property ("style"); - if (!scm_is_symbol (style)) - { - return Stencil (); - } + string style = robust_symbol2string (me->get_property ("style"), "default"); - 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); + 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"), ""); - Font_metric * fm = Font_interface::get_default_font (me); + Font_metric *fm = Font_interface::get_default_font (me); - Direction stem_dir = CENTER; - if (Grob *stem = unsmob_grob (me->get_property ("stem"))) + 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 ()) { - stem_dir = get_grob_direction (stem); + 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"); - } + programming_error ("must have stem dir for note head"); + + idx_either = idx_directed = prefix + (stem_dir == UP ? "u" : "d"); + out = fm->find_by_name (idx_either + suffix); } - - Stencil out; - 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 ()) + if (style == "mensural" + || style == "neomensural" + || style == "petrucci" + || style == "baroque" + || style == "kievan") { - idx = prefix + "s" + ly_scm2string (scm_font_char); - out = fm->find_by_name (idx); + if (!Staff_symbol_referencer::on_line + (me, + robust_scm2int (me->get_property ("staff-position"), 0))) + { + Stencil test = fm->find_by_name (idx_either + "r" + suffix); + if (!test.is_empty ()) + { + idx_either += "r"; + out = test; + } + } } - - if (out.is_empty()) + + if (style == "kievan" + && 3 == robust_scm2int (me->get_property ("duration-log"), 2)) { - me->warning (_f ("note head `%s' not found", idx.to_str0 ())); + Grob *stem = unsmob_grob (me->get_object ("stem")); + Grob *beam = unsmob_grob (stem->get_object ("beam")); + if (beam) + out = fm->find_by_name (idx_either + "2kievan"); } - else + + idx_either += suffix; + if (out.is_empty ()) { - *font_char = idx; + 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,print,1); +/* + TODO: make stem X-parent of notehead. + */ +MAKE_SCHEME_CALLBACK (Note_head, stem_x_shift, 1); SCM -Note_head::print (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"); - String idx; - return internal_print (me, &idx).smobbed_copy (); + return scm_from_int (0); } - -MAKE_SCHEME_CALLBACK (Note_head,brew_ez_stencil,1); +MAKE_SCHEME_CALLBACK (Note_head, print, 1); SCM -Note_head::brew_ez_stencil (SCM smob) +Note_head::print (SCM smob) { Grob *me = unsmob_grob (smob); - int l = Note_head::get_balltype (me); - int b = (l >= 2); + string idx; + return internal_print (me, &idx).smobbed_copy (); +} - SCM cause = me->get_property ("cause"); - SCM spitch = unsmob_music (cause)->get_property ("pitch"); - Pitch* pit = unsmob_pitch (spitch); +MAKE_SCHEME_CALLBACK (Note_head, include_ledger_line_height, 1); +SCM +Note_head::include_ledger_line_height (SCM smob) +{ + Grob *me = unsmob_grob (smob); + Grob *staff = Staff_symbol_referencer::get_staff_symbol (me); - SCM idx = scm_int2num (pit->get_notename ()); - SCM names = me->get_property ("note-names"); - SCM charstr = SCM_EOL; - if (ly_c_vector_p (names)) - charstr = scm_vector_ref (names, idx); - else + if (staff) { - char s[2] = "a"; - s[0] = (pit->get_notename () + 2)%7 + 'a'; - s[0] = toupper (s[0]); - charstr = scm_makfrom0str (s); + 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 at = scm_list_n (ly_symbol2scm ("ez-ball"), - charstr, - scm_int2num (b), - scm_int2num (1-b), - SCM_UNDEFINED); - Box bx (Interval (0, 1.0), Interval (-0.5, 0.5)); - Stencil m (bx, at); - - return m.smobbed_copy (); -} + return ly_interval2scm (Interval (0, 0)); +} Real Note_head::stem_attachment_coordinate (Grob *me, Axis a) { - SCM brewer = me->get_property ("print-function"); - Font_metric * fm = Font_interface::get_default_font (me); - - if (brewer == Note_head::print_proc) + Offset off = robust_scm2offset (me->get_property ("stem-attachment"), + Offset (0, 0)); + + return off [a]; +} + +Offset +Note_head::get_stem_attachment (Font_metric *fm, const string &key) +{ + Offset att; + + int k = fm->name_to_index (key); + if (k >= 0) { - 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->get_indexed_wxwy (k); - Interval v = b[a]; - if (!v.is_empty ()) - return 2 * (wxwy[a] - v.center ()) / v.length (); - } + 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 ()); + } + } } - - /* - Fallback - */ - SCM v = me->get_property ("stem-attachment-function"); - if (!ly_c_procedure_p (v)) - return 0.0; - - SCM result = scm_call_2 (v, me->self_scm (), scm_int2num (a)); - if (!scm_is_pair (result)) - return 0.0; - - result = (a == X_AXIS) ? scm_car (result) : scm_cdr (result); - - return robust_scm2double (result,0); + + 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_property ("duration-log"); - return scm_is_number (s) ? scm_to_int (s)