Interval placements = robust_scm2interval (me->get_property ("normalized-endpoints"), Interval (0.0, 0.0));
Stencil the_beam;
- int extreme = (segments[0].vertical_count_ == 0
- ? segments[0].vertical_count_
- : segments.back ().vertical_count_);
+ vsize extreme = (segments[0].vertical_count_ == 0
+ ? segments[0].vertical_count_
+ : segments.back ().vertical_count_);
for (vsize i = 0; i < segments.size (); i++)
{
while (*next_group_pos < *next_beat_pos)
{
- int group_count = 1; //default -- 1 base moments in a beam
+ I64 group_count = 1; //default -- 1 base moments in a beam
if (scm_is_pair (grouping))
{
group_count = scm_to_int (scm_car (grouping));
// If we have a tuplet, the count should be determined from
// the maximum tuplet size for beamed tuplets.
- int tuplet_number = factor.den ();
- if (tuplet_number > 1)
+ U64 tuplet_number = factor.den ();
+ if (tuplet_number > 1U)
{
// We use 1/8 as the base moment for the tuplet because it's
// the largest beamed value. If the tuplet is shorter, it's
// OK, the code still works
- int test_count = ( Moment (Rational (1, 8) / factor) / base_moment).num ();
+ I64 test_count = ( Moment (Rational (1, 8) / factor) / base_moment).num ();
if (test_count > group_count) group_count = test_count;
}
*group_pos = *next_group_pos;
- *next_group_pos = *group_pos + group_count * base_moment;
+ *next_group_pos = *group_pos + Rational(group_count) * base_moment;
}
}
Moment next_group_pos (0);
Moment next_beat_pos (options.base_moment_);
Moment tuplet_start_moment (-1, 1);
- int tuplet_number = 1;
+ I64 tuplet_number = 1;
SCM grouping = options.grouping_;
vsize i = 0;
grobname = scm_from_locale_symbol
(info.grob ()->name ().c_str ());
if (scm_is_eq (scm_caaar (s), grobname))
- if (scm_is_symbol (scm_cdaar (s)))
- info.grob ()->set_property (scm_cdaar (s), scm_cdar (s));
- else
- set_nested_property (info.grob (), scm_cdaar (s),
- scm_cdar (s));
+ {
+ if (scm_is_symbol (scm_cdaar (s)))
+ info.grob ()->set_property (scm_cdaar (s), scm_cdar (s));
+ else
+ set_nested_property (info.grob (), scm_cdaar (s),
+ scm_cdar (s));
+ }
}
else if (direct)
set_nested_property (info.grob (), scm_cdaar (s),