source file of the GNU LilyPond music typesetter
- (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "hairpin.hh"
#include "note-column.hh"
#include "warn.hh"
-MAKE_SCHEME_CALLBACK (Hairpin, after_line_breaking, 1);
+MAKE_SCHEME_CALLBACK (Hairpin, height, 1);
SCM
-Hairpin::after_line_breaking (SCM smob)
+Hairpin::height (SCM smob)
{
- Spanner *me = dynamic_cast<Spanner *> (unsmob_grob (smob));
- consider_suicide (me);
-
- return SCM_UNSPECIFIED;
+ return Grob::stencil_height (smob);
}
-void
-Hairpin::consider_suicide (Spanner*me)
+MAKE_SCHEME_CALLBACK (Hairpin, pure_height, 3);
+SCM
+Hairpin::pure_height (SCM smob, SCM, SCM)
{
- Drul_array<bool> broken;
- Drul_array<Item *> bounds;
- Direction d = LEFT;
- do
- {
- bounds[d] = me->get_bound (d);
- broken[d] = bounds[d]->break_status_dir () != CENTER;
- }
- while (flip (&d) != LEFT);
+ Grob *me = unsmob_grob (smob);
+ Real height = robust_scm2double (me->get_property ("height"), 0.0)
+ * Staff_symbol_referencer::staff_space (me);
- if (broken[LEFT]
- && ly_is_equal (bounds[RIGHT]->get_column ()->get_property ("when"),
- bounds[LEFT]->get_property ("when")))
- me->suicide ();
-
+ Real thickness = robust_scm2double (me->get_property ("thickness"), 1)
+ * Staff_symbol_referencer::line_thickness (me);
+
+ height += thickness / 2;
+ return ly_interval2scm (Interval (-height, height));
}
MAKE_SCHEME_CALLBACK (Hairpin, print, 1);
-
SCM
Hairpin::print (SCM smob)
{
- Spanner *me = dynamic_cast<Spanner *> (unsmob_grob (smob));
+ Spanner *me = unsmob_spanner (smob);
- if (Spanner *orig = dynamic_cast<Spanner*> (me->original ()))
- {
- for (vsize i = 0; i < orig->broken_intos_.size (); i++)
- Hairpin::consider_suicide (orig->broken_intos_[i]);
- }
-
SCM s = me->get_property ("grow-direction");
if (!is_direction (s))
{
/*
should do relative to staff-symbol staff-space?
*/
-
Stencil mol;
Real x = 0.0;
Box extent (Interval (-rad, rad), Interval (-rad, rad));
/* Hmmm, perhaps we should have a Lookup::circle () method? */
- Stencil circle(extent,
+ Stencil circle (extent,
scm_list_4 (ly_symbol2scm ("circle"),
scm_from_double (rad),
scm_from_double (thick),
don't add another circle the hairpin is broken
*/
if (!broken[tip_dir])
- mol.add_at_edge (X_AXIS, tip_dir, Stencil (circle), 0, 0);
+ mol.add_at_edge (X_AXIS, tip_dir, Stencil (circle), 0);
}
mol.translate_axis (x_points[LEFT]
}
ADD_INTERFACE (Hairpin,
- "A hairpin crescendo/decrescendo.",
+ "A hairpin crescendo or decrescendo.",
- /* props */
+ /* properties */
"adjacent-hairpins "
"circled-tip "
"bound-padding "