X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest.cc;h=d7351d648aebf3ce7583876bb1bf8a6bac9ea2b3;hb=f20a6882444bfa274e03f459d4c45630c798dde5;hp=b0a0cce179da6f99367360e50153a5747f966267;hpb=ad4297de0246935caa4c51f4e152e20009a6f64e;p=lilypond.git diff --git a/lily/rest.cc b/lily/rest.cc index b0a0cce179..d7351d648a 100644 --- a/lily/rest.cc +++ b/lily/rest.cc @@ -3,64 +3,195 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys + (c) 1997--2006 Han-Wen Nienhuys */ -#include "molecule.hh" -#include "paper-def.hh" -#include "lookup.hh" #include "rest.hh" + +#include "directional-element-interface.hh" #include "dots.hh" -#include "axis-group-element.hh" +#include "font-interface.hh" +#include "international.hh" +#include "output-def.hh" #include "paper-score.hh" +#include "staff-symbol-referencer.hh" +#include "stencil.hh" -void -Rest::do_add_processing () +// -> offset callback +MAKE_SCHEME_CALLBACK (Rest, y_offset_callback, 1); +SCM +Rest::y_offset_callback (SCM smob) { - if (balltype_i_ == 0) - position_i_ += 2; + 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 = robust_scm2double (me->get_property ("staff-position"), 0) + * 0.5 * ss; + + if (line_count % 2) + { + if (duration_log == 0 && line_count > 1) + amount += ss; + } + else + amount += ss / 2; + + Grob *dot = unsmob_grob (me->get_object ("dot")); + if (dot && duration_log > 4) // UGH. + { + dot->set_property ("staff-position", + scm_from_int ((duration_log == 7) ? 4 : 3)); + } + if (dot && duration_log >= -1 && duration_log <= 1) // UGH again. + { + dot->set_property ("staff-position", + scm_from_int ((duration_log == 0) ? -1 : 1)); + } - Rhythmic_head::do_add_processing (); + if (!position_override) + amount += 2 * ss * get_grob_direction (me);; + + return scm_from_double (amount); } -void -Rest::do_post_processing () +/* + make this function easily usable in C++ +*/ +string +Rest::glyph_name (Grob *me, int balltype, string style, bool try_ledgers) { - Rhythmic_head::do_post_processing (); - if (dots_l_ && balltype_i_ > 4) + bool is_ledgered = false; + if (try_ledgers && (balltype == 0 || balltype == 1)) + { + Real rad = Staff_symbol_referencer::staff_radius (me) * 2.0; + Real pos = Staff_symbol_referencer::get_position (me); + + /* + Figure out when the rest is far enough outside the staff. This + could bemore generic, but hey, we understand this even after + dinner. + */ + is_ledgered |= (balltype == 0) && (pos >= +rad + 2 || pos < -rad); + is_ledgered |= (balltype == 1) && (pos <= -rad - 2 || pos > +rad); + } + + string actual_style (style.c_str ()); + + if ((style == "mensural") || (style == "neomensural")) + { + + /* + 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 (balltype > 4) + actual_style = ""; + } + + if ((style == "classical") && (balltype != 2)) { - dots_l_->position_i_ += 3; - if (balltype_i_ == 7) - dots_l_->position_i_++; + /* + 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 (balltype) + (is_ledgered ? "o" : "") + + actual_style); } -Rest::Rest () +MAKE_SCHEME_CALLBACK (Rest, print, 1); +SCM +Rest::brew_internal_stencil (Grob *me, bool ledgered) { - position_i_ =0; + 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; + 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); + 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 (); } -Molecule * -Rest::do_brew_molecule_p () const +SCM +Rest::print (SCM smob) { - bool ledger_b =false; + return brew_internal_stencil (unsmob_grob (smob), true); +} - if (balltype_i_ == 0 || balltype_i_ == 1) - ledger_b = abs(position_i_ - (2* balltype_i_ - 1)) > lines_i (); - +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); +} - - String style; - SCM style_sym =get_elt_property (style_scm_sym); - if (style_sym != SCM_BOOL_F) - { - style = ly_scm2string (SCM_CDR(style_sym)); - } - - Molecule s(lookup_l ()->rest (balltype_i_, ledger_b, style)); - Molecule * m = new Molecule ( Molecule (s)); - m->translate_axis (position_i_ * staff_line_leading_f ()/2.0, Y_AXIS); - return m; +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 + 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)); +} + +ADD_INTERFACE (Rest, "rest-interface", + "A rest symbol.", + + /* properties */ + + "style " + "direction " + "minimum-distance");