X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fline-spanner.cc;h=bb9b2327445fb279e22cef4f234350055261fff5;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=4e75d0382a1d19e487923cac5e4466326f89a398;hpb=b2ff46ad720a8a99939dc04452f2610f165f03c5;p=lilypond.git diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc index 4e75d0382a..bb9b232744 100644 --- a/lily/line-spanner.cc +++ b/lily/line-spanner.cc @@ -3,22 +3,24 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2007 Jan Nieuwenhuizen + (c) 2000--2008 Jan Nieuwenhuizen */ -#include "spanner.hh" -#include "output-def.hh" -#include "item.hh" -#include "staff-symbol-referencer.hh" -#include "font-interface.hh" -#include "warn.hh" #include "align-interface.hh" +#include "axis-group-interface.hh" +#include "font-interface.hh" +#include "grob-interface.hh" +#include "item.hh" +#include "lily-proto.hh" #include "line-interface.hh" #include "moment.hh" - -#include "lily-proto.hh" -#include "grob-interface.hh" +#include "output-def.hh" +#include "pointer-group-interface.hh" +#include "spanner.hh" +#include "staff-symbol-referencer.hh" +#include "system.hh" #include "text-interface.hh" +#include "warn.hh" class Line_spanner { @@ -32,6 +34,13 @@ public: DECLARE_GROB_INTERFACE (); }; +Spanner *parent_spanner (Grob *g) +{ + if (Spanner::has_interface (g)) + return dynamic_cast (g); + return parent_spanner (g->get_parent (Y_AXIS)); +} + SCM Line_spanner::calc_bound_info (SCM smob, Direction dir) { @@ -54,7 +63,7 @@ Line_spanner::calc_bound_info (SCM smob, Direction dir) ? ly_symbol2scm ("left-broken") : ly_symbol2scm ("right-broken"), bound_details, SCM_EOL); - for (SCM s = extra; scm_is_pair (s); s = scm_cdr (s)) + for (SCM s = scm_reverse (extra); scm_is_pair (s); s = scm_cdr (s)) details = scm_cons (scm_car (s), details); } @@ -79,8 +88,19 @@ Line_spanner::calc_bound_info (SCM smob, Direction dir) details, SCM_BOOL_F), CENTER); + Item *bound_item = me->get_bound (dir); + Grob *bound_grob = bound_item; + if (to_boolean (ly_assoc_get (ly_symbol2scm ("end-on-note"), details, SCM_BOOL_F)) + && bound_item->break_status_dir ()) + { + extract_grob_set (me, "note-columns", columns); + if (columns.size ()) + bound_grob = (dir == LEFT) + ? columns[0] : columns.back(); + } + details = scm_acons (ly_symbol2scm ("X"), - scm_from_double (me->get_bound (dir)->extent (commonx, X_AXIS) + scm_from_double (robust_relative_extent (bound_grob, commonx, X_AXIS) .linear_combination (attach)), details); } @@ -107,19 +127,34 @@ Line_spanner::calc_bound_info (SCM smob, Direction dir) return SCM_EOL; } - Grob *next_common_y = next_sp->common_refpoint (next_bound, X_AXIS); - Interval next_ext = next_bound->extent (next_common_y, Y_AXIS); - - /* FIXME: this is not a real solution. We want to know would be the - y-position of the right bound (relative to the line-spanner) - if it belonged to the same system - as the left bound. What we do instead is to calculate the - y-position of the right bound relative to the VerticalAlignment - (of the next System!) and subtract the y-position of the - line-spanner relative to the VerticalAlignment (of this System!). - This works as long as the distance between staves is approximately - the same before and after breaking. */ - y = next_ext.center () - me->relative_coordinate (common_y, Y_AXIS); + Spanner *next_bound_parent = parent_spanner (next_bound); + Interval next_ext = next_bound->extent (next_bound_parent, Y_AXIS); + + /* We want to know what would be the + y-position of the next bound (relative to my y-parent) if it belonged + to the same system as this bound. We rely on the fact that + the y-parent of the next bound is a spanner (probably the + VerticalAxisGroup of a staff) that extends over the break. + */ + Spanner *next_bound_parent_on_this_line = + next_bound_parent->broken_neighbor (other_dir (dir)); + + if (next_bound_parent_on_this_line) + { + Grob *common = me->common_refpoint (next_bound_parent_on_this_line, Y_AXIS); + Real bound_offset = next_bound_parent_on_this_line->relative_coordinate (common, Y_AXIS); + y = next_ext.center () + bound_offset - me->relative_coordinate (common, Y_AXIS); + } + else + { + /* We fall back to assuming that the distance between staves doesn't + change over line breaks. */ + programming_error ("next-bound's parent doesn't extend to this line"); + Grob *next_system = next_bound->get_system (); + Grob *this_system = me->get_system (); + y = next_ext.center () + next_bound_parent->relative_coordinate (next_system, Y_AXIS) + - me->relative_coordinate (this_system, Y_AXIS); + } } else { @@ -209,8 +244,7 @@ Line_spanner::print (SCM smob) do { Offset z (robust_scm2double (ly_assoc_get (ly_symbol2scm ("X"), - bounds[d], SCM_BOOL_F), 0.0) - + commonx->relative_coordinate (commonx, X_AXIS), + bounds[d], SCM_BOOL_F), 0.0), robust_scm2double (ly_assoc_get (ly_symbol2scm ("Y"), bounds[d], SCM_BOOL_F), 0.0)); @@ -220,6 +254,7 @@ Line_spanner::print (SCM smob) Drul_array gaps (0, 0); Drul_array arrows (0, 0); + Drul_array anchor_align (0, 0); Drul_array stencils (0,0); Drul_array common_y (0, 0); do @@ -228,6 +263,8 @@ Line_spanner::print (SCM smob) bounds[d], SCM_BOOL_F), 0.0); arrows[d] = to_boolean (ly_assoc_get (ly_symbol2scm ("arrow"), bounds[d], SCM_BOOL_F)); + anchor_align[d] = robust_scm2double (ly_assoc_get (ly_symbol2scm ("anchor-alignment"), + bounds[d], SCM_BOOL_F), LEFT); stencils[d] = unsmob_stencil (ly_assoc_get (ly_symbol2scm ("stencil"), bounds[d], SCM_BOOL_F)); common_y[d] = unsmob_grob (ly_assoc_get (ly_symbol2scm ("common-Y"), @@ -252,24 +289,30 @@ Line_spanner::print (SCM smob) Stencil line; do { + span_points[d] += -d * gaps[d] * dz.direction (); + if (stencils[d]) { - Stencil s = stencils[d]->translated (span_points[d]); - SCM align = ly_assoc_get (ly_symbol2scm ("stencil-align-dir-y"), - bounds[d], SCM_BOOL_F); - SCM off = ly_assoc_get (ly_symbol2scm ("stencil-offset"), - bounds[d], SCM_BOOL_F); + Interval ext = stencils[d]->extent (X_AXIS); + Real anchor = ext.linear_combination (anchor_align[d]) - ext[LEFT]; + span_points[d][X_AXIS] -= anchor; + + Stencil s = stencils[d]->translated (span_points[d]); + SCM align = ly_assoc_get (ly_symbol2scm ("stencil-align-dir-y"), + bounds[d], SCM_BOOL_F); + SCM off = ly_assoc_get (ly_symbol2scm ("stencil-offset"), + bounds[d], SCM_BOOL_F); - if (scm_is_number (align)) - s.align_to (Y_AXIS, scm_to_double (align)); + if (scm_is_number (align)) + s.align_to (Y_AXIS, scm_to_double (align)); - /* - todo: should use font-size. + /* + todo: should use font-size. */ - if (is_number_pair (off)) - s.translate (ly_scm2offset (off)); + if (is_number_pair (off)) + s.translate (ly_scm2offset (off)); - line.add_stencil (s); + line.add_stencil (s); } } while (flip (&d) != LEFT); @@ -279,40 +322,47 @@ Line_spanner::print (SCM smob) if (stencils[d]) span_points[d] += dz_dir * (stencils[d]->extent (X_AXIS)[-d] / dz_dir[X_AXIS]); - - span_points[d] += -d * gaps[d] * dz.direction (); } while (flip (&d) != LEFT); - line.add_stencil (Line_interface::line (me, - span_points[LEFT], - span_points[RIGHT])); + Offset adjust = dz.direction() * Staff_symbol_referencer::staff_space (me); - line.add_stencil (Line_interface::arrows (me, - span_points[LEFT], - span_points[RIGHT], - arrows[LEFT], - arrows[RIGHT])); + Offset line_left = span_points[LEFT] + (arrows[LEFT] ? adjust*1.4 : Offset (0, 0)); + Offset line_right = span_points[RIGHT] - (arrows[RIGHT] ? adjust*0.55 : Offset (0, 0)); + if (line_right[X_AXIS] > line_left[X_AXIS]) + { + line.add_stencil (Line_interface::line (me, line_left, line_right)); + + line.add_stencil (Line_interface::arrows (me, + span_points[LEFT], + span_points[RIGHT], + arrows[LEFT], + arrows[RIGHT])); + } line.translate (Offset (-me->relative_coordinate (commonx, X_AXIS), -me->relative_coordinate (my_common_y, Y_AXIS))); - + return line.smobbed_copy (); } ADD_INTERFACE (Line_spanner, - "Generic line drawn between two objects, e.g. for use with glissandi.\n" - "The property @code{style} can be @code{line}, " - "@code{dashed-line}, @code{trill}, \n" - "@code{dotted-line} or @code{zigzag}.\n" - "\n", - + "Generic line drawn between two objects, e.g., for use with" + " glissandi.\n" + "\n" + "The property @code{style} can be @code{line}," + " @code{dashed-line}, @code{trill}, @code{dotted-line} or" + " @code{zigzag}.", + + /* properties */ + "bound-details " "extra-dy " "gap " + "left-bound-info " + "note-columns " + "right-bound-info " "thickness " - "bound-details " - "left-bound-info " - "right-bound-info " + "to-barline " );