X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur-scoring.cc;h=a3dad6fb5e9785888b05b119ac5320b24c0b36b0;hb=13798e90e8ae32bf341b21440f2687442274759f;hp=afe2dd1585c166d3e4e344bd2182642552d184f6;hpb=ac651504b3fc09a6146cef552ff2ef49c22e71e9;p=lilypond.git

diff --git a/lily/slur-scoring.cc b/lily/slur-scoring.cc
index afe2dd1585..a3dad6fb5e 100644
--- a/lily/slur-scoring.cc
+++ b/lily/slur-scoring.cc
@@ -45,9 +45,6 @@
 #include "stem.hh"
 #include "warn.hh"
 
-using std::string;
-using std::vector;
-
 /*
   TODO:
 
@@ -472,7 +469,7 @@ Slur_score_state::get_y_attachment_range () const
             slur_->warning ("slur trying to encompass an empty note column.");
           else
             end_ys[d] = dir_
-                        * std::max (std::max (dir_ * (base_attachments_[d][Y_AXIS]
+                        * max (max (dir_ * (base_attachments_[d][Y_AXIS]
                                             + parameters_.region_size_ * dir_),
                                     dir_ * (dir_ + nc_extent[dir_])),
                                dir_ * base_attachments_[-d][Y_AXIS]);
@@ -641,7 +638,7 @@ Slur_score_state::generate_avoid_offsets () const
         continue;
 
       Encompass_info inf (get_encompass_info (encompasses[i]));
-      Real y = dir_ * (std::max (dir_ * inf.head_, dir_ * inf.stem_));
+      Real y = dir_ * (max (dir_ * inf.head_, dir_ * inf.stem_));
 
       avoid.push_back (Offset (inf.x_, y + dir_ * parameters_.free_head_distance_));
     }
@@ -743,7 +740,7 @@ Slur_score_state::enumerate_attachments (Drul_array<Real> end_ys) const
                 }
             }
 
-          dz = os[RIGHT] - os[LEFT];
+          dz = (os[RIGHT] - os[LEFT]).direction ();
           for (LEFT_and_RIGHT (d))
             {
               if (extremes_[d].slur_head_
@@ -755,7 +752,7 @@ Slur_score_state::enumerate_attachments (Drul_array<Real> end_ys) const
                      TODO: parameter */
                   os[d][X_AXIS]
                   -= dir_ * extremes_[d].slur_head_x_extent_.length ()
-                     * sin (dz.arg ()) / 3;
+                    * dz[Y_AXIS] / 3;
                 }
             }