Revised over good by Han-Wen.
*/
-#include "stencil.hh"
-#include "text-item.hh"
#include "text-spanner.hh"
+
+#include "text-item.hh"
#include "line-spanner.hh"
#include "spanner.hh"
#include "font-interface.hh"
SCM
Text_spanner::print (SCM smob)
{
- Grob *me= unsmob_grob (smob);
+ Grob *me = unsmob_grob (smob);
Spanner *spanner = dynamic_cast<Spanner*> (me);
/* Ugh, must be same as Hairpin::print. */
Grob *common = spanner->get_bound (LEFT)->common_refpoint (spanner->get_bound (RIGHT), X_AXIS);
- Output_def * paper = me->get_paper ();
+ Output_def * layout = me->get_layout ();
SCM flare = me->get_property ("bracket-flare");
SCM shorten = me->get_property ("shorten-pair");
SCM properties = Font_interface::text_font_alist_chain (me);
SCM edge_text = me->get_property ("edge-text");
Drul_array<Stencil> edge;
- if (ly_c_pair_p (edge_text))
+ if (scm_is_pair (edge_text))
{
Direction d = LEFT;
do
SCM text = index_get_cell (edge_text, d);
- if (Text_item::markup_p (text))
- edge[d] = *unsmob_stencil (Text_item::interpret_markup (paper->self_scm (), properties, 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);
if (!span_points.is_empty ())
{
- 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);
}