source file of the GNU LilyPond music typesetter
- (c) 2000--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 2000--2007 Jan Nieuwenhuizen <janneke@gnu.org>
Revised over good by Han-Wen.
*/
#include "text-spanner.hh"
-#include "text-item.hh"
+#include "text-interface.hh"
#include "line-spanner.hh"
#include "spanner.hh"
#include "font-interface.hh"
/* Ugh, must be same as Hairpin::print. */
Grob *common = spanner->get_bound (LEFT)->common_refpoint (spanner->get_bound (RIGHT), X_AXIS);
- Output_def *layout = me->get_layout ();
+ Output_def *layout = me->layout ();
SCM flare = me->get_property ("bracket-flare");
SCM shorten = me->get_property ("shorten-pair");
SCM text = index_get_cell (edge_text, d);
- if (Text_interface::markup_p (text))
+ if (Text_interface::is_markup (text))
edge[d] = *unsmob_stencil (Text_interface::interpret_markup (layout->self_scm (), properties, text));
if (!edge[d].is_empty ())
Interval ext = edge[d].extent (X_AXIS);
if (!ext.is_empty ())
{
+ Real pad = robust_scm2double (me->get_property ("bound-padding"), 0.0);
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);
}
while (flip (&d) != LEFT);
- if (!span_points.is_empty ())
+
+ if (!span_points.is_empty ()
+ && span_points.length () > robust_scm2double (me->get_property ("dash-period"), 0.0))
{
- Stencil l = Line_spanner::line_stencil (me, Offset (span_points[LEFT], 0),
+ Stencil l = Line_spanner::line_stencil (me,
+ Offset (span_points[LEFT], 0),
Offset (span_points[RIGHT], 0));
m.add_stencil (l);
}
return m.smobbed_copy ();
}
-ADD_INTERFACE (Text_spanner, "text-spanner-interface",
+ADD_INTERFACE (Text_spanner,
+
"generic text spanner",
- "dash-period dash-fraction edge-height bracket-flare edge-text shorten-pair style thickness enclose-bounds");
+
+ "bound-padding "
+ "bracket-flare "
+ "dash-fraction "
+ "dash-period "
+ "edge-height "
+ "edge-text "
+ "enclose-bounds "
+ "shorten-pair "
+ "style "
+ "thickness "
+ );