X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fline-spanner.cc;h=0235243628b0dc1a74a9cab08c1d462b14a3bb42;hb=e90f0536f9be39ada0bef0aeb0d275dec3b2fb5b;hp=d9c5f5683522d8708501ac106c217fa1778ac481;hpb=0e5d83a9ceb4a143f83d22406d7eb816314ff9f7;p=lilypond.git diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc index d9c5f56835..0235243628 100644 --- a/lily/line-spanner.cc +++ b/lily/line-spanner.cc @@ -1,9 +1,20 @@ /* - line-spanner.cc -- implement 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--2009 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 "align-interface.hh" @@ -13,7 +24,6 @@ #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" @@ -26,7 +36,6 @@ 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)); @@ -37,7 +46,7 @@ public: Spanner *parent_spanner (Grob *g) { if (Spanner::has_interface (g)) - return dynamic_cast (g); + return dynamic_cast (g); return parent_spanner (g->get_parent (Y_AXIS)); } @@ -66,7 +75,7 @@ Line_spanner::calc_bound_info (SCM smob, Direction dir) 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); @@ -80,7 +89,7 @@ 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) @@ -98,13 +107,13 @@ Line_spanner::calc_bound_info (SCM smob, Direction dir) bound_grob = (dir == LEFT) ? columns[0] : columns.back(); } - + details = scm_acons (ly_symbol2scm ("X"), 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))) { @@ -130,11 +139,12 @@ Line_spanner::calc_bound_info (SCM smob, Direction dir) 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. + /* + 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)); @@ -147,8 +157,10 @@ Line_spanner::calc_bound_info (SCM smob, Direction dir) } else { - /* We fall back to assuming that the distance between staves doesn't - change over line breaks. */ + /* + 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 (); @@ -202,7 +214,7 @@ Line_spanner::calc_left_bound_info_and_text (SCM smob) properties, text), alist); } - + return alist; } @@ -212,29 +224,9 @@ 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. - - 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); @@ -247,7 +239,7 @@ Line_spanner::print (SCM smob) 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); @@ -255,8 +247,13 @@ 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); + 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"), @@ -264,13 +261,13 @@ Line_spanner::print (SCM smob) 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); + 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"), bounds[d], SCM_BOOL_F)); if (!common_y[d]) - common_y[d] = me; + common_y[d] = me; } while (flip (&d) != LEFT); @@ -279,6 +276,12 @@ Line_spanner::print (SCM smob) 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 (); if (gaps[LEFT] + gaps[RIGHT] > dz.length ()) @@ -289,7 +292,7 @@ Line_spanner::print (SCM smob) Stencil line; do { - span_points[d] += -d * gaps[d] * dz.direction (); + span_points[d] += -d * gaps[d] * magstep * dz.direction (); if (stencils[d]) { @@ -303,15 +306,12 @@ Line_spanner::print (SCM smob) SCM off = ly_assoc_get (ly_symbol2scm ("stencil-offset"), bounds[d], SCM_BOOL_F); - if (scm_is_number (align)) + 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)); - + s.translate (ly_scm2offset (off) * magstep); + line.add_stencil (s); } } @@ -332,7 +332,7 @@ Line_spanner::print (SCM smob) 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], @@ -342,18 +342,14 @@ Line_spanner::print (SCM smob) 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" - "\n" - "The property @code{style} can be @code{line}," - " @code{dashed-line}, @code{trill}, @code{dotted-line} or" - " @code{zigzag}.", + " glissandi.", /* properties */ "bound-details " @@ -365,4 +361,3 @@ ADD_INTERFACE (Line_spanner, "thickness " "to-barline " ); -