X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest.cc;h=7fd5101d84fbcd15e73c76a11996f2b086910e1b;hb=8cab78caa0db1ba14f2e52e4c1ddbb541ea0e5cb;hp=fa9fdb166070cf8cca38f04c07608bd0f1854056;hpb=4b975f3177880e16e759f67be4517f67109c2633;p=lilypond.git diff --git a/lily/rest.cc b/lily/rest.cc index fa9fdb1660..7fd5101d84 100644 --- a/lily/rest.cc +++ b/lily/rest.cc @@ -3,61 +3,72 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2005 Han-Wen Nienhuys + (c) 1997--2009 Han-Wen Nienhuys */ #include "rest.hh" -#include "stencil.hh" -#include "output-def.hh" -#include "font-interface.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 "directional-element-interface.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) { Grob *me = unsmob_grob (smob); - int bt = scm_to_int (me->get_property ("duration-log")); - int lc = Staff_symbol_referencer::line_count (me); + 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); - if (lc % 2) + + bool position_override = scm_is_number (me->get_property ("staff-position")); + Real amount = robust_scm2double (me->get_property ("staff-position"), 0) + * 0.5 * ss; + + if (line_count % 2) { - if (bt == 0 && lc > 1) - { - me->translate_axis (ss, Y_AXIS); - } + if (duration_log == 0 && line_count > 1) + amount += ss; } else - { - me->translate_axis (ss / 2, Y_AXIS); - } + amount += ss / 2; - Grob *d = unsmob_grob (me->get_object ("dot")); - if (d && bt > 4) // UGH. - { - d->set_property ("staff-position", - scm_from_int ((bt == 7) ? 4 : 3)); - } - if (d && bt >= -1 && bt <= 1) // UGH again. - { - d->set_property ("staff-position", - scm_from_int ((bt == 0) ? -1 : 1)); - } - return SCM_UNSPECIFIED; + if (!position_override) + amount += 2 * ss * get_grob_direction (me);; + + 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 this function easily usable in C++ */ -String -Rest::glyph_name (Grob *me, int balltype, String style, bool try_ledgers) +string +Rest::glyph_name (Grob *me, int balltype, string style, bool try_ledgers) { - bool ledgered_b = false; + bool is_ledgered = false; if (try_ledgers && (balltype == 0 || balltype == 1)) { Real rad = Staff_symbol_referencer::staff_radius (me) * 2.0; @@ -68,11 +79,11 @@ Rest::glyph_name (Grob *me, int balltype, String style, bool try_ledgers) could bemore generic, but hey, we understand this even after dinner. */ - ledgered_b |= (balltype == 0) && (pos >= +rad + 2 || pos < -rad); - ledgered_b |= (balltype == 1) && (pos <= -rad - 2 || pos > +rad); + is_ledgered |= (balltype == 0) && (pos >= +rad + 2 || pos < -rad); + is_ledgered |= (balltype == 1) && (pos <= -rad - 2 || pos > +rad); } - String actual_style (style.to_str0 ()); + string actual_style (style.c_str ()); if ((style == "mensural") || (style == "neomensural")) { @@ -83,7 +94,7 @@ Rest::glyph_name (Grob *me, int balltype, String style, bool try_ledgers) ledgered rests at all now that we can draw ledger lines with variable width, length and blotdiameter? -- jr */ - ledgered_b = 0; + is_ledgered = 0; /* There are no 32th/64th/128th mensural/neomensural rests. In @@ -111,33 +122,30 @@ Rest::glyph_name (Grob *me, int balltype, String style, bool try_ledgers) actual_style = ""; } - return ("rests." + to_string (balltype) + (ledgered_b ? "o" : "") + return ("rests." + to_string (balltype) + (is_ledgered ? "o" : "") + actual_style); } MAKE_SCHEME_CALLBACK (Rest, print, 1); - SCM -Rest::brew_internal_stencil (SCM smob, bool ledgered) +Rest::brew_internal_stencil (Grob *me, bool ledgered) { - Grob *me = unsmob_grob (smob); - SCM balltype_scm = me->get_property ("duration-log"); if (!scm_is_number (balltype_scm)) return Stencil ().smobbed_copy (); int balltype = scm_to_int (balltype_scm); - String style; + string style; SCM style_scm = me->get_property ("style"); if (scm_is_symbol (style_scm)) style = ly_scm2string (scm_symbol_to_string (style_scm)); Font_metric *fm = Font_interface::get_default_font (me); - String font_char = glyph_name (me, balltype, style, ledgered); + string font_char = glyph_name (me, balltype, style, ledgered); Stencil out = fm->find_by_name (font_char); if (out.is_empty ()) - me->warning (_f ("rest `%s' not found", font_char.to_str0 ())); + me->warning (_f ("rest `%s' not found", font_char.c_str ())); return out.smobbed_copy (); } @@ -145,18 +153,32 @@ Rest::brew_internal_stencil (SCM smob, bool ledgered) SCM Rest::print (SCM smob) { - return brew_internal_stencil (smob, true); + return brew_internal_stencil (unsmob_grob (smob), true); } -MAKE_SCHEME_CALLBACK (Rest, extent_callback, 2); +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::extent_callback (SCM smob, SCM ax) +Rest::width (SCM smob) { - Axis a = (Axis) scm_to_int (ax); + 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); +} + +/* + 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) +{ /* Don't want ledgers: ledgers depend on Y position, which depends on rest collision, which depends on stem size which depends on beam @@ -165,27 +187,29 @@ Rest::extent_callback (SCM smob, SCM ax) consequence: we get too small extents and potential collisions with ledgered rests. */ - SCM m = brew_internal_stencil (smob, a != X_AXIS); + SCM m = brew_internal_stencil (me, a != X_AXIS); return ly_interval2scm (unsmob_stencil (m)->extent (a)); } -MAKE_SCHEME_CALLBACK (Rest, polyphonic_offset_callback, 2); +MAKE_SCHEME_CALLBACK (Rest, pure_height, 3); SCM -Rest::polyphonic_offset_callback (SCM smob, SCM) +Rest::pure_height (SCM smob, + SCM /* start */, + SCM /* end */) { Grob *me = unsmob_grob (smob); - if (scm_is_number (me->get_property ("staff-position"))) - return scm_from_double (0); - - Direction d = get_grob_direction (me); - Real off = 2 * d; - if (off) - off *= Staff_symbol_referencer::staff_space (me); - - return scm_from_double (off); + SCM m = brew_internal_stencil (me, false); + return ly_interval2scm (unsmob_stencil (m)->extent (Y_AXIS)); } -ADD_INTERFACE (Rest, "rest-interface", - "A rest symbol.", - "style direction minimum-distance"); +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 " + );