X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fhairpin.cc;h=e0916cd99d98c4a0d524155d81fa57bf800b787a;hb=9e69cb84d6ee5b0a861cd97869b10e3bdf0c833c;hp=9fcf79df88766483c13af02bd553ba2e4d28dfe6;hpb=e839d5c3f082a5487bed72dd06fd82d56857e60e;p=lilypond.git diff --git a/lily/hairpin.cc b/lily/hairpin.cc index 9fcf79df88..e0916cd99d 100644 --- a/lily/hairpin.cc +++ b/lily/hairpin.cc @@ -3,53 +3,116 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2004 Han-Wen Nienhuys + (c) 1997--2006 Han-Wen Nienhuys */ -#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 "font-interface.hh" +#include "international.hh" +#include "line-interface.hh" +#include "lookup.hh" #include "output-def.hh" -#include "warn.hh" #include "paper-column.hh" -#include "lookup.hh" -#include "text-item.hh" +#include "pointer-group-interface.hh" +#include "spanner.hh" +#include "staff-symbol-referencer.hh" +#include "text-interface.hh" +#include "warn.hh" + +MAKE_SCHEME_CALLBACK (Hairpin, after_line_breaking, 1); +SCM +Hairpin::after_line_breaking (SCM smob) +{ + Spanner *me = dynamic_cast (unsmob_grob (smob)); + consider_suicide (me); + + return SCM_UNSPECIFIED; +} + +void +Hairpin::consider_suicide (Spanner*me) +{ + Drul_array broken; + Drul_array bounds; + Direction d = LEFT; + do + { + bounds[d] = me->get_bound (d); + broken[d] = bounds[d]->break_status_dir () != CENTER; + } + while (flip (&d) != LEFT); + + if (broken[LEFT] + && ly_is_equal (bounds[RIGHT]->get_column ()->get_property ("when"), + bounds[LEFT]->get_property ("when"))) + me->suicide (); + +} MAKE_SCHEME_CALLBACK (Hairpin, print, 1); SCM -Hairpin::print (SCM smob) +Hairpin::print (SCM smob) { - Grob *me= unsmob_grob (smob); - Spanner *spanner = dynamic_cast (me); + Spanner *me = dynamic_cast (unsmob_grob (smob)); + if (Spanner *orig = dynamic_cast (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)) { me->suicide (); return SCM_EOL; } - + Direction grow_dir = to_dir (s); Real padding = robust_scm2double (me->get_property ("bound-padding"), 0.5); Drul_array broken; - Drul_array bounds ; + Drul_array bounds; Direction d = LEFT; do { - bounds[d] = spanner->get_bound (d); + bounds[d] = me->get_bound (d); broken[d] = bounds[d]->break_status_dir () != CENTER; } while (flip (&d) != LEFT); - Grob *common = bounds[LEFT]->common_refpoint (bounds[RIGHT], X_AXIS); - Drul_array x_points ; + 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 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]; @@ -57,7 +120,7 @@ Hairpin::print (SCM smob) if (broken [d]) { if (d == LEFT) - x_points[d] = b->extent (common,X_AXIS)[RIGHT] ; + x_points[d] = b->extent (common, X_AXIS)[RIGHT]; } else { @@ -65,41 +128,55 @@ Hairpin::print (SCM smob) { Interval e = b->extent (common, X_AXIS); if (!e.is_empty ()) - x_points[d] = e[-d] - d*padding; + x_points[d] = e[-d] - d * padding; } else { bool neighbor_found = false; - for (SCM adj = me->get_property ("adjacent-hairpins"); - scm_is_pair (adj); adj = scm_cdr (adj)) + extract_grob_set (me, "adjacent-hairpins", pins); + for (vsize i = 0; i < pins.size (); i++) { /* 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 (scm_car (adj)); + + Spanner *pin = dynamic_cast (pins[i]); if (pin - && (pin->get_bound (LEFT)->get_column() == b->get_column () - || pin->get_bound (RIGHT)->get_column() == b->get_column() )) - neighbor_found = true; + && (pin->get_bound (LEFT)->get_column () == b->get_column () + || pin->get_bound (RIGHT)->get_column () == b->get_column ())) + 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 + { + x_points[d] = e[d]; + Item *bound = me->get_bound (d); + if (bound->is_non_musical (bound)) + x_points[d] -= d * padding; + } } } } while (flip (&d) != LEFT); - Real width = x_points[RIGHT] - x_points[LEFT]; if (width < 0) { @@ -109,18 +186,17 @@ Hairpin::print (SCM smob) } 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; - endh = continued ? height/2 : 0.0; + endh = continued ? height / 2 : 0.0; } else { - starth = continued ? height/2 : 0.0; + starth = continued ? height / 2 : 0.0; endh = height; } @@ -129,20 +205,59 @@ Hairpin::print (SCM smob) */ 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, 0); + } + mol.translate_axis (x_points[LEFT] - bounds[LEFT]->relative_coordinate (common, X_AXIS), X_AXIS); return mol.smobbed_copy (); } +ADD_INTERFACE (Hairpin, + "A hairpin crescendo/decrescendo.", - -ADD_INTERFACE (Hairpin, "hairpin-interface", - "A hairpin (de)crescendo.", - "grow-direction height bound-padding adjacent-hairpins"); - + /* props */ + "adjacent-hairpins " + "circled-tip " + "bound-padding " + "grow-direction " + "height " + );