X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fline-spanner.cc;h=7c629297387815c90809610f2144e52517943e9e;hb=024e51d1cb0e21d211baf91ad0774bc766dff687;hp=aa7985b9c554ebae33b9596a614b6ba921c40ed9;hpb=8d305598feee2e766fc3d7bdf5d78ee3c06a4af2;p=lilypond.git diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc index aa7985b9c5..7c62929738 100644 --- a/lily/line-spanner.cc +++ b/lily/line-spanner.cc @@ -6,21 +6,21 @@ (c) 2000--2007 Jan Nieuwenhuizen */ +#include "align-interface.hh" #include "axis-group-interface.hh" -#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 "grob-interface.hh" +#include "item.hh" +#include "lily-proto.hh" #include "line-interface.hh" #include "moment.hh" +#include "output-def.hh" +#include "pointer-group-interface.hh" +#include "spanner.hh" +#include "staff-symbol-referencer.hh" #include "system.hh" - -#include "lily-proto.hh" -#include "grob-interface.hh" #include "text-interface.hh" +#include "warn.hh" class Line_spanner { @@ -63,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); } @@ -88,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); } @@ -233,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)); @@ -244,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 @@ -252,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"), @@ -276,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; - if (scm_is_number (align)) - s.align_to (Y_AXIS, scm_to_double (align)); + 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); - /* - todo: should use font-size. + if (scm_is_number (align)) + s.align_to (Y_AXIS, scm_to_double (align)); + + /* + 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); @@ -303,26 +322,28 @@ 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); Offset adjust = dz.direction() * Staff_symbol_referencer::staff_space (me); - line.add_stencil (Line_interface::line (me, - span_points[LEFT] + (arrows[LEFT] ? adjust*1.4 : Offset(0,0)), - span_points[RIGHT] - (arrows[RIGHT] ? adjust*0.55 : Offset(0,0)))); - 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 (); } @@ -333,11 +354,12 @@ ADD_INTERFACE (Line_spanner, "@code{dotted-line} or @code{zigzag}.\n" "\n", + "bound-details " "extra-dy " "gap " - "thickness " - "bound-details " - "left-bound-info " + "left-bound-info " + "note-columns " "right-bound-info " + "thickness " );