X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-head.cc;h=73a2255d9040a91199e994cf05c2fe0e6f9a74b5;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=ef982c9925e66ef116ee547220c5a92c19607750;hpb=5f2e2f1ce115d30516c4302b5997d0d88703b945;p=lilypond.git diff --git a/lily/note-head.cc b/lily/note-head.cc index ef982c9925..73a2255d90 100644 --- a/lily/note-head.cc +++ b/lily/note-head.cc @@ -1,87 +1,116 @@ /* - 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--2006 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 +#include // min, max + using namespace std; #include "directional-element-interface.hh" -#include "dots.hh" #include "font-interface.hh" +#include "grob.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 "staff-symbol.hh" +#include "staff-symbol-referencer.hh" #include "warn.hh" -/* - clean up the mess left by ledger line handling. -*/ static Stencil internal_print (Grob *me, string *font_char) { - SCM style = me->get_property ("style"); - if (!scm_is_symbol (style)) - style = ly_symbol2scm ("default"); + string style = robust_symbol2string (me->get_property ("style"), "default"); - string suffix = to_string (min (robust_scm2int (me->get_property ("duration-log"), 2), 2)); - if (style != ly_symbol2scm ("default")) - { - SCM gn = me->get_property ("glyph-name"); - if (scm_is_string (gn)) - suffix = ly_scm2string (gn); - } + 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); - string idx = "noteheads.s" + suffix; - - Stencil out = fm->find_by_name (idx); + 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 ()) { - string prefix = "noteheads."; - Grob *stem = unsmob_grob (me->get_object ("stem")); + 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"); + programming_error ("must have stem dir for note head"); - idx = prefix + ((stem_dir == UP) ? "u" : "d") + suffix; - out = fm->find_by_name (idx); + idx_either = idx_directed = prefix + (stem_dir == UP ? "u" : "d"); + out = fm->find_by_name (idx_either + suffix); } + if (style == "mensural" + || style == "neomensural" + || style == "petrucci" + || style == "baroque" + || style == "kievan") + { + 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 (style == "kievan" + && 3 == robust_scm2int (me->get_property ("duration-log"), 2)) + { + Grob *stem = unsmob (me->get_object ("stem")); + Grob *beam = unsmob (stem->get_object ("beam")); + if (beam) + out = fm->find_by_name (idx_either + "2kievan"); + } + + idx_either += suffix; if (out.is_empty ()) { - me->warning (_f ("note head `%s' not found", idx.c_str ())); + 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; + *font_char = idx_either; return out; } /* - TODO: make stem X-parent of notehead. + TODO: make stem X-parent of notehead. */ MAKE_SCHEME_CALLBACK (Note_head, stem_x_shift, 1); SCM Note_head::stem_x_shift (SCM smob) { - Grob *me = unsmob_grob (smob); - Grob *stem = unsmob_grob (me->get_object ("stem")); + Grob *me = unsmob (smob); + Grob *stem = unsmob (me->get_object ("stem")); if (stem) (void) stem->get_property ("positioning-done"); @@ -92,68 +121,96 @@ MAKE_SCHEME_CALLBACK (Note_head, print, 1); SCM Note_head::print (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); string idx; return internal_print (me, &idx).smobbed_copy (); } +MAKE_SCHEME_CALLBACK (Note_head, include_ledger_line_height, 1); +SCM +Note_head::include_ledger_line_height (SCM smob) +{ + Grob *me = unsmob (smob); + Grob *staff = Staff_symbol_referencer::get_staff_symbol (me); + + 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); + } + + return ly_interval2scm (Interval (0, 0)); +} + Real Note_head::stem_attachment_coordinate (Grob *me, Axis a) { Offset off = robust_scm2offset (me->get_property ("stem-attachment"), - Offset (0,0)); - + Offset (0, 0)); + return off [a]; } -MAKE_SCHEME_CALLBACK(Note_head, calc_stem_attachment, 1); -SCM -Note_head::calc_stem_attachment (SCM smob) +Offset +Note_head::get_stem_attachment (Font_metric *fm, const string &key) { - Grob *me = unsmob_grob (smob); - Font_metric *fm = Font_interface::get_default_font (me); - string key; - internal_print (me, &key); - Offset att; - + int k = fm->name_to_index (key); if (k >= 0) { - Box b = fm->get_indexed_char (k); + 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 ()); - } - } + 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 ly_offset2scm (att); + 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) ? min (int (scm_to_int (s)), 2) : 0; -} + Grob *me = unsmob (smob); + Font_metric *fm = Font_interface::get_default_font (me); + string key; + internal_print (me, &key); -ADD_INTERFACE (Note_head, "note-head-interface", - "Note head", + return ly_offset2scm (get_stem_attachment (fm, key)); +} - /* properties */ - "note-names " - "accidental-grob " - "glyph-name " - "stem-attachment " - "style " - ); +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 " + );