source file of the GNU LilyPond music typesetter
- (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "hairpin.hh"
#include "dimensions.hh"
-#include "font-interface.hh"
#include "international.hh"
#include "line-interface.hh"
-#include "lookup.hh"
#include "output-def.hh"
#include "paper-column.hh"
#include "pointer-group-interface.hh"
#include "spanner.hh"
#include "staff-symbol-referencer.hh"
#include "text-interface.hh"
+#include "note-column.hh"
#include "warn.hh"
MAKE_SCHEME_CALLBACK (Hairpin, after_line_breaking, 1);
Hairpin::after_line_breaking (SCM smob)
{
Spanner *me = dynamic_cast<Spanner *> (unsmob_grob (smob));
+ consider_suicide (me);
+ return SCM_UNSPECIFIED;
+}
+
+void
+Hairpin::consider_suicide (Spanner*me)
+{
Drul_array<bool> broken;
Drul_array<Item *> bounds;
Direction d = LEFT;
&& ly_is_equal (bounds[RIGHT]->get_column ()->get_property ("when"),
bounds[LEFT]->get_property ("when")))
me->suicide ();
- return SCM_UNSPECIFIED;
}
MAKE_SCHEME_CALLBACK (Hairpin, print, 1);
{
Spanner *me = dynamic_cast<Spanner *> (unsmob_grob (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))
{
}
while (flip (&d) != LEFT);
+ broken[RIGHT] = broken[RIGHT] && me->broken_neighbor (RIGHT);
+ broken[RIGHT] = broken[RIGHT] && me->broken_neighbor (RIGHT)->is_live ();
+
+ if (broken[RIGHT])
+ {
+ Spanner *next = me->broken_neighbor (RIGHT);
+ Stencil *s = next->get_stencil ();
+ if (!s || s->is_empty ())
+ broken[RIGHT] = false;
+ }
+
Grob *common = bounds[LEFT]->common_refpoint (bounds[RIGHT], X_AXIS);
Drul_array<Real> x_points;
+ /*
+ Use the height and thickness of the hairpin when making a circled tip
+ */
+ bool circled_tip = ly_scm2bool (me->get_property ("circled-tip"));
+ Real height = robust_scm2double (me->get_property ("height"), 0.2) *
+ Staff_symbol_referencer::staff_space (me);
+ /*
+ FIXME: 0.525 is still just a guess...
+ */
+ Real rad = height * 0.525;
+ Real thick = 1.0;
+ if (circled_tip)
+ thick = robust_scm2double (me->get_property ("thickness"), 1.0)
+ * Staff_symbol_referencer::line_thickness (me);
+
do
{
Item *b = bounds[d];
{
bool neighbor_found = false;
extract_grob_set (me, "adjacent-hairpins", pins);
- for (int i = 0; i < pins.size (); i++)
+ for (vsize i = 0; i < pins.size (); i++)
{
/*
FIXME: this will fuck up in case of polyphonic
neighbor_found = true;
}
- /*
- If we're hung on a paper column, that means we're not
- adjacent to a text-dynamic, and we may move closer. We
- make the padding a little smaller, here.
- */
Interval e = robust_relative_extent (b, common, X_AXIS);
- x_points[d]
- = neighbor_found ? e.center () - d * padding / 3 : e[d];
+ if (neighbor_found)
+ {
+ /*
+ Handle back-to-back hairpins with a circle in the middle
+ */
+ if (circled_tip && (grow_dir != d))
+ x_points[d] = e.center () + d * (rad - thick / 2.0);
+ /*
+ If we're hung on a paper column, that means we're not
+ adjacent to a text-dynamic, and we may move closer. We
+ make the padding a little smaller, here.
+ */
+ else
+ x_points[d] = e.center () - d * padding / 3;
+ }
+ else
+ {
+ if (Note_column::has_interface (b)
+ && Note_column::has_rests (b))
+ x_points[d] = e[-d];
+ else
+ x_points[d] = e[d];
+
+ Item *bound = me->get_bound (d);
+ if (bound->is_non_musical (bound))
+ x_points[d] -= d * padding;
+ }
}
}
}
}
bool continued = broken[Direction (-grow_dir)];
- Real height = robust_scm2double (me->get_property ("height"), 0.2) *
- Staff_symbol_referencer::staff_space (me);
- Real starth, endh;
+ Real starth = 0;
+ Real endh = 0;
if (grow_dir < 0)
{
starth = height;
/*
should do relative to staff-symbol staff-space?
*/
-
Stencil mol;
- mol = Line_interface::line (me, Offset (0, starth), Offset (width, endh));
+ Real x = 0.0;
+
+ /*
+ Compensate for size of circle
+ */
+ Direction tip_dir = -grow_dir;
+ if (circled_tip && !broken[tip_dir])
+ {
+ if (grow_dir > 0)
+ x = rad * 2.0;
+ else if (grow_dir < 0)
+ width -= rad *2.0;
+ }
+ mol = Line_interface::line (me, Offset (x, starth), Offset (width, endh));
mol.add_stencil (Line_interface::line (me,
- Offset (0, -starth),
+ Offset (x, -starth),
Offset (width, -endh)));
+ /*
+ Support al/del niente notation by putting a circle at the
+ tip of the (de)crescendo.
+ */
+ if (circled_tip)
+ {
+ Box extent (Interval (-rad, rad), Interval (-rad, rad));
+
+ /* Hmmm, perhaps we should have a Lookup::circle () method? */
+ Stencil circle (extent,
+ scm_list_4 (ly_symbol2scm ("circle"),
+ scm_from_double (rad),
+ scm_from_double (thick),
+ SCM_BOOL_F));
+
+ /*
+ don't add another circle the hairpin is broken
+ */
+ if (!broken[tip_dir])
+ mol.add_at_edge (X_AXIS, tip_dir, Stencil (circle), 0);
+ }
+
mol.translate_axis (x_points[LEFT]
- bounds[LEFT]->relative_coordinate (common, X_AXIS),
X_AXIS);
return mol.smobbed_copy ();
}
-ADD_INTERFACE (Hairpin, "hairpin-interface",
- "A hairpin crescendo/decrescendo.",
+ADD_INTERFACE (Hairpin,
+ "A hairpin crescendo or decrescendo.",
+
+ /* properties */
"adjacent-hairpins "
+ "circled-tip "
"bound-padding "
"grow-direction "
"height "
);
-
projects / lilypond.git / blobdiff