X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest.cc;h=fc1f7e278276d556f809399bc5ea977f6c547fe1;hb=8fcb449bffdbfc7803da139e3aecd6289dba1db5;hp=a8264b0ef67d4582570ee69fd5abe4f6b37f454f;hpb=40c8e12b8afa8e9c7e44cf6ea3b724295884091b;p=lilypond.git diff --git a/lily/rest.cc b/lily/rest.cc index a8264b0ef6..fc1f7e2782 100644 --- a/lily/rest.cc +++ b/lily/rest.cc @@ -3,68 +3,175 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ -#include "molecule.hh" +#include "stencil.hh" #include "paper-def.hh" -#include "lookup.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" // -> offset callback -MAKE_SCHEME_SCORE_ELEMENT_CALLBACK(Rest,after_line_breaking); +MAKE_SCHEME_CALLBACK (Rest,after_line_breaking,1); SCM Rest::after_line_breaking (SCM smob) { - Score_element *me = unsmob_element (smob); - int bt = gh_scm2int (me->get_elt_property ("duration-log")); - if (bt == 0) + Grob *me = unsmob_grob (smob); + int bt = ly_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) { - Staff_symbol_referencer_interface si (me); - me->translate_axis (si.staff_space() , Y_AXIS); + if (bt == 0 && lc > 1) + { + me->translate_axis (ss , Y_AXIS); + } + } + else + { + me->translate_axis (ss/2 , Y_AXIS); } - Score_element * d = unsmob_element (me->get_elt_pointer ("dot")); + Grob * d = unsmob_grob (me->get_property ("dot")); if (d && bt > 4) // UGH. { - d->set_elt_property ("staff-position", - gh_int2scm ((bt == 7) ? 4 : 3)); + d->set_property ("staff-position", + scm_int2num ((bt == 7) ? 4 : 3)); } - - return SCM_UNDEFINED; + if (d && bt >= -1 && bt <= 1) // UGH again. + { + d->set_property ("staff-position", + scm_int2num ((bt == 0) ? -1 : 1)); + } + return SCM_UNSPECIFIED; } - -MAKE_SCHEME_SCORE_ELEMENT_CALLBACK(Rest,brew_molecule) -SCM -Rest::brew_molecule (SCM smob) +/* + make this function easily usable in C++ + */ +String +Rest::glyph_name (Grob *me, int balltype, String style) { - Score_element* sc = unsmob_element (smob); - - bool ledger_b =false; + bool ledgered_b = false; - SCM balltype = sc->get_elt_property ("duration-log"); - - if (balltype == gh_int2scm (0) || balltype == gh_int2scm (1)) + if (balltype == 0 || balltype == 1) { - Staff_symbol_referencer_interface si(sc); - ledger_b = abs(si.position_f () - (2* gh_scm2int (balltype) - 1)) - > si.line_count (); + 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 = ""; + } + + return ("rests-") + to_string (balltype) + (ledgered_b ? "o" : "") + actual_style; +} + + +MAKE_SCHEME_CALLBACK (Rest,print,1); + +SCM +Rest::brew_internal_stencil (SCM smob) +{ + Grob* me = unsmob_grob (smob); + + SCM balltype_scm = me->get_property ("duration-log"); + if (!ly_c_number_p (balltype_scm)) + return Stencil ().smobbed_copy (); + + int balltype = ly_scm2int (balltype_scm); String style; - SCM style_sym =sc->get_elt_property ("style"); - if (gh_scm2int (balltype) >= 2 && gh_string_p (style_sym)) - { - style = ly_scm2string (style_sym); - } + SCM style_scm = me->get_property ("style"); + if (ly_c_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 ())); - String idx = ("rests-") + to_str (gh_scm2int (balltype)) - + (ledger_b ? "o" : "") + style; + return out.smobbed_copy (); +} - return sc-> lookup_l ()->afm_find (idx).create_scheme(); +SCM +Rest::print (SCM smob) +{ + 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) ly_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 (ly_c_number_p (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 scm_make_real (off); +} + +ADD_INTERFACE (Rest,"rest-interface", + "A rest symbol.", + "style minimum-distance");