X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdynamic-text-spanner.cc;h=5ed1f00caeeebdedc3f771cd9897573880594079;hb=6eced6a93bbfda6e6af37a7d77a8e75a5052dbee;hp=70d2bf446600f62808a11732c962339d9f306ef2;hpb=5d1ddaf889233f8e5c32a118f9e843e1becca2d2;p=lilypond.git diff --git a/lily/dynamic-text-spanner.cc b/lily/dynamic-text-spanner.cc index 70d2bf4466..5ed1f00cae 100644 --- a/lily/dynamic-text-spanner.cc +++ b/lily/dynamic-text-spanner.cc @@ -1,4 +1,3 @@ - /* crescendo-text-spanner.cc -- implement Text_spanner @@ -6,10 +5,10 @@ (c) 2000--2005 Jan Nieuwenhuizen - Revised over good by Han-Wen. + Revised over good by Han-Wen. */ -#include "text-item.hh" +#include "text-interface.hh" #include "text-spanner.hh" #include "line-spanner.hh" #include "spanner.hh" @@ -19,17 +18,13 @@ #include "warn.hh" #include "paper-column.hh" - - class Dynamic_text_spanner { public: DECLARE_SCHEME_CALLBACK (print, (SCM)); - static bool has_interface (Grob*); + static bool has_interface (Grob *); }; - - /* This is a partial C&P from text-spanner.cc @@ -38,28 +33,26 @@ public: * does not require bracket functionality. * should make room for spanning points (mf/f/mp texts). - + * In the future, we should support - cresc - - - - poco - - - a - - - - poco - - - + cresc - - - - poco - - - a - - - - poco - - - as well The cut & paste is rather inelegant, but text-spanner was a failed and buggy attempt at being generic. - - */ MAKE_SCHEME_CALLBACK (Dynamic_text_spanner, print, 1); SCM -Dynamic_text_spanner::print (SCM smob) +Dynamic_text_spanner::print (SCM smob) { Grob *me = unsmob_grob (smob); - Spanner *spanner = dynamic_cast (me); + Spanner *spanner = dynamic_cast (me); Grob *common = spanner->get_bound (LEFT)->common_refpoint (spanner->get_bound (RIGHT), X_AXIS); - Output_def * layout = me->get_layout (); + Output_def *layout = me->get_layout (); Interval span_points; Drul_array broken; @@ -86,15 +79,14 @@ Dynamic_text_spanner::print (SCM smob) encl = -d; } - Interval ext = b->extent (common, X_AXIS); - span_points[d] = -d * pad + Interval ext = b->extent (common, X_AXIS); + span_points[d] = -d * pad + robust_relative_extent (b, common, X_AXIS) .linear_combination (encl); } } while (flip (&d) != LEFT); - Stencil m; SCM properties = Font_interface::text_font_alist_chain (me); SCM edge_text = me->get_property ("edge-text"); @@ -106,12 +98,12 @@ Dynamic_text_spanner::print (SCM smob) { if (broken[d]) continue; - + SCM text = index_get_cell (edge_text, d); - if (Text_interface::markup_p (text)) + if (Text_interface::markup_p (text)) edge[d] = *unsmob_stencil (Text_interface::interpret_markup (layout->self_scm (), properties, text)); - + if (!edge[d].is_empty ()) edge[d].align_to (Y_AXIS, CENTER); } @@ -121,21 +113,21 @@ Dynamic_text_spanner::print (SCM smob) do { Interval ext = edge[d].extent (X_AXIS); + Real pad = robust_scm2double (me->get_property ("bound-padding"), 0.0); if (!ext.is_empty ()) { edge[d].translate_axis (span_points[d], X_AXIS); m.add_stencil (edge[d]); - span_points[d] += -d * ext[-d]; + span_points[d] += -d * (ext[-d] + pad); } } while (flip (&d) != LEFT); - if (!span_points.is_empty ()) { Stencil l = Line_spanner::line_stencil (me, - Offset (span_points[LEFT], 0), - Offset (span_points[RIGHT], 0)); + Offset (span_points[LEFT], 0), + Offset (span_points[RIGHT], 0)); m.add_stencil (l); } m.translate_axis (- me->relative_coordinate (common, X_AXIS), X_AXIS);