/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2005--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
int
Tie_configuration::compare (Tie_configuration const &a,
- Tie_configuration const &b)
+ Tie_configuration const &b)
{
if (a.position_ - b.position_)
return sign (a.position_ - b.position_);
return sign (a.dir_ - b.dir_);
}
-
Tie_configuration::Tie_configuration ()
{
column_ranks_ = Drul_array<int> (0, 0);
}
-
void
Tie_configuration::center_tie_vertically (Tie_details const &details)
{
Bezier b = get_untransformed_bezier (details);
Offset middle = b.curve_point (0.5);
Offset edge = b.curve_point (0.0);
- Real center = (edge[Y_AXIS] + middle[Y_AXIS])/2.0;
+ Real center = (edge[Y_AXIS] + middle[Y_AXIS]) / 2.0;
delta_y_ = - dir_ * center;
}
-
Bezier
Tie_configuration::get_transformed_bezier (Tie_details const &details) const
{
b.scale (1, dir_);
b.translate (Offset (attachment_x_[LEFT],
- delta_y_ + details.staff_space_ * 0.5 * position_));
+ delta_y_ + details.staff_space_ * 0.5 * position_));
return b;
}
l = 1.0;
}
return slur_shape (l,
- details.height_limit_,
- details.ratio_);
+ details.height_limit_,
+ details.ratio_);
}
int
Real
Tie_configuration::distance (Tie_configuration const &a,
- Tie_configuration const &b)
+ Tie_configuration const &b)
{
Real d = 3 * (a.position_ - b.position_);
return d + (2 + (a.dir_ - b.dir_));
}
-
void
-Tie_configuration::add_score (Real s, string desc)
+Tie_configuration::add_score (Real s, const string &desc)
{
assert (!scored_);
score_ += s;
Real l = attachment_x_.length ();
return slur_shape (l,
- details.height_limit_,
- details.ratio_).curve_point (0.5)[Y_AXIS];
+ details.height_limit_,
+ details.ratio_).curve_point (0.5)[Y_AXIS];
}
Ties_configuration::Ties_configuration ()
}
void
-Ties_configuration::add_tie_score (Real s, int i, string desc)
+Ties_configuration::add_tie_score (Real s, int i, const string &desc)
{
assert (!scored_);
score_ += s;
if (s)
{
while (tie_score_cards_.size () < size ())
- tie_score_cards_.push_back ("");
+ tie_score_cards_.push_back ("");
tie_score_cards_[i] += to_string ("%s=%.2f ", desc.c_str (), s);
}
}
void
-Ties_configuration::add_score (Real s, string desc)
+Ties_configuration::add_score (Real s, const string &desc)
{
assert (!scored_);
score_ += s;
return score_;
}
-
string
Ties_configuration::complete_tie_card (vsize i) const
{
string s;
s += to_string ("%d (%.2f) %c: ", (*this)[i].position_, (*this)[i].delta_y_,
- ((*this)[i].dir_ == UP ? 'u' : 'd'))
- + (*this)[i].card () + (*this).tie_card (i);
-
+ ((*this)[i].dir_ == UP ? 'u' : 'd'))
+ + (*this)[i].card () + tie_card (i);
+
/*
this is a little awkward, but we must decide where to put
aggregrates.
if (i + 1 == size ())
s += to_string ("TOTAL=%.2f", score ());
-
+
return s;
}
string
Ties_configuration::complete_score_card () const
{
- string s;
+ string s;
for (vsize i = 0; i < size (); i++)
{
s += complete_tie_card (i);
return s;
}
-
-
string
Ties_configuration::card () const
{