X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fline-spanner.cc;h=d55c01ff45b8e391bcb45ffa91970a164d8d35a2;hb=54b02666750062788185bd3f99e644d621e348c2;hp=f8c46312f0537579215fd91127a1f8e8f52d98bc;hpb=3eeb09f2afdaecc06d810bac83d79776d8aef3ca;p=lilypond.git diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc index f8c46312f0..d55c01ff45 100644 --- a/lily/line-spanner.cc +++ b/lily/line-spanner.cc @@ -1,57 +1,57 @@ /* - line-spanner.cc -- implement New_line_spanner + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2000--2011 Jan Nieuwenhuizen - (c) 2000--2007 Jan Nieuwenhuizen + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ -#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 "line-interface.hh" -#include "moment.hh" - -#include "lily-proto.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 "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 New_line_spanner +class Line_spanner { public: DECLARE_SCHEME_CALLBACK (print, (SCM)); - DECLARE_SCHEME_CALLBACK (after_line_breaking, (SCM)); - DECLARE_SCHEME_CALLBACK (calc_left_bound_info, (SCM)); DECLARE_SCHEME_CALLBACK (calc_left_bound_info_and_text, (SCM)); DECLARE_SCHEME_CALLBACK (calc_right_bound_info, (SCM)); DECLARE_SCHEME_CALLBACK (calc_bound_info, (SCM, Direction)); - DECLARE_GROB_INTERFACE(); + DECLARE_GROB_INTERFACE (); }; - -static Grob * -line_spanner_common_parent (Grob *me) +Spanner *parent_spanner (Grob *g) { - Grob *common = find_fixed_alignment_parent (me); - if (!common) - { - common = Staff_symbol_referencer::get_staff_symbol (me); - if (common) - common = common->get_parent (Y_AXIS); - else - common = me->get_parent (Y_AXIS); - } - - return common; + if (Spanner::has_interface (g)) + return dynamic_cast (g); + return parent_spanner (g->get_parent (Y_AXIS)); } SCM -New_line_spanner::calc_bound_info (SCM smob, Direction dir) +Line_spanner::calc_bound_info (SCM smob, Direction dir) { Spanner *me = unsmob_spanner (smob); @@ -72,10 +72,10 @@ New_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); } - + if (details == SCM_BOOL_F) details = ly_assoc_get (ly_symbol2scm ("default"), bound_details, SCM_EOL); @@ -89,7 +89,7 @@ New_line_spanner::calc_bound_info (SCM smob, Direction dir) properties, text), details); } - + if (!scm_is_number (ly_assoc_get (ly_symbol2scm ("X"), details, SCM_BOOL_F))) { Direction attach = (Direction) @@ -97,12 +97,23 @@ New_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); } - + if (!scm_is_number (ly_assoc_get (ly_symbol2scm ("Y"), details, SCM_BOOL_F))) { @@ -110,37 +121,68 @@ New_line_spanner::calc_bound_info (SCM smob, Direction dir) Real extra_dy = robust_scm2double (me->get_property ("extra-dy"), 0.0); - + + Grob *common_y = me->common_refpoint (me->get_bound (dir), Y_AXIS); if (me->get_bound (dir)->break_status_dir ()) { - /* - This is hairy. For the normal case, we simply find common - parents, and draw a line between the bounds. When two note - heads are on different systems, there is no common parent - anymore. We have to find the piano-staff object. - */ - - Spanner *next_sp = me->broken_neighbor (dir); - Item *next_bound = next_sp->get_bound (dir); - - if (next_bound->break_status_dir ()) + if (to_boolean (me->get_property ("simple-Y"))) { - programming_error ("no note heads for the line spanner on neighbor line?" - " Confused."); - me->suicide (); - return SCM_EOL; + Spanner *orig = dynamic_cast(me->original ()); + Spanner *extreme = dir == LEFT ? orig->broken_intos_.front () : orig->broken_intos_.back (); + Grob *e_bound = extreme->get_bound (dir); + Grob *e_common_y = extreme->common_refpoint (e_bound, Y_AXIS); + y = e_bound->extent (e_common_y, Y_AXIS).center (); } - - Grob *next_common_y = line_spanner_common_parent (next_bound); - Interval next_ext = next_bound->extent (next_common_y, Y_AXIS); - - y = next_ext.center (); + else + { + Spanner *next_sp = me->broken_neighbor (dir); + Item *next_bound = next_sp->get_bound (dir); + + if (next_bound->break_status_dir ()) + { + programming_error ("no note heads for the line spanner on neighbor line?" + " Confused."); + me->suicide (); + return SCM_EOL; + } + + 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 { - Grob *commony = me->common_refpoint (me->get_bound (dir), Y_AXIS); - y = me->get_bound (dir)->extent (commony, Y_AXIS).center(); - details = scm_acons (ly_symbol2scm ("common-Y"), commony->self_scm (), details); + y = me->get_bound (dir)->extent (common_y, Y_AXIS).center (); + details = scm_acons (ly_symbol2scm ("common-Y"), common_y->self_scm (), details); } y += dir * extra_dy / 2; @@ -150,25 +192,25 @@ New_line_spanner::calc_bound_info (SCM smob, Direction dir) return details; } -MAKE_SCHEME_CALLBACK (New_line_spanner, calc_right_bound_info, 1); +MAKE_SCHEME_CALLBACK (Line_spanner, calc_right_bound_info, 1); SCM -New_line_spanner::calc_right_bound_info (SCM smob) +Line_spanner::calc_right_bound_info (SCM smob) { - return New_line_spanner::calc_bound_info (smob, RIGHT); + return Line_spanner::calc_bound_info (smob, RIGHT); } -MAKE_SCHEME_CALLBACK (New_line_spanner, calc_left_bound_info, 1); +MAKE_SCHEME_CALLBACK (Line_spanner, calc_left_bound_info, 1); SCM -New_line_spanner::calc_left_bound_info (SCM smob) +Line_spanner::calc_left_bound_info (SCM smob) { - return New_line_spanner::calc_bound_info (smob, LEFT); + return Line_spanner::calc_bound_info (smob, LEFT); } -MAKE_SCHEME_CALLBACK (New_line_spanner, calc_left_bound_info_and_text, 1); +MAKE_SCHEME_CALLBACK (Line_spanner, calc_left_bound_info_and_text, 1); SCM -New_line_spanner::calc_left_bound_info_and_text (SCM smob) +Line_spanner::calc_left_bound_info_and_text (SCM smob) { - SCM alist = New_line_spanner::calc_bound_info (smob, LEFT); + SCM alist = Line_spanner::calc_bound_info (smob, LEFT); Spanner *me = unsmob_spanner (smob); SCM text = me->get_property ("text"); @@ -183,39 +225,22 @@ New_line_spanner::calc_left_bound_info_and_text (SCM smob) properties, text), alist); } - + return alist; } -MAKE_SCHEME_CALLBACK (New_line_spanner, print, 1); +MAKE_SCHEME_CALLBACK (Line_spanner, print, 1); SCM -New_line_spanner::print (SCM smob) +Line_spanner::print (SCM smob) { Spanner *me = dynamic_cast (unsmob_grob (smob)); - Interval_t moments = me->spanned_time (); - /* - We remove the line at the start of the line. For piano voice - indicators, it makes no sense to have them at the start of the - line. - - I'm not sure what the official rules for glissandi are, but - usually the 2nd note of the glissando is "exact", so when playing - from the start of the line, there is no need to glide. + // Triggers simple-Y calculations + bool simple_y = to_boolean (me->get_property ("simple-Y")) && !to_boolean (me->get_property ("cross-staff")); - From a typographical p.o.v. this makes sense, since the amount of - space left of a note at the start of a line is very small. - - --hwn. - - */ - if (moments.length () == Moment (0,0)) - return SCM_EOL; - Drul_array bounds (me->get_property ("left-bound-info"), me->get_property ("right-bound-info")); - Grob *commonx = me->get_bound (LEFT)->common_refpoint (me->get_bound (RIGHT), X_AXIS); commonx = me->common_refpoint (commonx, X_AXIS); @@ -225,19 +250,23 @@ New_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)); - + span_points[d] = z; } while (flip (&d) != LEFT); Drul_array gaps (0, 0); Drul_array arrows (0, 0); - Drul_array stencils (0,0); - Drul_array common_y (0, 0); + Drul_array stencils (0,0); + Drul_array common_y (0, 0); + + // For scaling of 'padding and 'stencil-offset + Real magstep + = pow (2, robust_scm2double (me->get_property ("font-size"), 0.0) / 6); + do { gaps[d] = robust_scm2double (ly_assoc_get (ly_symbol2scm ("padding"), @@ -249,14 +278,24 @@ New_line_spanner::print (SCM smob) common_y[d] = unsmob_grob (ly_assoc_get (ly_symbol2scm ("common-Y"), bounds[d], SCM_BOOL_F)); if (!common_y[d]) - common_y[d] = me; + common_y[d] = me; } while (flip (&d) != LEFT); Grob *my_common_y = common_y[LEFT]->common_refpoint (common_y[RIGHT], Y_AXIS); - do - span_points[d][Y_AXIS] += common_y[d]->relative_coordinate (my_common_y, Y_AXIS); - while (flip (&d) != LEFT); + + if (!simple_y) + { + do + span_points[d][Y_AXIS] += common_y[d]->relative_coordinate (my_common_y, Y_AXIS); + while (flip (&d) != LEFT); + } + + Interval normalized_endpoints = robust_scm2interval (me->get_property ("normalized-endpoints"), Interval (0, 1)); + Real y_length = span_points[RIGHT][Y_AXIS] - span_points[LEFT][Y_AXIS]; + + span_points[LEFT][Y_AXIS] += normalized_endpoints[LEFT] * y_length; + span_points[RIGHT][Y_AXIS] -= (1 - normalized_endpoints[RIGHT]) * y_length; Offset dz = (span_points[RIGHT] - span_points[LEFT]); Offset dz_dir = dz.direction (); @@ -268,24 +307,23 @@ New_line_spanner::print (SCM smob) Stencil line; do { + span_points[d] += -d * gaps[d] * magstep * 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); - - 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)); - - line.add_stencil (s); + 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 (is_number_pair (off)) + s.translate (ly_scm2offset (off) * magstep); + + line.add_stencil (s); } } while (flip (&d) != LEFT); @@ -295,40 +333,43 @@ New_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); + + 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.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))); - - + simple_y ? 0.0 : -me->relative_coordinate (my_common_y, Y_AXIS))); + + return line.smobbed_copy (); } -ADD_INTERFACE (New_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", +ADD_INTERFACE (Line_spanner, + "Generic line drawn between two objects, e.g., for use with" + " glissandi.", + /* properties */ + "bound-details " "extra-dy " "gap " + "left-bound-info " + "note-columns " + "right-bound-info " + "simple-Y " "thickness " - "bound-details " - "left-bound-info " - "right-bound-info " + "to-barline " ); -