X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest.cc;h=9057e45af1bd90deaf29c0419ac2a2b2233ee8a9;hb=e6e664d1bd2b125f6e34d47f7b7e69271865343a;hp=b6df666dfe025c2fce1a3bfdffdd3365b1059f74;hpb=c5402461ab1d1cdbaa684b0e55d4851f0e28e37a;p=lilypond.git diff --git a/lily/rest.cc b/lily/rest.cc index b6df666dfe..9057e45af1 100644 --- a/lily/rest.cc +++ b/lily/rest.cc @@ -1,75 +1,274 @@ /* - rest.cc -- implement Rest + 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--2000 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 "molecule.hh" -#include "paper-def.hh" -#include "font-metric.hh" #include "rest.hh" + +#include "directional-element-interface.hh" #include "dots.hh" +#include "font-interface.hh" +#include "international.hh" +#include "output-def.hh" #include "paper-score.hh" #include "staff-symbol-referencer.hh" +#include "staff-symbol.hh" +#include "stencil.hh" +#include "grob.hh" // -> offset callback -MAKE_SCHEME_CALLBACK(Rest,after_line_breaking,1); +MAKE_SCHEME_CALLBACK (Rest, y_offset_callback, 1); SCM -Rest::after_line_breaking (SCM smob) +Rest::y_offset_callback (SCM smob) { - Score_element *me = unsmob_element (smob); - int bt = gh_scm2int (me->get_elt_property ("duration-log")); - if (bt == 0) + Grob *me = unsmob_grob (smob); + int duration_log = scm_to_int (me->get_property ("duration-log")); + int line_count = Staff_symbol_referencer::line_count (me); + Real ss = Staff_symbol_referencer::staff_space (me); + + bool position_override = scm_is_number (me->get_property ("staff-position")); + Real amount; + + if (position_override) { - me->translate_axis (Staff_symbol_referencer::staff_space (me) , Y_AXIS); - } + amount + = robust_scm2double (me->get_property ("staff-position"), 0) * 0.5 * ss; - Score_element * d = unsmob_element (me->get_elt_property ("dot")); - if (d && bt > 4) // UGH. + /* + semibreve rests are positioned one staff line off + */ + if (duration_log == 0) + amount += ss; + + /* + trust the client on good positioning; + would be tempting to adjust position of rests longer than a quarter + to be properly aligned to staff lines, + but custom rest shapes may not need that sort of care. + */ + } + else { - d->set_elt_property ("staff-position", - gh_int2scm ((bt == 7) ? 4 : 3)); + int pos = 4 * get_grob_direction (me); + + /* + make a semibreve rest hang from the next line, + except for a single line staff + */ + if (duration_log == 0 && line_count > 1) + pos += 2; + + /* + make sure rest is aligned to a staff line + */ + if (Grob *staff = Staff_symbol_referencer::get_staff_symbol (me)) + { + std::vector linepos = Staff_symbol::line_positions (staff); + std::sort (linepos.begin (), linepos.end ()); + std::vector::const_iterator it + = std::lower_bound (linepos.begin (), linepos.end (), pos); + if (it != linepos.end ()) + { + pos = (int)ceil (*it); + } + } + + amount = ss * 0.5 * pos; } - return SCM_UNSPECIFIED; + return scm_from_double (amount); } +/* A rest might lie under a beam, in which case it should be cross-staff if + the beam is cross-staff because the rest's position depends on the + formatting of the beam. */ +MAKE_SCHEME_CALLBACK (Rest, calc_cross_staff, 1); +SCM +Rest::calc_cross_staff (SCM smob) +{ + Grob *me = unsmob_grob (smob); + Grob *stem = unsmob_grob (me->get_object ("stem")); + + if (!stem) + return SCM_BOOL_F; + + return stem->get_property ("cross-staff"); +} -MAKE_SCHEME_CALLBACK(Rest,brew_molecule,1) -SCM -Rest::brew_molecule (SCM smob) +/* + make this function easily usable in C++ +*/ +string +Rest::glyph_name (Grob *me, int durlog, string style, bool try_ledgers) { - Score_element* me = unsmob_element (smob); - - bool ledger_b =false; + bool is_ledgered = false; + if (try_ledgers && (durlog == -1 || durlog == 0 || durlog == 1)) + { + int const pos = int (Staff_symbol_referencer::get_position (me)); + + /* + half rests need ledger if not lying on a staff line, + whole rests need ledger if not hanging from a staff line, + breve rests need ledger if neither lying on nor hanging from a staff line + */ + if (-1 <= durlog && durlog <= 1) + is_ledgered = !Staff_symbol_referencer::on_staff_line (me, pos) + && !(durlog == -1 + && Staff_symbol_referencer::on_staff_line (me, pos + 2)); + } + + string actual_style (style.c_str ()); - SCM balltype = me->get_elt_property ("duration-log"); - - if (balltype == gh_int2scm (0) || balltype == gh_int2scm (1)) + if ((style == "mensural") || (style == "neomensural")) { - int sz = Staff_symbol_referencer::line_count (me); - Real dif = abs(Staff_symbol_referencer::position_f (me) - (2* gh_scm2int (balltype) - 1)); - ledger_b = dif > sz; + + /* + FIXME: Currently, ancient font does not provide ledgered rests; + hence the "o" suffix in the glyph name is bogus. But do we need + ledgered rests at all now that we can draw ledger lines with + variable width, length and blotdiameter? -- jr + */ + is_ledgered = 0; + + /* + There are no 32th/64th/128th mensural/neomensural rests. In + these cases, revert back to default style. + */ + if (durlog > 4) + actual_style = ""; } - - String style; - SCM style_sym =me->get_elt_property ("style"); - if (gh_scm2int (balltype) >= 2 && gh_string_p (style_sym)) + + if ((style == "classical") && (durlog != 2)) + { + /* + classical style: revert back to default style for any rest other + than quarter rest + */ + actual_style = ""; + } + + if (style == "default") + { + /* + Some parts of lily still prefer style "default" over "". + Correct this here. -- jr + */ + actual_style = ""; + } + + return ("rests." + to_string (durlog) + (is_ledgered ? "o" : "") + + actual_style); +} + +MAKE_SCHEME_CALLBACK (Rest, print, 1); +SCM +Rest::brew_internal_stencil (Grob *me, bool ledgered) +{ + SCM durlog_scm = me->get_property ("duration-log"); + if (!scm_is_number (durlog_scm)) + return Stencil ().smobbed_copy (); + + int durlog = scm_to_int (durlog_scm); + + string style = robust_symbol2string (me->get_property ("style"), "default"); + + Font_metric *fm = Font_interface::get_default_font (me); + string font_char = glyph_name (me, durlog, style, ledgered); + Stencil out = fm->find_by_name (font_char); + if (out.is_empty ()) + me->warning (_f ("rest `%s' not found", font_char.c_str ())); + + return out.smobbed_copy (); +} + +/** + translate the rest vertically by amount DY, but only if + it doesn't have staff-position set. +*/ +void +Rest::translate (Grob *me, int dy) +{ + if (!scm_is_number (me->get_property ("staff-position"))) { - style = ly_scm2string (style_sym); + me->translate_axis (dy * Staff_symbol_referencer::staff_space (me) / 2.0, Y_AXIS); + Grob *p = me->get_parent (Y_AXIS); + p->flush_extent_cache (Y_AXIS); } +} - String idx = ("rests-") + to_str (gh_scm2int (balltype)) - + (ledger_b ? "o" : "") + style; +SCM +Rest::print (SCM smob) +{ + return brew_internal_stencil (unsmob_grob (smob), true); +} - return me-> get_default_font ()->find_by_name (idx).create_scheme(); +MAKE_SCHEME_CALLBACK (Rest, width, 1); +/* + We need the callback. The real stencil has ledgers depending on + Y-position. The Y-position is known only after line breaking. */ +SCM +Rest::width (SCM smob) +{ + return generic_extent_callback (unsmob_grob (smob), X_AXIS); } +MAKE_SCHEME_CALLBACK (Rest, height, 1); +SCM +Rest::height (SCM smob) +{ + return generic_extent_callback (unsmob_grob (smob), Y_AXIS); +} -bool -Rest::has_interface (Score_element*m) +/* + We need the callback. The real stencil has ledgers depending on + Y-position. The Y-position is known only after line breaking. */ +SCM +Rest::generic_extent_callback (Grob *me, Axis a) { - return m && m->has_interface (ly_symbol2scm ("rest-interface")); + /* + Don't want ledgers: ledgers depend on Y position, which depends on + rest collision, which depends on stem size which depends on beam + slop of opposite note column. + + consequence: we get too small extents and potential collisions + with ledgered rests. + */ + SCM m = brew_internal_stencil (me, a != X_AXIS); + return ly_interval2scm (unsmob_stencil (m)->extent (a)); } + +MAKE_SCHEME_CALLBACK (Rest, pure_height, 3); +SCM +Rest::pure_height (SCM smob, + SCM /* start */, + SCM /* end */) +{ + Grob *me = unsmob_grob (smob); + SCM m = brew_internal_stencil (me, false); + return ly_interval2scm (unsmob_stencil (m)->extent (Y_AXIS)); +} + +ADD_INTERFACE (Rest, + "A rest symbol. The property @code{style} can be" + " @code{default}, @code{mensural}, @code{neomensural} or" + " @code{classical}.", + + /* properties */ + "direction " + "minimum-distance " + "style " + );