X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-configuration.cc;h=19a2c68f724ec7c9a40da26540085b30b976c232;hb=a6a51abfd0195a3cf7d6ea095cf69808852f21ce;hp=f84908c651d5f371bc56b08d8cdcc6738f700909;hpb=55ac733b69643a6bc6a83b706c65cb56efd388ef;p=lilypond.git

diff --git a/lily/tie-configuration.cc b/lily/tie-configuration.cc
index f84908c651..19a2c68f72 100644
--- a/lily/tie-configuration.cc
+++ b/lily/tie-configuration.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2011 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
@@ -26,13 +26,12 @@
 
 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 ()
 {
@@ -44,19 +43,17 @@ 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
 {
@@ -64,7 +61,7 @@ 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;
 }
@@ -82,8 +79,8 @@ Tie_configuration::get_untransformed_bezier (Tie_details const &details) const
       l = 1.0;
     }
   return slur_shape (l,
-		     details.height_limit_,
-		     details.ratio_);
+                     details.height_limit_,
+                     details.ratio_);
 }
 
 int
@@ -94,7 +91,7 @@ Tie_configuration::column_span_length () const
 
 Real
 Tie_configuration::distance (Tie_configuration const &a,
-			     Tie_configuration const &b)
+                             Tie_configuration const &b)
 {
 
   Real d = 3 * (a.position_ - b.position_);
@@ -104,9 +101,8 @@ Tie_configuration::distance (Tie_configuration const &a,
     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;
@@ -120,8 +116,8 @@ Tie_configuration::height (Tie_details const &details) const
   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 ()
@@ -140,21 +136,21 @@ Ties_configuration::reset_score ()
 }
 
 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;
@@ -168,15 +164,14 @@ Ties_configuration::score () const
   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.
@@ -186,7 +181,7 @@ Ties_configuration::complete_tie_card (vsize i) const
 
   if (i + 1 == size ())
     s += to_string ("TOTAL=%.2f", score ());
-  
+
   return s;
 }
 
@@ -194,7 +189,7 @@ Ties_configuration::complete_tie_card (vsize i) const
 string
 Ties_configuration::complete_score_card () const
 {
-  string s; 
+  string s;
   for (vsize i = 0; i < size (); i++)
     {
       s += complete_tie_card (i);
@@ -203,8 +198,6 @@ Ties_configuration::complete_score_card () const
   return s;
 }
 
-
-
 string
 Ties_configuration::card () const
 {