X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-head.cc;h=73a2255d9040a91199e994cf05c2fe0e6f9a74b5;hb=4d405ef96a8a62771d7d9a283ff5369a772e89d8;hp=f26cfc4c51d1d026302d22fb59204f569181d1ad;hpb=c5f4a0324c78423d91ccc2dd44823f692256d600;p=lilypond.git diff --git a/lily/note-head.cc b/lily/note-head.cc index f26cfc4c51..73a2255d90 100644 --- a/lily/note-head.cc +++ b/lily/note-head.cc @@ -1,105 +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--1998 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 "misc.hh" -#include "dots.hh" #include "note-head.hh" -#include "debug.hh" -#include "paper-def.hh" -#include "lookup.hh" -#include "molecule.hh" -#include "musical-request.hh" +#include +#include +#include // min, max -Note_head::Note_head () -{ - x_dir_ = CENTER; - staff_size_i_= 8; // UGH - steps_i_ = 0; - position_i_ = 0; - extremal_i_ = 0; -} +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" -void -Note_head::do_pre_processing () +static Stencil +internal_print (Grob *me, string *font_char) { - // 8 ball looks the same as 4 ball: - if (balltype_i_ > 2) - balltype_i_ = 2; - if (dots_l_) // move into Rhythmic_head? - dots_l_->position_i_ = position_i_; -} + 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 != "default") + suffix = robust_scm2string (me->get_property ("glyph-name"), ""); + + Font_metric *fm = Font_interface::get_default_font (me); + + 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"); + 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"); + } -int -Note_head::compare (Note_head *const &a, Note_head * const &b) + idx_either += suffix; + if (out.is_empty ()) + { + 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; +} + +/* + TODO: make stem X-parent of notehead. + */ +MAKE_SCHEME_CALLBACK (Note_head, stem_x_shift, 1); +SCM +Note_head::stem_x_shift (SCM smob) { - return a->position_i_ - b->position_i_; + Grob *me = unsmob (smob); + Grob *stem = unsmob (me->get_object ("stem")); + if (stem) + (void) stem->get_property ("positioning-done"); + + return scm_from_int (0); } -Interval -Note_head::do_width () const +MAKE_SCHEME_CALLBACK (Note_head, print, 1); +SCM +Note_head::print (SCM smob) { - Atom a = lookup_l ()->ball (balltype_i_); - Interval i = a.dim_[X_AXIS]; - i+= x_dir_ * i.length (); - return i; + Grob *me = unsmob (smob); + + string idx; + return internal_print (me, &idx).smobbed_copy (); } -Molecule* -Note_head::do_brew_molecule_p() const +MAKE_SCHEME_CALLBACK (Note_head, include_ledger_line_height, 1); +SCM +Note_head::include_ledger_line_height (SCM smob) { - Molecule*out = 0; - Paper_def *p = paper(); - Real inter_f = p->internote_f (); - - // ugh - int streepjes_i = abs (position_i_) < staff_size_i_/2 - ? 0 - : (abs(position_i_) - staff_size_i_/2) /2; - - //Atom s = lookup_l()->ball (balltype_i_); - - Atom s; // = lookup_l()->ball (balltype_i_); - - if (note_head_type_str_.length_i ()) { - if (note_head_type_str_ == "normal") - note_head_type_str_ = ""; - s = lookup_l()->special_ball (balltype_i_, note_head_type_str_); + 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); } - else - s = lookup_l()->ball (balltype_i_); - out = new Molecule (Atom (s)); - out->translate_axis (x_dir_ * s.dim_[X_AXIS].length (), X_AXIS); + return ly_interval2scm (Interval (0, 0)); +} - //out = new Molecule (Atom (s)); - //out->translate_axis (x_dir_ * s.dim_[X_AXIS].length (), X_AXIS); +Real +Note_head::stem_attachment_coordinate (Grob *me, Axis a) +{ + Offset off = robust_scm2offset (me->get_property ("stem-attachment"), + Offset (0, 0)); + + return off [a]; +} - if (streepjes_i) +Offset +Note_head::get_stem_attachment (Font_metric *fm, const string &key) +{ + Offset att; + + int k = fm->name_to_index (key); + if (k >= 0) { - int dir = sign (position_i_); - Atom streepje = lookup_l ()->streepje (balltype_i_); - - int parity = (position_i_ % 2) ? 1 : 0; - - - for (int i=0; i < streepjes_i; i++) - { - Atom s = streepje; - s.translate_axis (-dir * inter_f * (i*2 + parity), - Y_AXIS); - out->add_atom (s); - } + 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 ()); + } + } } - - out->translate_axis (inter_f*position_i_, Y_AXIS); - return out; + + return att; +} + +MAKE_SCHEME_CALLBACK (Note_head, calc_stem_attachment, 1); +SCM +Note_head::calc_stem_attachment (SCM smob) +{ + Grob *me = unsmob (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, + "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 " + ); +