X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest.cc;h=e3543e4cb9545f2bef8eee0b2ce1b8b48fcf5afa;hb=9e69cb84d6ee5b0a861cd97869b10e3bdf0c833c;hp=9cdd9078c71148974e9852771f5105dd42209192;hpb=9a38b47c4a4589f2e7c413fcdfff83de454719e6;p=lilypond.git diff --git a/lily/rest.cc b/lily/rest.cc index 9cdd9078c7..e3543e4cb9 100644 --- a/lily/rest.cc +++ b/lily/rest.cc @@ -1,60 +1,71 @@ /* - rest.cc -- implement Rest + rest.cc -- implement Rest source file of the GNU LilyPond music typesetter - (c) 1997--2002 Han-Wen Nienhuys + (c) 1997--2006 Han-Wen Nienhuys */ -#include "molecule.hh" -#include "paper-def.hh" -#include "font-interface.hh" #include "rest.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 "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 = gh_scm2int (me->get_grob_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 + amount += ss / 2; + + Grob *dot = unsmob_grob (me->get_object ("dot")); + if (dot && duration_log > 4) // UGH. { - me->translate_axis (ss/2 , Y_AXIS); + dot->set_property ("staff-position", + scm_from_int ((duration_log == 7) ? 4 : 3)); } - - Grob * d = unsmob_grob (me->get_grob_property ("dot")); - if (d && bt > 4) // UGH. + if (dot && duration_log >= -1 && duration_log <= 1) // UGH again. { - d->set_grob_property ("staff-position", - gh_int2scm ((bt == 7) ? 4 : 3)); + dot->set_property ("staff-position", + scm_from_int ((duration_log == 0) ? -1 : 1)); } - return SCM_UNSPECIFIED; + if (!position_override) + amount += 2 * ss * get_grob_direction (me);; + + return scm_from_double (amount); } /* make this function easily usable in C++ - */ - -String -Rest::glyph_name (Grob * me, int balltype, String style) +*/ +string +Rest::glyph_name (Grob *me, int balltype, string style, bool try_ledgers) { - bool ledger_b =false; - - if (balltype == 0 || balltype == 1) + 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); @@ -63,70 +74,125 @@ Rest::glyph_name (Grob * me, int balltype, String style) Figure out when the rest is far enough outside the staff. This could bemore generic, but hey, we understand this even after dinner. - - */ - ledger_b = ledger_b || (balltype == 0 && (pos >= rad +2 || pos < -rad )); - ledger_b = ledger_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); } - return ("rests-") + to_string (balltype) - + (ledger_b ? "o" : "") + style; -} + 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)) + { + /* + 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 = ""; + } -MAKE_SCHEME_CALLBACK (Rest,brew_molecule,1); + return ("rests." + to_string (balltype) + (is_ledgered ? "o" : "") + + actual_style); +} +MAKE_SCHEME_CALLBACK (Rest, print, 1); SCM -Rest::brew_internal_molecule (SCM smob) +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 (); - SCM balltype_scm = me->get_grob_property ("duration-log"); - if (!gh_number_p (balltype_scm)) - return Molecule ().smobbed_copy (); + int balltype = scm_to_int (balltype_scm); - int balltype = gh_scm2int (balltype_scm); - - String style; - SCM style_sym =me->get_grob_property ("style"); - if (gh_symbol_p (style_sym)) - { - style = ly_scm2string (scm_symbol_to_string (style_sym)); - } + string style; + SCM style_scm = me->get_property ("style"); + if (scm_is_symbol (style_scm)) + style = ly_scm2string (scm_symbol_to_string (style_scm)); - for(;;) { - String idx = glyph_name (me, balltype, style); - Molecule res = Font_interface::get_default_font (me)->find_by_name (idx); - if(res.empty_b() && style!="") - style=""; - else - return res.smobbed_copy(); - } + 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 (); } -SCM -Rest::brew_molecule (SCM smob) +SCM +Rest::print (SCM smob) { - return brew_internal_molecule (smob); + 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 molecule has ledgers depending on + 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) +{ + return generic_extent_callback (unsmob_grob (smob), X_AXIS); +} + +MAKE_SCHEME_CALLBACK (Rest, height, 1); +SCM +Rest::height (SCM smob) { - Axis a = (Axis) gh_scm2int (ax); - SCM m = brew_internal_molecule (smob); - return ly_interval2scm (unsmob_molecule (m)->extent (a)); + 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, + "A rest symbol.", -ADD_INTERFACE (Rest,"rest-interface", - "a rest", - "style minimum-beam-collision-distance"); + /* properties */ + + "style " + "direction " + "minimum-distance");