X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fhairpin.cc;h=6e9591130ce35bb23f53abf373dd153a1c906e5d;hb=1eb080d3e3acfe927eb163abb8c5ca6e08b43769;hp=869365001841233a21ef895d3c70a8b7b01d13bc;hpb=2af4951859762ff91689f3d5feac03c11003c758;p=lilypond.git diff --git a/lily/hairpin.cc b/lily/hairpin.cc index 8693650018..6e9591130c 100644 --- a/lily/hairpin.cc +++ b/lily/hairpin.cc @@ -3,126 +3,158 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2003 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys */ -#include "molecule.hh" -#include "line-interface.hh" #include "hairpin.hh" + +#include "staff-symbol-referencer.hh" +#include "line-interface.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" +#include "text-interface.hh" +#include "pointer-group-interface.hh" -MAKE_SCHEME_CALLBACK (Hairpin, brew_molecule, 1); +MAKE_SCHEME_CALLBACK (Hairpin, after_line_breaking, 1); +SCM +Hairpin::after_line_breaking (SCM smob) +{ + Spanner *me = dynamic_cast (unsmob_grob (smob)); + + 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 (); + return SCM_UNSPECIFIED; +} + +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 (me); + Spanner *me = dynamic_cast (unsmob_grob (smob)); - SCM s = me->get_grob_property ("grow-direction"); + SCM s = me->get_property ("grow-direction"); if (!is_direction (s)) { me->suicide (); return SCM_EOL; } - - Direction grow_dir = to_dir (s); + Direction grow_dir = to_dir (s); + Real padding = robust_scm2double (me->get_property ("bound-padding"), 0.5); - /* 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")); - 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 ; - + Drul_array x_points; + 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) - x_points[d] = b->extent (common,X_AXIS)[RIGHT] ; + x_points[d] = b->extent (common, X_AXIS)[RIGHT]; } else { - if (dynamic_cast (b)) + if (Text_interface::has_interface (b)) { + Interval e = b->extent (common, X_AXIS); + if (!e.is_empty ()) + x_points[d] = e[-d] - d * padding; + } + else + { + bool neighbor_found = false; + extract_grob_set (me, "adjacent-hairpins", pins); + for (int 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 = 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; + } + /* 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.is_empty ()) - e = Interval (0,0) + b->relative_coordinate (common, X_AXIS); - - x_points[d] = e.center () - d * padding /3; // ugh. - } - else - { - Interval e =b->extent (common, X_AXIS); - if (!e.is_empty ()) - x_points[d] = e[-d] - d*padding; + Interval e = robust_relative_extent (b, common, X_AXIS); + x_points[d] + = neighbor_found ? e.center () - d * padding / 3 : e[d]; } } } while (flip (&d) != LEFT); - Real width = x_points[RIGHT] - x_points[LEFT]; - if (width < 0) { me->warning (_ ((grow_dir < 0) ? "decrescendo too small" - : "crescendo too small")); + : "crescendo too small")); width = 0; } bool continued = broken[Direction (-grow_dir)]; - Real height = robust_scm2double (me->get_grob_property ("height"), 0.2); + Real height = robust_scm2double (me->get_property ("height"), 0.2) * + Staff_symbol_referencer::staff_space (me); Real starth, endh; 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; } /* should do relative to staff-symbol staff-space? - */ + */ - Molecule mol; - mol = Line_interface::line (me, Offset (0, starth), Offset (width, endh)); - mol.add_molecule (Line_interface::line (me, - Offset (0, -starth), - Offset (width, -endh))); + 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))); mol.translate_axis (x_points[LEFT] - bounds[LEFT]->relative_coordinate (common, X_AXIS), @@ -130,9 +162,7 @@ Hairpin::brew_molecule (SCM smob) return mol.smobbed_copy (); } - - ADD_INTERFACE (Hairpin, "hairpin-interface", - "hairpin crescendo.", - "grow-direction height if-text-padding"); + "A hairpin (de)crescendo.", + "grow-direction height bound-padding adjacent-hairpins");