source file of the GNU LilyPond music typesetter
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "rest.hh"
#include "directional-element-interface.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 = scm_to_int (me->get_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)
+
+ 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
- {
- me->translate_axis (ss / 2, Y_AXIS);
- }
+ amount += ss / 2;
- Grob *d = unsmob_grob (me->get_object ("dot"));
- if (d && bt > 4) // UGH.
+ Grob *dot = unsmob_grob (me->get_object ("dot"));
+ if (dot && duration_log > 4) // UGH.
{
- d->set_property ("staff-position",
- scm_from_int ((bt == 7) ? 4 : 3));
+ dot->set_property ("staff-position",
+ scm_from_int ((duration_log == 7) ? 4 : 3));
}
- if (d && bt >= -1 && bt <= 1) // UGH again.
+ if (dot && duration_log >= -1 && duration_log <= 1) // UGH again.
{
- d->set_property ("staff-position",
- scm_from_int ((bt == 0) ? -1 : 1));
+ dot->set_property ("staff-position",
+ scm_from_int ((duration_log == 0) ? -1 : 1));
}
- return SCM_UNSPECIFIED;
+
+ amount += 2 * ss * get_grob_direction (me);;
+
+ return scm_from_double (amount);
}
/*
String
Rest::glyph_name (Grob *me, int balltype, String style, bool try_ledgers)
{
- bool ledgered_b = false;
+ bool is_ledgered = false;
if (try_ledgers && (balltype == 0 || balltype == 1))
{
Real rad = Staff_symbol_referencer::staff_radius (me) * 2.0;
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);
+ is_ledgered |= (balltype == 0) && (pos >= +rad + 2 || pos < -rad);
+ is_ledgered |= (balltype == 1) && (pos <= -rad - 2 || pos > +rad);
}
String actual_style (style.to_str0 ());
ledgered rests at all now that we can draw ledger lines with
variable width, length and blotdiameter? -- jr
*/
- ledgered_b = 0;
+ is_ledgered = 0;
/*
There are no 32th/64th/128th mensural/neomensural rests. In
actual_style = "";
}
- return ("rests." + to_string (balltype) + (ledgered_b ? "o" : "")
+ return ("rests." + to_string (balltype) + (is_ledgered ? "o" : "")
+ actual_style);
}
MAKE_SCHEME_CALLBACK (Rest, print, 1);
-
SCM
-Rest::brew_internal_stencil (SCM smob, bool ledgered)
+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
Rest::print (SCM smob)
{
- return brew_internal_stencil (smob, true);
+ 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 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)
{
- Axis a = (Axis) scm_to_int (ax);
+ return generic_extent_callback (unsmob_grob (smob), X_AXIS);
+}
+
+MAKE_SCHEME_CALLBACK (Rest, height, 1);
+SCM
+Rest::height (SCM smob)
+{
+ 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
consequence: we get too small extents and potential collisions
with ledgered rests.
*/
- SCM m = brew_internal_stencil (smob, a != X_AXIS);
+ SCM m = brew_internal_stencil (me, 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_from_double (0);
-
- Direction d = get_grob_direction (me);
- Real off = 2 * d;
- if (off)
- off *= Staff_symbol_referencer::staff_space (me);
-
- return scm_from_double (off);
-}
-
ADD_INTERFACE (Rest, "rest-interface",
"A rest symbol.",
- "style direction minimum-distance");
+
+ /* properties */
+
+ "style "
+ "direction "
+ "minimum-distance");
projects / lilypond.git / blobdiff