X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-head.cc;h=aeb7b4a19bd395bb730178820fcf5c8d150127df;hb=17345fe2a78e71cebd3252f877f4f30bca6bb1b9;hp=ef982c9925e66ef116ee547220c5a92c19607750;hpb=5f2e2f1ce115d30516c4302b5997d0d88703b945;p=lilypond.git diff --git a/lily/note-head.cc b/lily/note-head.cc index ef982c9925..aeb7b4a19b 100644 --- a/lily/note-head.cc +++ b/lily/note-head.cc @@ -1,9 +1,20 @@ /* - 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--2011 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" @@ -11,24 +22,17 @@ #include #include #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) { @@ -46,29 +50,35 @@ internal_print (Grob *me, string *font_char) Font_metric *fm = Font_interface::get_default_font (me); - string idx = "noteheads.s" + suffix; - - Stencil out = fm->find_by_name (idx); + 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 ()) { 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 = prefix + ((stem_dir == UP) ? "u" : "d") + suffix; - out = fm->find_by_name (idx); + + idx_directed = idx_either = + prefix + ((stem_dir == UP) ? "u" : "d") + suffix; + out = fm->find_by_name (idx_directed); } + 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; } @@ -98,6 +108,31 @@ Note_head::print (SCM smob) 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_grob (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) { @@ -107,21 +142,15 @@ Note_head::stem_attachment_coordinate (Grob *me, Axis a) 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, 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++) { @@ -135,19 +164,26 @@ Note_head::calc_stem_attachment (SCM smob) } } - 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_grob (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", + +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 "