X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fline-spanner.cc;h=84c43ccf81ef34e80913c1d298e1511321e17982;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=2be8d1e5032561c8d83a9ab2d3041f7b09bcb094;hpb=28f3294954eff1f263d3b2e3de1c520f4d2fbdfc;p=lilypond.git diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc index 2be8d1e503..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--2012 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 @@ -21,7 +21,6 @@ #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" @@ -44,12 +43,11 @@ public: 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)); } @@ -57,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); @@ -65,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); @@ -79,7 +77,7 @@ Line_spanner::calc_bound_info (SCM smob, Direction dir) 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); @@ -111,14 +109,18 @@ Line_spanner::calc_bound_info (SCM smob, Direction dir) ? columns[0] : columns.back (); } - Real x_coord = (Paper_column::has_interface (bound_grob) + 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 = Note_column::accidentals (bound_grob->get_parent (X_AXIS)); + 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 (x_coord), details); @@ -166,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) { @@ -190,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); } @@ -205,7 +209,7 @@ MAKE_SCHEME_CALLBACK (Line_spanner, calc_cross_staff, 1); SCM Line_spanner::calc_cross_staff (SCM smob) { - Spanner *me = unsmob_spanner (smob); + Spanner *me = unsmob (smob); if (!me) return SCM_BOOL_F; @@ -236,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); @@ -258,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")); @@ -296,9 +300,9 @@ 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)); - 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; @@ -369,8 +373,6 @@ 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)));