Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / tie-formatting-problem.cc

diff --git a/lily/tie-formatting-problem.cc b/lily/tie-formatting-problem.cc
index 38510ae5f07d6a7c93296c4bb81fe147d37bb1bd..f7682c904c56db5af97bcd4c9c3f0c240e6a7b84 100644 (file)
--- a/lily/tie-formatting-problem.cc
+++ b/lily/tie-formatting-problem.cc
@@ -58,7 +58,7 @@ Tie_formatting_problem::get_attachment (Real y, Drul_array<int> columns) const
   return attachments;
 }
 
-Tie_formatting_problem::Tie_formatting_problem()
+Tie_formatting_problem::Tie_formatting_problem ()
 {
   x_refpoint_ = 0;
 }
@@ -144,12 +144,12 @@ Tie_formatting_problem::set_column_chord_outline (vector<Item*> bounds,
          */
          boxes.push_back (Box (x, y));
 
-         stem_extents_[key].unite (Box (x,y));
+         stem_extents_[key].unite (Box (x, y));
 
          if (dir == LEFT)
            {
              Box flag_box = Stem::get_translated_flag (stem).extent_box ();
-             flag_box.translate( Offset (x[RIGHT], X_AXIS));
+             flag_box.translate ( Offset (x[RIGHT], X_AXIS));
              boxes.push_back (flag_box);
            }
        }
@@ -171,9 +171,9 @@ Tie_formatting_problem::set_column_chord_outline (vector<Item*> bounds,
        }
 
       extract_grob_set (stem, "note-heads", heads);
-      for (vsize i = 0; i < heads.size(); i ++)
+      for (vsize i = 0; i < heads.size (); i ++)
        {
-         if (find (bounds.begin(), bounds.end (), dynamic_cast<Item*> (heads[i])) ==  bounds.end ())
+         if (find (bounds.begin (), bounds.end (), dynamic_cast<Item*> (heads[i])) ==  bounds.end ())
            {
              /*
                other untied notes in the same chord.
@@ -201,7 +201,7 @@ Tie_formatting_problem::set_column_chord_outline (vector<Item*> bounds,
     {
       Interval x;
       Interval y;
-      if (head_boxes.size())
+      if (head_boxes.size ())
        {
          Box b = boundary (head_boxes, updowndir, 0);
          x = b[X_AXIS];
@@ -617,7 +617,7 @@ Tie_formatting_problem::score_aptitude (Tie_configuration *conf,
   while (flip (&d) != LEFT);
 
   if (ties_conf
-      && ties_conf->size() == 1)
+      && ties_conf->size () == 1)
     {
       Direction d = LEFT;
       Drul_array<Grob*> stems (0, 0);
@@ -1123,7 +1123,7 @@ Tie_formatting_problem::generate_collision_variations (Ties_configuration const
                                                       );
                  vars.push_back (var);
                }
-             if (i == ties.size() && !specifications_[i].has_manual_position_
+             if (i == ties.size () && !specifications_[i].has_manual_position_
                  && ties[i].dir_ == UP)
                {
                  Tie_configuration_variation var;
@@ -1195,7 +1195,7 @@ Tie_formatting_problem::set_debug_scoring (Ties_configuration const &base)
   if (to_boolean (x_refpoint_->layout ()
                  ->lookup_variable (ly_symbol2scm ("debug-tie-scoring"))))
     {
-      for (vsize i = 0; i < base.size(); i++)
+      for (vsize i = 0; i < base.size (); i++)
        {
          string card = base.complete_tie_card (i);
          specifications_[i].tie_grob_->set_property ("quant-score",