source file of the GNU LilyPond music typesetter
- (c) 1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-#include "molecule.hh"
+#include "staff-symbol-referencer.hh"
+#include "stencil.hh"
+#include "line-interface.hh"
#include "hairpin.hh"
#include "spanner.hh"
#include "font-interface.hh"
#include "dimensions.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
#include "warn.hh"
#include "paper-column.hh"
#include "lookup.hh"
-MAKE_SCHEME_CALLBACK (Hairpin, brew_molecule, 1);
+MAKE_SCHEME_CALLBACK (Hairpin, print, 1);
SCM
-Hairpin::brew_molecule (SCM smob)
+Hairpin::print (SCM smob)
{
Grob *me= unsmob_grob (smob);
Spanner *spanner = dynamic_cast<Spanner*> (me);
- Real line = me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));
-
- SCM s = me->get_grob_property ("grow-direction");
- if (!ly_dir_p (s))
+ SCM s = me->get_property ("grow-direction");
+ if (!is_direction (s))
{
me->suicide ();
return SCM_EOL;
Direction grow_dir = to_dir (s);
-
- /* Ugh, must be same as Text_spanner::brew_molecule. */
-
- /*
- Ugh. property name is not general.
- */
- Real padding = gh_scm2double (me->get_grob_property ("if-text-padding"));
+ Real padding = scm_to_double (me->get_property ("bound-padding"));
Drul_array<bool> broken;
Drul_array<Item*> bounds ;
Direction d = LEFT;
do
{
- bounds[d] =spanner->get_bound (d);
+ bounds[d] = spanner->get_bound (d);
broken[d] = bounds[d]->break_status_dir () != CENTER;
}
while (flip (&d) != LEFT);
do
{
Item *b = bounds[d];
- x_points[d] = b->relative_coordinate (common, X_AXIS);
+ x_points[d] = b->relative_coordinate (common, X_AXIS);
if (broken [d])
{
if (d == LEFT)
{
if (dynamic_cast<Paper_column*> (b))
{
+ bool neighbor_found = false;
+ for (SCM adj = me->get_property ("adjacent-hairpins");
+ ly_c_pair_p (adj); adj = ly_cdr (adj))
+ {
+ /*
+ FIXME: this will fuck up in case of polyphonic
+ notes in other voices. Need to look at note-columns
+ in the current staff/voice.
+ */
+
+ Spanner *pin = unsmob_spanner (ly_car (adj));
+ if (pin
+ && (pin->get_bound (LEFT)->get_column() == b
+ || pin->get_bound (RIGHT)->get_column() == b))
+ 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 =b->extent (common, X_AXIS);
- if (e.empty_b ())
- e = Interval (0,0) + b->relative_coordinate (common, X_AXIS);
-
- x_points[d] = e.center () - d * padding /3; // ugh.
+ Interval e = robust_relative_extent (b, common, X_AXIS);
+ x_points[d] =
+ neighbor_found ? e.center() - d * padding / 3 : e[d];
}
else
{
- Interval e =b->extent (common, X_AXIS);
- if (!e.empty_b ())
+ Interval e = b->extent (common, X_AXIS);
+ if (!e.is_empty ())
x_points[d] = e[-d] - d*padding;
}
}
}
bool continued = broken[Direction (-grow_dir)];
- Real height = gh_scm2double (me->get_grob_property ("height"));
- Real thick = line * gh_scm2double (me->get_grob_property ("thickness"));
+ Real height = robust_scm2double (me->get_property ("height"), 0.2) *
+ Staff_symbol_referencer::staff_space (me);
Real starth, endh;
if (grow_dir < 0)
/*
should do relative to staff-symbol staff-space?
- */
+ */
+
+ Stencil mol;
+ mol = Line_interface::line (me, Offset (0, starth), Offset (width, endh));
+ mol.add_stencil (Line_interface::line (me,
+ Offset (0, -starth),
+ Offset (width, -endh)));
- Real period = 1.0;
- s = me->get_grob_property ("dash-period");
- if (gh_number_p (s))
- period = gh_scm2double (s);
-
- Real fraction = 1.0;
- s = me->get_grob_property ("dash-fraction");
- if (gh_number_p (s))
- fraction = gh_scm2double (s);
-
- /*
- TODO: set line style.
- */
- Molecule mol;
- if (fraction < 1.0)
- {
- mol = Lookup::dashed_line (thick,
- Offset (0, starth),
- Offset (width, endh),
- period, fraction);
- mol.add_molecule (Lookup::dashed_line (thick,
- Offset (0, -starth),
- Offset (width, -endh),
- period, fraction));
- }
- else
- {
- mol = Lookup::line (thick,
- Offset (0, starth),
- Offset (width, endh));
- mol.add_molecule (Lookup::line (thick,
- Offset (0, -starth),
- Offset (width, -endh)
- ));
- }
mol.translate_axis (x_points[LEFT]
- bounds[LEFT]->relative_coordinate (common, X_AXIS),
X_AXIS);
ADD_INTERFACE (Hairpin, "hairpin-interface",
- "hairpin crescendo.",
- "dash-period dash-fraction grow-direction thickness height if-text-padding");
+ "A hairpin (de)crescendo.",
+ "grow-direction height bound-padding adjacent-hairpins");