*/
-#include "molecule.hh"
+#include "stencil.hh"
#include "text-item.hh"
#include "text-spanner.hh"
#include "line-spanner.hh"
#include "spanner.hh"
#include "font-interface.hh"
#include "dimensions.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
#include "warn.hh"
#include "paper-column.hh"
#include "staff-symbol-referencer.hh"
Interval span_points;
Grob *common = me->get_bound (LEFT)->common_refpoint (me->get_bound (RIGHT), X_AXIS);
- Paper_def * paper = me->get_paper();
+ Output_def * paper = me->get_paper ();
Drul_array<bool> broken;
if (Note_column::has_interface (b))
{
- common = common_refpoint_of_list (b->get_grob_property ("heads"), common, X_AXIS);
+ common = common_refpoint_of_list (b->get_property ("heads"), common, X_AXIS);
}
}
while (flip (&d) != LEFT);
- SCM properties = Font_interface::font_alist_chain (me);
- SCM markup = me->get_grob_property ("text");
- Molecule text;
+ SCM properties = Font_interface::text_font_alist_chain (me);
+ SCM markup = me->get_property ("text");
+ Stencil text;
if (Text_item::markup_p (markup))
- text = *unsmob_molecule (Text_item::interpret_markup (paper->self_scm (), properties, markup));
+ text = *unsmob_stencil (Text_item::interpret_markup (paper->self_scm (), properties, markup));
- Drul_array<Real> shorten = robust_scm2interval (me->get_grob_property ("shorten-pair"),
+ Drul_array<Real> shorten = robust_scm2interval (me->get_property ("shorten-pair"),
Interval (0,0));
Interval ext;
if (Note_column::has_interface (b))
{
- for (SCM s = b->get_grob_property ("note-heads"); gh_pair_p (s); s =gh_cdr (s))
- ext.unite (unsmob_grob (gh_car (s))->extent (common, X_AXIS));
+ for (SCM s = b->get_property ("note-heads"); ly_c_pair_p (s); s =ly_cdr (s))
+ ext.unite (unsmob_grob (ly_car (s))->extent (common, X_AXIS));
}
if (ext.is_empty ())
- ext = Interval (0,0);
-
+ {
+ Real x = b->relative_coordinate (common, X_AXIS);
+ ext = Interval (x,x);
+ }
span_points[d] = (broken [d]) ? b->extent (common, X_AXIS)[-d] : ext[d];
if (broken[d])
span_points[LEFT] = span_points[LEFT]
<? (span_points[RIGHT] - text_size
- - robust_scm2double (me->get_grob_property ("minimum-length"), -1.0));
+ - robust_scm2double (me->get_property ("minimum-length"), -1.0));
Interval bracket_span_points = span_points;
bracket_span_points[LEFT] += text_size;
- Drul_array<Real> edge_height = robust_scm2interval (me->get_grob_property ("edge-height"),
+ Drul_array<Real> edge_height = robust_scm2interval (me->get_property ("edge-height"),
Interval (1.0, 1.0));
- Drul_array<Real> flare = robust_scm2interval (me->get_grob_property ("bracket-flare"),
+ Drul_array<Real> flare = robust_scm2interval (me->get_property ("bracket-flare"),
Interval (0,0));
if (broken[RIGHT])
edge_height[RIGHT] = 0.0;
- Molecule b;
+ Stencil b;
+ Interval empty;
if (!bracket_span_points.is_empty () && bracket_span_points.length () > 0.001)
b = Tuplet_bracket::make_bracket (me,
Y_AXIS, Offset (bracket_span_points.length (), 0),
edge_height,
- 0.0,
+ empty,
flare, shorten);
/*
*/
- b = Molecule (Box (b.extent (X_AXIS),
+ b = Stencil (Box (b.extent (X_AXIS),
Interval (0.1,0.1)),
- b.get_expr ());
+ b.expr ());
b.translate_axis (bracket_span_points[LEFT], X_AXIS);
text.translate_axis (span_points[LEFT], X_AXIS);
text.align_to (Y_AXIS, CENTER);
- b.add_molecule (text);
+ b.add_stencil (text);
b.translate_axis (- me->relative_coordinate (common, X_AXIS), X_AXIS);