X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fline-spanner.cc;h=84c43ccf81ef34e80913c1d298e1511321e17982;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=b2877211f17d31eac7fb87ead457feadaf892777;hpb=4bb29573149a0ffa1f881c5e38a0fe68e9e76b67;p=lilypond.git diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc index b2877211f1..84c43ccf81 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--2015 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 @@ -24,7 +24,9 @@ #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" #include "spanner.hh" #include "staff-symbol-referencer.hh" @@ -36,16 +38,16 @@ 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)); DECLARE_SCHEME_CALLBACK (calc_bound_info, (SCM, Direction)); - DECLARE_GROB_INTERFACE (); }; Spanner *parent_spanner (Grob *g) { - if (Spanner::has_interface (g)) + if (has_interface (g)) return dynamic_cast (g); return parent_spanner (g->get_parent (Y_AXIS)); } @@ -53,7 +55,7 @@ Spanner *parent_spanner (Grob *g) SCM Line_spanner::calc_bound_info (SCM smob, Direction dir) { - Spanner *me = unsmob_spanner (smob); + Spanner *me = unsmob (smob); Grob *commonx = me->get_bound (LEFT)->common_refpoint (me->get_bound (RIGHT), X_AXIS); commonx = me->common_refpoint (commonx, X_AXIS); @@ -61,7 +63,7 @@ Line_spanner::calc_bound_info (SCM smob, Direction dir) SCM bound_details = me->get_property ("bound-details"); SCM details = SCM_BOOL_F; - if (details == SCM_BOOL_F) + if (scm_is_false (details)) details = ly_assoc_get ((dir == LEFT) ? ly_symbol2scm ("left") : ly_symbol2scm ("right"), bound_details, SCM_BOOL_F); @@ -72,11 +74,10 @@ 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) + if (scm_is_false (details)) details = ly_assoc_get (ly_symbol2scm ("default"), bound_details, SCM_EOL); SCM text = ly_assoc_get (ly_symbol2scm ("text"), details, SCM_BOOL_F); @@ -108,9 +109,20 @@ Line_spanner::calc_bound_info (SCM smob, Direction dir) ? columns[0] : columns.back (); } + Real x_coord = (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 = unsmob (bound_grob->get_object ("accidental-grob")); + 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); + + Grob *dot = unsmob (bound_grob->get_object ("dot")); + if (dot && to_boolean (ly_assoc_get (ly_symbol2scm ("start-at-dot"), details, SCM_BOOL_F))) + x_coord = robust_relative_extent (dot, commonx, X_AXIS).linear_combination (attach); + details = scm_acons (ly_symbol2scm ("X"), - scm_from_double (robust_relative_extent (bound_grob, commonx, X_AXIS) - .linear_combination (attach)), + scm_from_double (x_coord), details); } @@ -156,7 +168,7 @@ Line_spanner::calc_bound_info (SCM smob, Direction dir) VerticalAxisGroup of a staff) that extends over the break. */ Spanner *next_bound_parent_on_this_line - = next_bound_parent->broken_neighbor (other_dir (dir)); + = next_bound_parent->broken_neighbor (-dir); if (next_bound_parent_on_this_line) { @@ -180,7 +192,9 @@ Line_spanner::calc_bound_info (SCM smob, Direction dir) } else { - y = me->get_bound (dir)->extent (common_y, Y_AXIS).center (); + Interval ii = me->get_bound (dir)->extent (common_y, Y_AXIS); + if (!ii.is_empty()) + y = ii.center (); details = scm_acons (ly_symbol2scm ("common-Y"), common_y->self_scm (), details); } @@ -191,6 +205,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 (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) @@ -210,12 +240,12 @@ SCM Line_spanner::calc_left_bound_info_and_text (SCM smob) { SCM alist = Line_spanner::calc_bound_info (smob, LEFT); - Spanner *me = unsmob_spanner (smob); + Spanner *me = unsmob (smob); SCM text = me->get_property ("text"); if (Text_interface::is_markup (text) && me->get_bound (LEFT)->break_status_dir () == CENTER - && ly_assoc_get (ly_symbol2scm ("stencil"), alist, SCM_BOOL_F) == SCM_BOOL_F) + && scm_is_false (ly_assoc_get (ly_symbol2scm ("stencil"), alist, SCM_BOOL_F))) { Output_def *layout = me->layout (); SCM properties = Font_interface::text_font_alist_chain (me); @@ -232,7 +262,7 @@ MAKE_SCHEME_CALLBACK (Line_spanner, print, 1); SCM Line_spanner::print (SCM smob) { - Spanner *me = dynamic_cast (unsmob_grob (smob)); + Spanner *me = unsmob (smob); // Triggers simple-Y calculations bool simple_y = to_boolean (me->get_property ("simple-Y")) && !to_boolean (me->get_property ("cross-staff")); @@ -245,8 +275,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), @@ -255,7 +284,6 @@ Line_spanner::print (SCM smob) span_points[d] = z; } - while (flip (&d) != LEFT); Drul_array gaps (0, 0); Drul_array arrows (0, 0); @@ -266,28 +294,26 @@ 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); arrows[d] = to_boolean (ly_assoc_get (ly_symbol2scm ("arrow"), bounds[d], SCM_BOOL_F)); - stencils[d] = unsmob_stencil (ly_assoc_get (ly_symbol2scm ("stencil"), + stencils[d] = unsmob (ly_assoc_get (ly_symbol2scm ("stencil"), bounds[d], SCM_BOOL_F)); - common_y[d] = unsmob_grob (ly_assoc_get (ly_symbol2scm ("common-Y"), + common_y[d] = unsmob (ly_assoc_get (ly_symbol2scm ("common-Y"), bounds[d], SCM_BOOL_F)); 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)); @@ -304,7 +330,7 @@ Line_spanner::print (SCM smob) } Stencil line; - do + for (LEFT_and_RIGHT (d)) { span_points[d] += -d * gaps[d] * magstep * dz.direction (); @@ -325,20 +351,18 @@ 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); - 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));