*/
#include "stencil.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
#include "font-interface.hh"
#include "rest.hh"
#include "dots.hh"
make this function easily usable in C++
*/
String
-Rest::glyph_name (Grob *me, int balltype, String style)
+Rest::glyph_name (Grob *me, int balltype, String style, bool try_ledgers)
{
bool ledgered_b = false;
-
- if (balltype == 0 || balltype == 1)
+ 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);
String actual_style (style.to_str0 ());
- if ((style == "mensural") || (style == "neo_mensural")) {
+ if ((style == "mensural") || (style == "neomensural")) {
/*
FIXME: Currently, ancient font does not provide ledgered rests;
ledgered_b = 0;
/*
- There are no 32th/64th/128th mensural/neo_mensural rests. In
+ There are no 32th/64th/128th mensural/neomensural rests. In
these cases, revert back to default style.
*/
if (balltype > 4)
MAKE_SCHEME_CALLBACK (Rest,print,1);
SCM
-Rest::brew_internal_stencil (SCM smob)
+Rest::brew_internal_stencil (SCM smob, bool ledgered)
{
Grob* me = unsmob_grob (smob);
SCM balltype_scm = me->get_property ("duration-log");
- if (!ly_number_p (balltype_scm))
+ if (!ly_c_number_p (balltype_scm))
return Stencil ().smobbed_copy ();
int balltype = ly_scm2int (balltype_scm);
String style;
SCM style_scm = me->get_property ("style");
- if (ly_symbol_p (style_scm))
+ 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);
+ 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 ()));
SCM
Rest::print (SCM smob)
{
- return brew_internal_stencil (smob);
+ return brew_internal_stencil (smob, true);
}
MAKE_SCHEME_CALLBACK (Rest,extent_callback,2);
/*
Rest::extent_callback (SCM smob, SCM ax)
{
Axis a = (Axis) ly_scm2int (ax);
- SCM m = brew_internal_stencil (smob);
+
+ /*
+ 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));
}
Rest::polyphonic_offset_callback (SCM smob, SCM)
{
Grob* me = unsmob_grob (smob);
- if (ly_number_p (me->get_property ("staff-position")))
+ if (ly_c_number_p (me->get_property ("staff-position")))
return scm_make_real (0);
Direction d = get_grob_direction (me);
ADD_INTERFACE (Rest,"rest-interface",
"A rest symbol.",
- "style minimum-distance");
+ "style direction minimum-distance");