Grob *
-Tuplet_bracket::parallel_beam (Grob *me_grob, Link_array<Grob> const &cols, bool *equally_long)
+Tuplet_bracket::parallel_beam (Grob *me_grob, vector<Grob*> const &cols, bool *equally_long)
{
Spanner *me = dynamic_cast<Spanner *> (me_grob);
return 0;
Drul_array<Grob*> stems (Note_column::get_stem (cols[0]),
- Note_column::get_stem (cols.top ()));
+ Note_column::get_stem (cols.back ()));
if (dynamic_cast<Item*> (stems[RIGHT])->get_column ()
!= me->get_bound (RIGHT)->get_column())
return 0;
}
- *equally_long = (beam_stems[0] == stems[LEFT] && beam_stems.top () == stems[RIGHT]);
+ *equally_long = (beam_stems[0] == stems[LEFT] && beam_stems.back () == stems[RIGHT]);
return beams[LEFT];
}
Spanner *orig_spanner = dynamic_cast<Spanner*> (me->original ());
- int neighbor_idx = me->get_break_index () - break_dir;
+ vsize neighbor_idx = me->get_break_index () - break_dir;
if (break_dir
&& d == RIGHT
&& neighbor_idx < orig_spanner->broken_intos_.size ())
connect_to_other[d]
= (break_dir
- && (neighbor_idx < orig_spanner->broken_intos_.size ()
- && neighbor_idx >= 0)
+ && neighbor_idx < orig_spanner->broken_intos_.size ()
&& orig_spanner->broken_intos_[neighbor_idx]->is_live ());
}
while (flip (&d) != LEFT);
- overshoot[LEFT];
}
else if (d == RIGHT
- && (columns.is_empty ()
+ && (columns.empty ()
|| (bounds[d]->get_column ()
- != dynamic_cast<Item *> (columns.top ())->get_column ())))
+ != dynamic_cast<Item *> (columns.back ())->get_column ())))
{
/*
TODO: make padding tunable?
Tuplet_bracket::get_bounds (Grob *me, Grob **left, Grob **right)
{
extract_grob_set (me, "note-columns", columns);
- int l = 0;
+ vsize l = 0;
while (l < columns.size () && Note_column::has_rests (columns[l]))
l++;
- int r = columns.size ()- 1;
- while (r >= l && Note_column::has_rests (columns[r]))
+ vsize r = columns.size ();
+ while (r > l && Note_column::has_rests (columns[r-1]))
r--;
*left = *right = 0;
- if (l <= r)
+ if (l < r)
{
*left = columns[l];
- *right = columns[r];
+ *right = columns[r-1];
}
}
Real x0 = robust_relative_extent (lgr, commonx, X_AXIS)[LEFT];
Real x1 = robust_relative_extent (rgr, commonx, X_AXIS)[RIGHT];
- Array<Offset> points;
- points.push (Offset (x0 - x0, staff[dir]));
- points.push (Offset (x1 - x0, staff[dir]));
+ vector<Offset> points;
+ points.push_back (Offset (x0 - x0, staff[dir]));
+ points.push_back (Offset (x1 - x0, staff[dir]));
- for (int i = 0; i < columns.size (); i++)
+ for (vsize i = 0; i < columns.size (); i++)
{
Interval note_ext = columns[i]->extent (commony, Y_AXIS);
Real notey = note_ext[dir] - me->relative_coordinate (commony, Y_AXIS);
Real x = columns[i]->relative_coordinate (commonx, X_AXIS) - x0;
- points.push (Offset (x, notey));
+ points.push_back (Offset (x, notey));
}
/*
We assume that the smaller bracket is 1.0 space high.
*/
Real ss = Staff_symbol_referencer::staff_space (me);
- for (int i = 0; i < tuplets.size (); i++)
+ for (vsize i = 0; i < tuplets.size (); i++)
{
Interval tuplet_x (tuplets[i]->extent (commonx, X_AXIS));
Interval tuplet_y (tuplets[i]->extent (commony, Y_AXIS));
y += dir * my_height[d];
#endif
- points.push (Offset (tuplet_x[d] - x0, y));
+ points.push_back (Offset (tuplet_x[d] - x0, y));
}
while (flip (&d) != LEFT);
}
Real factor = (columns.size () > 1) ? 1 / (x1 - x0) : 1.0;
- for (int i = 0; i < points.size (); i++)
+ for (vsize i = 0; i < points.size (); i++)
{
Real x = points[i][X_AXIS];
Real tuplety = (*dy) * x * factor;
*offset *= 2 / ss;
*offset = rint (*offset);
- if (Staff_symbol_referencer::on_staffline (me, (int) rint (*offset)))
+ if (Staff_symbol_referencer::on_line (me, (int) rint (*offset)))
*offset += dir;
*offset *= 0.5 * ss;
Real lp = scm_to_double (scm_car (ps));
Real rp = scm_to_double (scm_cdr (ps));
- /*
- duh. magic.
- */
+ Real ss = Staff_symbol_referencer::staff_space (me);
+
offset = lp + dir * (0.5 + scm_to_double (me->get_property ("padding")));
- dy = rp - lp;
+ dy = (rp - lp);
+
+ dy *= ss;
+ offset *= ss;
}
{
Drul_array<int> dirs (0, 0);
extract_grob_set (me, "note-columns", columns);
- for (int i = 0; i < columns.size (); i++)
+ for (vsize i = 0; i < columns.size (); i++)
{
Grob *nc = columns[i];
Direction d = Note_column::dir (nc);