X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest.cc;h=80b473eb101ec6747ccccb247ada80b9837f0cbc;hb=24bfffc3b5da5d82eb9b20eb0a0d1e6ff3a1a7d3;hp=daa9ceb5ddfe2780c19559292e340a2d190bb78a;hpb=42760f5db93014a878f17f05538464326683d354;p=lilypond.git diff --git a/lily/rest.cc b/lily/rest.cc index daa9ceb5dd..80b473eb10 100644 --- a/lily/rest.cc +++ b/lily/rest.cc @@ -1,66 +1,192 @@ /* - rest.cc -- implement Rest + rest.cc -- implement Rest source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys */ -#include "molecule.hh" -#include "paper-def.hh" -#include "lookup.hh" #include "rest.hh" + +#include "stencil.hh" +#include "output-def.hh" +#include "font-interface.hh" #include "dots.hh" -#include "axis-group-element.hh" #include "paper-score.hh" +#include "staff-symbol-referencer.hh" +#include "directional-element-interface.hh" -void -Rest::do_add_processing () +// -> offset callback +MAKE_SCHEME_CALLBACK (Rest, after_line_breaking, 1); +SCM +Rest::after_line_breaking (SCM smob) { - if (balltype_i_ == 0) - position_i_ += 2; + Grob *me = unsmob_grob (smob); + int bt = scm_to_int (me->get_property ("duration-log")); + int lc = Staff_symbol_referencer::line_count (me); + Real ss = Staff_symbol_referencer::staff_space (me); + if (lc % 2) + { + if (bt == 0 && lc > 1) + { + me->translate_axis (ss , Y_AXIS); + } + } + else + { + me->translate_axis (ss/2 , Y_AXIS); + } - Rhythmic_head::do_add_processing (); + Grob * d = unsmob_grob (me->get_property ("dot")); + if (d && bt > 4) // UGH. + { + d->set_property ("staff-position", + scm_int2num ((bt == 7) ? 4 : 3)); + } + if (d && bt >= -1 && bt <= 1) // UGH again. + { + d->set_property ("staff-position", + scm_int2num ((bt == 0) ? -1 : 1)); + } + return SCM_UNSPECIFIED; } -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 ledgered_b = false; + if (try_ledgers && (balltype == 0 || balltype == 1)) { - dots_l_->position_i_ += 3; - if (balltype_i_ == 7) - dots_l_->position_i_++; + 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. + */ + ledgered_b |= (balltype == 0) && (pos >= +rad + 2 || pos < -rad); + ledgered_b |= (balltype == 1) && (pos <= -rad - 2 || pos > +rad); } -} -Rest::Rest () -{ - position_i_ =0; + String actual_style (style.to_str0 ()); + + 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 + */ + ledgered_b = 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)) + { + /* + 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) + (ledgered_b ? "o" : "") + + actual_style); } -Molecule * -Rest::do_brew_molecule_p () const + +MAKE_SCHEME_CALLBACK (Rest, print, 1); + +SCM +Rest::brew_internal_stencil (SCM smob, bool ledgered) { - bool ledger_b =false; + Grob* me = unsmob_grob (smob); - if (balltype_i_ == 0 || balltype_i_ == 1) - ledger_b = abs(position_f () - (2* balltype_i_ - 1)) > lines_i (); - + 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_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)); + 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.to_str0 ())); + + return out.smobbed_copy (); +} + +SCM +Rest::print (SCM smob) +{ + return brew_internal_stencil (smob, true); +} + +MAKE_SCHEME_CALLBACK (Rest, extent_callback, 2); +/* + 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) +{ + Axis a = (Axis) scm_to_int (ax); + + /* + 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 (smob, a != X_AXIS); + return ly_interval2scm (unsmob_stencil (m)->extent (a)); +} + +MAKE_SCHEME_CALLBACK (Rest, polyphonic_offset_callback, 2); +SCM +Rest::polyphonic_offset_callback (SCM smob, SCM) +{ + Grob* me = unsmob_grob (smob); + if (scm_is_number (me->get_property ("staff-position"))) + return scm_make_real (0); + + Direction d = get_grob_direction (me); + Real off = 2 * d ; + if (off) + off *= Staff_symbol_referencer::staff_space (me); - return m; + return scm_make_real (off); } +ADD_INTERFACE (Rest, "rest-interface", + "A rest symbol.", + "style direction minimum-distance");