/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1999--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1999--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "system.hh"
#include "warn.hh"
+using std::vector;
+
vector<Grob *>
Spacing_spanner::get_columns (Grob *me_grob)
{
SCM
Spacing_spanner::set_springs (SCM smob)
{
- Spanner *me = unsmob_spanner (smob);
+ Spanner *me = unsmob<Spanner> (smob);
/*
can't use get_system () ? --hwn.
SCM
Spacing_spanner::calc_common_shortest_duration (SCM grob)
{
- Spanner *me = unsmob_spanner (grob);
+ Spanner *me = unsmob<Spanner> (grob);
vector<Grob *> cols (get_columns (me));
{
if (Paper_column::is_musical (cols[i]))
{
- Moment *when = unsmob_moment (cols[i]->get_property ("when"));
+ Moment *when = unsmob<Moment> (cols[i]->get_property ("when"));
/*
ignore grace notes for shortest notes.
continue;
SCM st = cols[i]->get_property ("shortest-starter-duration");
- Moment this_shortest = *unsmob_moment (st);
+ Moment this_shortest = *unsmob<Moment> (st);
assert (this_shortest.to_bool ());
- shortest_in_measure = min (shortest_in_measure, this_shortest.main_part_);
+ shortest_in_measure = std::min (shortest_in_measure, this_shortest.main_part_);
}
else if (!shortest_in_measure.is_infinity ()
&& Paper_column::is_breakable (cols[i]))
SCM bsd = me->get_property ("base-shortest-duration");
Rational d = Rational (1, 8);
- if (Moment *m = unsmob_moment (bsd))
+ if (Moment *m = unsmob<Moment> (bsd))
d = m->main_part_;
if (max_idx != VPOS)
- d = min (d, durations[max_idx]);
+ d = std::min (d, durations[max_idx]);
return Moment (d).smobbed_copy ();
}
if (Separation_item::is_empty (r) && (!rb || Separation_item::is_empty (rb)))
continue;
- Skyline_pair *skys = Skyline_pair::unsmob (r->get_property ("horizontal-skylines"));
+ Skyline_pair *skys = unsmob<Skyline_pair> (r->get_property ("horizontal-skylines"));
overhangs[i] = skys ? (*skys)[RIGHT].max_height () : 0.0;
if (0 == i) continue;
/* min rather than max because stickout will be negative if the right-hand column
sticks out a lot to the left */
- Real stickout = min (skys ? (*skys)[LEFT].max_height () : 0.0,
+ Real stickout = std::min (skys ? (*skys)[LEFT].max_height () : 0.0,
Separation_item::conditional_skyline (r, cols[i - 1]).max_height ());
Real prev_distances = 0.0;
Item *lb = l->find_prebroken_piece (RIGHT);
Real dist = Separation_item::set_distance (l, r, padding);
- distances[i] = max (distances[i], dist - prev_distances);
+ distances[i] = std::max (distances[i], dist - prev_distances);
if (lb)
{
// right than the unbroken version, by extending farther and/or
// nesting more closely;
if (j == i - 1) // check this, the first time we see each lb.
- overhangs[j] = max (overhangs[j],
+ overhangs[j] = std::max (overhangs[j],
lb->extent (lb, X_AXIS)[RIGHT]
+ distances[i] - dist);
}
prev_distances += distances[j];
}
- overhangs[i] = max (overhangs[i],
+ overhangs[i] = std::max (overhangs[i],
overhangs[i - 1] - distances[i]);
}
}
/*
This is probably a waste of time in the case of polyphonic
music. */
- if (found_matching_column && Note_spacing::has_interface (wish))
+ if (found_matching_column && has_interface<Note_spacing> (wish))
{
Real inc = options->increment_;
- Grob *gsp = unsmob_grob (left_col->get_object ("grace-spacing"));
+ Grob *gsp = unsmob<Grob> (left_col->get_object ("grace-spacing"));
if (gsp && Paper_column::when_mom (left_col).grace_part_)
{
Spacing_options grace_opts;
if (Paper_column::is_extraneous_column_from_ligature (left_col))
spring.set_distance (spring.min_distance ());
else
- spring.set_distance (max (left_col->extent (left_col, X_AXIS)[RIGHT],
+ spring.set_distance (std::max (left_col->extent (left_col, X_AXIS)[RIGHT],
spring.min_distance ()));
spring.set_inverse_stretch_strength (1.0);
Moment dt
= Paper_column::when_mom (next) - Paper_column::when_mom (col);
- Moment *len = unsmob_moment (left->get_property ("measure-length"));
+ Moment *len = unsmob<Moment> (left->get_property ("measure-length"));
if (!len)
return false;
{
Item *spacing_grob = dynamic_cast<Item *> (wishes[i]);
- if (!spacing_grob || !Staff_spacing::has_interface (spacing_grob))
+ if (!spacing_grob || !has_interface<Staff_spacing> (spacing_grob))
continue;
/*