*/
#include "tuplet-bracket.hh"
+
+#include "bracket.hh"
#include "axis-group-interface.hh"
#include "line-interface.hh"
#include "beam.hh"
{
Spanner *me = dynamic_cast<Spanner *> (me_grob);
Item *g = me->get_bound (hdir);
- if (Note_column::has_interface (g)
+ if (has_interface<Note_column> (g)
&& Note_column::get_stem (g)
&& Note_column::dir (g) == my_dir)
g = Note_column::get_stem (g);
}
}
- Stencil brack = make_bracket (me, Y_AXIS,
- points[RIGHT] - points[LEFT],
- height,
- /*
- 0.1 = more space at right due to italics
- TODO: use italic correction of font.
- */
- Interval (-0.5, 0.5) * gap + 0.1,
- flare, shorten);
+ Stencil brack =
+ Bracket::make_bracket (
+ me, Y_AXIS, points[RIGHT] - points[LEFT], height,
+ /*
+ 0.1 = more space at right due to italics
+ TODO: use italic correction of font.
+ */
+ Interval (-0.5, 0.5) * gap + 0.1,
+ flare, shorten);
for (LEFT_and_RIGHT (d))
{
return mol.smobbed_copy ();
}
-/*
- should move to lookup?
-
- TODO: this will fail for very short (shorter than the flare)
- brackets.
-*/
-Stencil
-Tuplet_bracket::make_bracket (Grob *me, // for line properties.
- Axis protrusion_axis,
- Offset dz,
- Drul_array<Real> height,
- Interval gap,
- Drul_array<Real> flare,
- Drul_array<Real> shorten)
-{
- Drul_array<Offset> corners (Offset (0, 0), dz);
-
- Real length = dz.length ();
- Drul_array<Offset> gap_corners;
-
- Axis bracket_axis = other_axis (protrusion_axis);
-
- Drul_array<Offset> straight_corners = corners;
-
- for (LEFT_and_RIGHT (d))
- straight_corners[d] += -d * shorten[d] / length * dz;
-
- if (!gap.is_empty ())
- {
- for (LEFT_and_RIGHT (d))
- gap_corners[d] = (dz * 0.5) + gap[d] / length * dz;
- }
-
- Drul_array<Offset> flare_corners = straight_corners;
- for (LEFT_and_RIGHT (d))
- {
- flare_corners[d][bracket_axis] = straight_corners[d][bracket_axis];
- flare_corners[d][protrusion_axis] += height[d];
- straight_corners[d][bracket_axis] += -d * flare[d];
- }
-
- Stencil m;
- if (!gap.is_empty ())
- for (LEFT_and_RIGHT (d))
- m.add_stencil (Line_interface::line (me, straight_corners[d],
- gap_corners[d]));
- else
- m.add_stencil (Line_interface::line (me, straight_corners[LEFT],
- straight_corners[RIGHT]));
-
- if (scm_is_number (me->get_property ("dash-fraction")))
- me->set_property ("dash-fraction", scm_from_double (1.0));
- for (LEFT_and_RIGHT (d))
- m.add_stencil (Line_interface::line (me, straight_corners[d],
- flare_corners[d]));
- return m;
-}
-
void
Tuplet_bracket::get_bounds (Grob *me, Grob **left, Grob **right)
{
if (Grob *beam = Stem::get_beam (stems[side]))
(void) beam->get_property ("quantized-positions");
poss[side] = stems[side]->extent (stems[side], Y_AXIS)[get_grob_direction (stems[side])]
- + stems[side]->get_parent (Y_AXIS)->relative_coordinate (commony, Y_AXIS);
+ + stems[side]->parent_relative (commony, Y_AXIS);
}
*dy = poss[RIGHT] - poss[LEFT];
// Check for number-on-bracket collisions
Grob *number = unsmob<Grob> (tuplets[i]->get_object ("tuplet-number"));
if (number)
- points.push_back (Offset (number->extent (commonx, X_AXIS).center () - x0,
- number->extent (commony, Y_AXIS)[dir]));
+ {
+ Interval x_ext = robust_relative_extent (number, commonx, X_AXIS);
+ Interval y_ext = robust_relative_extent (number, commony, Y_AXIS);
+ points.push_back (Offset (x_ext.center () - x0, y_ext[dir]));
+ }
}
if (to_boolean (me->get_property ("avoid-scripts"))
if (unsmob<Grob> (scripts[i]->get_object ("slur")))
continue;
- Interval script_x (scripts[i]->extent (commonx, X_AXIS));
- Interval script_y (scripts[i]->extent (commony, Y_AXIS));
+ Interval script_x
+ = robust_relative_extent (scripts[i], commonx, X_AXIS);
+ Interval script_y
+ = robust_relative_extent (scripts[i], commony, Y_AXIS);
points.push_back (Offset (script_x.center () - x0,
script_y[dir]));