X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fline-spanner.cc;h=f42628820e6e64b6a0ba019d93f0bf8666125472;hb=53da8b7d3773da804e79fd455d168efd9475d2f9;hp=962f772a50275393430416fd26a8797ac488cfc7;hpb=ac7aef03ab9d459a6ea6f03d9c127be150871dd4;p=lilypond.git diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc index 962f772a50..f42628820e 100644 --- a/lily/line-spanner.cc +++ b/lily/line-spanner.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2000--2011 Jan Nieuwenhuizen + Copyright (C) 2000--2012 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 @@ -21,9 +21,11 @@ #include "axis-group-interface.hh" #include "font-interface.hh" #include "grob-interface.hh" +#include "international.hh" #include "item.hh" #include "lily-proto.hh" #include "line-interface.hh" +#include "note-column.hh" #include "output-def.hh" #include "paper-column.hh" #include "pointer-group-interface.hh" @@ -37,6 +39,7 @@ class Line_spanner { public: DECLARE_SCHEME_CALLBACK (print, (SCM)); + DECLARE_SCHEME_CALLBACK (calc_cross_staff, (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)); @@ -73,8 +76,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 = scm_reverse (extra); scm_is_pair (s); s = scm_cdr (s)) - details = scm_cons (scm_car (s), details); + details = scm_append (scm_list_2 (extra, details)); } if (details == SCM_BOOL_F) @@ -109,12 +111,16 @@ Line_spanner::calc_bound_info (SCM smob, Direction dir) ? columns[0] : columns.back (); } - Interval extent = (Paper_column::has_interface (bound_grob) - ? Axis_group_interface::generic_bound_extent (bound_grob, commonx, X_AXIS) - : robust_relative_extent (bound_grob, commonx, X_AXIS)); + Real x_coord = (Paper_column::has_interface (bound_grob) + ? Axis_group_interface::generic_bound_extent (bound_grob, commonx, X_AXIS) + : robust_relative_extent (bound_grob, commonx, X_AXIS)).linear_combination (attach); + + Grob *acc = Note_column::accidentals (bound_grob->get_parent (X_AXIS)); + if (acc && to_boolean (ly_assoc_get (ly_symbol2scm ("end-on-accidental"), details, SCM_BOOL_F))) + x_coord = robust_relative_extent (acc, commonx, X_AXIS).linear_combination (attach); details = scm_acons (ly_symbol2scm ("X"), - scm_from_double (extent.linear_combination (attach)), + scm_from_double (x_coord), details); } @@ -195,6 +201,22 @@ Line_spanner::calc_bound_info (SCM smob, Direction dir) return details; } +MAKE_SCHEME_CALLBACK (Line_spanner, calc_cross_staff, 1); +SCM +Line_spanner::calc_cross_staff (SCM smob) +{ + Spanner *me = unsmob_spanner (smob); + if (!me) + return SCM_BOOL_F; + + if (to_boolean (me->get_bound (LEFT)->get_property ("non-musical")) + || to_boolean (me->get_bound (RIGHT)->get_property ("non-musical"))) + return SCM_BOOL_F; + + return scm_from_bool (Staff_symbol_referencer::get_staff_symbol (me->get_bound (LEFT)) + != Staff_symbol_referencer::get_staff_symbol (me->get_bound (RIGHT))); +} + MAKE_SCHEME_CALLBACK (Line_spanner, calc_right_bound_info, 1); SCM Line_spanner::calc_right_bound_info (SCM smob) @@ -249,8 +271,7 @@ Line_spanner::print (SCM smob) Drul_array span_points; - Direction d = LEFT; - do + for (LEFT_and_RIGHT (d)) { Offset z (robust_scm2double (ly_assoc_get (ly_symbol2scm ("X"), bounds[d], SCM_BOOL_F), 0.0), @@ -259,7 +280,6 @@ Line_spanner::print (SCM smob) span_points[d] = z; } - while (flip (&d) != LEFT); Drul_array gaps (0, 0); Drul_array arrows (0, 0); @@ -270,7 +290,7 @@ Line_spanner::print (SCM smob) Real magstep = pow (2, robust_scm2double (me->get_property ("font-size"), 0.0) / 6); - do + for (LEFT_and_RIGHT (d)) { gaps[d] = robust_scm2double (ly_assoc_get (ly_symbol2scm ("padding"), bounds[d], SCM_BOOL_F), 0.0); @@ -283,15 +303,13 @@ Line_spanner::print (SCM smob) if (!common_y[d]) common_y[d] = me; } - while (flip (&d) != LEFT); Grob *my_common_y = common_y[LEFT]->common_refpoint (common_y[RIGHT], Y_AXIS); if (!simple_y) { - do + for (LEFT_and_RIGHT (d)) 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)); @@ -308,7 +326,7 @@ Line_spanner::print (SCM smob) } Stencil line; - do + for (LEFT_and_RIGHT (d)) { span_points[d] += -d * gaps[d] * magstep * dz.direction (); @@ -329,15 +347,13 @@ Line_spanner::print (SCM smob) line.add_stencil (s); } } - while (flip (&d) != LEFT); - do + for (LEFT_and_RIGHT (d)) { if (stencils[d]) span_points[d] += dz_dir * (stencils[d]->extent (X_AXIS)[-d] / dz_dir[X_AXIS]); } - while (flip (&d) != LEFT); Offset adjust = dz.direction () * Staff_symbol_referencer::staff_space (me); @@ -353,6 +369,8 @@ Line_spanner::print (SCM smob) arrows[LEFT], arrows[RIGHT])); } + else + me->warning (_ ("Line spanner's left point is to the right of its right point.")); line.translate (Offset (-me->relative_coordinate (commonx, X_AXIS), simple_y ? 0.0 : -me->relative_coordinate (my_common_y, Y_AXIS)));