X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest.cc;h=f562f69534a1689d648efabb5d90051c9b0a42d3;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=4a46b7312aa8feab0946a83fa6ad17552a8601e6;hpb=9214fc9912ee14c29aa523f880c97b12bf5a2d17;p=lilypond.git diff --git a/lily/rest.cc b/lily/rest.cc index 4a46b7312a..f562f69534 100644 --- a/lily/rest.cc +++ b/lily/rest.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2012 Han-Wen Nienhuys + Copyright (C) 1997--2015 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 @@ -35,7 +35,7 @@ MAKE_SCHEME_CALLBACK (Rest, y_offset_callback, 1); SCM Rest::y_offset_callback (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); int duration_log = scm_to_int (me->get_property ("duration-log")); Real ss = Staff_symbol_referencer::staff_space (me); @@ -72,12 +72,13 @@ Rest::staff_position_internal (Grob *me, int duration_log, int dir) return pos; } - pos = 4 * dir; + Real vpos = dir * robust_scm2int (me->get_property ("voiced-position"), 0); + pos = vpos; if (duration_log > 1) /* Only half notes or longer want alignment with staff lines */ return pos; - + /* We need a staff symbol for actually aligning anything */ @@ -89,9 +90,9 @@ Rest::staff_position_internal (Grob *me, int duration_log, int dir) if (linepos.empty ()) return pos; - + std::sort (linepos.begin (), linepos.end ()); - + if (duration_log == 0) { /* @@ -105,7 +106,7 @@ Rest::staff_position_internal (Grob *me, int duration_log, int dir) make a semibreve rest hang from the next available line, except when there is none. */ - + std::vector::const_iterator it = std::upper_bound (linepos.begin (), linepos.end (), pos); if (it != linepos.end ()) @@ -127,16 +128,15 @@ Rest::staff_position_internal (Grob *me, int duration_log, int dir) return pos; /* If we have a voiced position, make sure that it's on the - proper side of neutral before using it. If it isn't, we fall - back to a constant offset from neutral position. + proper side of neutral before using it. */ Real neutral = staff_position_internal (me, duration_log, 0); if (dir * (pos - neutral) > 0) return pos; - - return neutral + 4 * dir; + else + return neutral + vpos; } /* A rest might lie under a beam, in which case it should be cross-staff if @@ -146,8 +146,8 @@ 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")); + Grob *me = unsmob (smob); + Grob *stem = unsmob (me->get_object ("stem")); if (!stem) return SCM_BOOL_F; @@ -159,13 +159,14 @@ Rest::calc_cross_staff (SCM smob) make this function easily usable in C++ */ string -Rest::glyph_name (Grob *me, int durlog, string style, bool try_ledgers) +Rest::glyph_name (Grob *me, int durlog, const string &style, bool try_ledgers, + Real offset) { bool is_ledgered = false; if (try_ledgers && (durlog == -1 || durlog == 0 || durlog == 1)) { - int const pos = int (Staff_symbol_referencer::get_position (me)); - + int const pos = int (Staff_symbol_referencer::get_position (me) + + offset); /* half rests need ledger if not lying on a staff line, whole rests need ledger if not hanging from a staff line, @@ -198,11 +199,10 @@ Rest::glyph_name (Grob *me, int durlog, string style, bool try_ledgers) actual_style = ""; } - if ((style == "classical") && (durlog != 2)) + if (((style == "classical") || (style == "z")) && (durlog != 2)) { /* - classical style: revert back to default style for any rest other - than quarter rest + these styles differ from the default in quarter rests only */ actual_style = ""; } @@ -216,7 +216,7 @@ Rest::glyph_name (Grob *me, int durlog, string style, bool try_ledgers) actual_style = ""; } - return ("rests." + to_string (durlog) + (is_ledgered ? "o" : "") + return ("rests." + ::to_string (durlog) + (is_ledgered ? "o" : "") + actual_style); } @@ -233,7 +233,7 @@ Rest::brew_internal_stencil (Grob *me, bool ledgered) 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); + string font_char = glyph_name (me, durlog, style, ledgered, 0.0); Stencil out = fm->find_by_name (font_char); if (out.is_empty ()) me->warning (_f ("rest `%s' not found", font_char.c_str ())); @@ -259,7 +259,7 @@ Rest::translate (Grob *me, int dy) SCM Rest::print (SCM smob) { - return brew_internal_stencil (unsmob_grob (smob), true); + return brew_internal_stencil (unsmob (smob), true); } MAKE_SCHEME_CALLBACK (Rest, width, 1); @@ -269,14 +269,14 @@ MAKE_SCHEME_CALLBACK (Rest, width, 1); SCM Rest::width (SCM smob) { - return generic_extent_callback (unsmob_grob (smob), X_AXIS); + return generic_extent_callback (unsmob (smob), X_AXIS); } MAKE_SCHEME_CALLBACK (Rest, height, 1); SCM Rest::height (SCM smob) { - return generic_extent_callback (unsmob_grob (smob), Y_AXIS); + return generic_extent_callback (unsmob (smob), Y_AXIS); } /* @@ -294,7 +294,7 @@ Rest::generic_extent_callback (Grob *me, Axis a) with ledgered rests. */ SCM m = brew_internal_stencil (me, a != X_AXIS); - return ly_interval2scm (unsmob_stencil (m)->extent (a)); + return ly_interval2scm (unsmob (m)->extent (a)); } MAKE_SCHEME_CALLBACK (Rest, pure_height, 3); @@ -303,9 +303,9 @@ Rest::pure_height (SCM smob, SCM /* start */, SCM /* end */) { - Grob *me = unsmob_grob (smob); + Grob *me = unsmob (smob); SCM m = brew_internal_stencil (me, false); - return ly_interval2scm (unsmob_stencil (m)->extent (Y_AXIS)); + return ly_interval2scm (unsmob (m)->extent (Y_AXIS)); } ADD_INTERFACE (Rest, @@ -317,4 +317,5 @@ ADD_INTERFACE (Rest, "direction " "minimum-distance " "style " + "voiced-position " );