X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest.cc;h=1bec02a6faca455f9210c3b195279be23cd72f52;hb=829caefcc215ddffe25806d0ff87bcc577c3286e;hp=97f91a6a6a44d5613fd268acb17ede3ef1a06d8f;hpb=8309cbcd6660ea1f0b35abacbb424ddc4158e448;p=lilypond.git diff --git a/lily/rest.cc b/lily/rest.cc index 97f91a6a6a..1bec02a6fa 100644 --- a/lily/rest.cc +++ b/lily/rest.cc @@ -1,52 +1,177 @@ /* - rest.cc -- implement Rest + rest.cc -- implement Rest - source file of the LilyPond music typesetter + source file of the GNU LilyPond music typesetter - (c) 1997 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ -#include "duration.hh" -#include "rest.hh" -#include "dimen.hh" -#include "debug.hh" + +#include "stencil.hh" #include "paper-def.hh" -#include "lookup.hh" -#include "molecule.hh" +#include "font-interface.hh" #include "rest.hh" +#include "dots.hh" +#include "paper-score.hh" +#include "staff-symbol-referencer.hh" +#include "directional-element-interface.hh" -Rest::Rest(Duration d) +// -> offset callback +MAKE_SCHEME_CALLBACK (Rest,after_line_breaking,1); +SCM +Rest::after_line_breaking (SCM smob) { - balltype = d.type_i_; - dots = d.dots_i_; - pos_i_ = 0; + Grob *me = unsmob_grob (smob); + int bt = gh_scm2int (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); + } + + Grob * d = unsmob_grob (me->get_property ("dot")); + if (d && bt > 4) // UGH. + { + d->set_property ("staff-position", + gh_int2scm ((bt == 7) ? 4 : 3)); + } + if (d && bt >= -1 && bt <= 1) // UGH again. + { + d->set_property ("staff-position", + gh_int2scm ((bt == 0) ? -1 : 1)); + } + return SCM_UNSPECIFIED; } +/* + make this function easily usable in C++ + */ +String +Rest::glyph_name (Grob *me, int balltype, String style) +{ + bool ledgered_b = false; + + if (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. + */ + ledgered_b |= (balltype == 0) && (pos >= +rad + 2 || pos < -rad); + ledgered_b |= (balltype == 1) && (pos <= -rad - 2 || pos > +rad); + } + + String actual_style (style.to_str0 ()); + + if ((style == "mensural") || (style == "neo_mensural")) { + + /* + 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/neo_mensural 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 = ""; + } -void -Rest::do_print()const + return ("rests-") + to_string (balltype) + (ledgered_b ? "o" : "") + actual_style; +} + + +MAKE_SCHEME_CALLBACK (Rest,print,1); + +SCM +Rest::brew_internal_stencil (SCM smob) { -#ifndef NPRINT - mtor << "Rest "<get_property ("duration-log"); + if (!gh_number_p (balltype_scm)) + return Stencil ().smobbed_copy (); + + int balltype = gh_scm2int (balltype_scm); + + String style; + SCM style_scm = me->get_property ("style"); + if (gh_symbol_p (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); + 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 (); } -Molecule* -Rest::brew_molecule_p()const +SCM +Rest::print (SCM smob) { - Paper_def *p =paper(); - - Symbol s; - s = p->lookup_l()->rest(balltype); - - Molecule *m = new Molecule(Atom(s)); - if (dots) { - Symbol d =p->lookup_l()->dots(dots); - Molecule dm; - dm.add(Atom(d)); - m->add_right(dm); - } - m->translate(Offset(0,pos_i_ * paper()->internote())); - return m; + return brew_internal_stencil (smob); } +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) gh_scm2int (ax); + SCM m = brew_internal_stencil (smob); + 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 (gh_number_p (me->get_property ("staff-position"))) + return gh_double2scm (0); + + Direction d = get_grob_direction (me); + Real off = 2* d ; + if (off) + off *= Staff_symbol_referencer::staff_space (me); + return gh_double2scm (off); +} + +ADD_INTERFACE (Rest,"rest-interface", + "A rest symbol.", + "style minimum-distance");