X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fslur-configuration.cc;h=9eb4ef83bd03c74581d9da08b5664c1a062c9c54;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=4bd0c7113959f92d21e29c19bf0e5f7b103c6356;hpb=cb0b407e567feca71cbc5f9479a06b266c69a26c;p=lilypond.git

diff --git a/lily/slur-configuration.cc b/lily/slur-configuration.cc
index 4bd0c71139..9eb4ef83bd 100644
--- a/lily/slur-configuration.cc
+++ b/lily/slur-configuration.cc
@@ -31,9 +31,6 @@
 #include "tie.hh"
 #include "warn.hh"
 
-using std::string;
-using std::vector;
-
 Bezier
 avoid_staff_line (Slur_score_state const &state,
                   Bezier bez)
@@ -93,7 +90,7 @@ fit_factor (Offset dz_unit, Offset dz_perp, Real close_to_edge_length,
   Real fit_factor = 0.0;
   Offset x0 = curve.control_[0];
   curve.translate (-x0);
-  curve.rotate (-dz_unit.arg ());
+  curve.rotate (-dz_unit.angle_degrees ());
   curve.scale (1, d);
 
   Interval curve_xext;
@@ -122,7 +119,7 @@ fit_factor (Offset dz_unit, Offset dz_perp, Real close_to_edge_length,
 
       Real y = curve.get_other_coordinate (X_AXIS, p[X_AXIS]);
       if (y)
-        fit_factor = std::max (fit_factor, (p[Y_AXIS] / y));
+        fit_factor = max (fit_factor, (p[Y_AXIS] / y));
     }
   return fit_factor;
 }
@@ -154,7 +151,7 @@ Slur_configuration::generate_curve (Slur_score_state const &state,
   (control3 - control0).  */
 
   Real max_indent = len / 3.1;
-  indent = std::min (indent, max_indent);
+  indent = min (indent, max_indent);
 
   Real a1 = sqr (len) / 3.0;
   Real a2 = 0.75 * sqr (indent + len / 3.0);
@@ -184,7 +181,7 @@ Slur_configuration::generate_curve (Slur_score_state const &state,
   Real ff = fit_factor (dz_unit, dz_perp, state.parameters_.close_to_edge_length_,
                         curve, state.dir_, avoid);
 
-  height = std::max (height, std::min (height * ff, max_h));
+  height = max (height, min (height * ff, max_h));
 
   curve.control_[0] = attachment_[LEFT];
   curve.control_[1] = attachment_[LEFT] + dz_perp * height * state.dir_
@@ -258,7 +255,7 @@ Slur_configuration::score_encompass (Slur_score_state const &state)
               Real hd = (head_dy)
                         ? (1 / fabs (head_dy) - 1 / state.parameters_.free_head_distance_)
                         : state.parameters_.head_encompass_penalty_;
-              hd = std::min (std::max (hd, 0.0), state.parameters_.head_encompass_penalty_);
+              hd = min (max (hd, 0.0), state.parameters_.head_encompass_penalty_);
 
               demerit += hd;
             }
@@ -273,7 +270,7 @@ Slur_configuration::score_encompass (Slur_score_state const &state)
             {
 
               Real closest
-                = state.dir_ * std::max (state.dir_ * state.encompass_infos_[j].get_point (state.dir_), state.dir_ * line_y);
+                = state.dir_ * max (state.dir_ * state.encompass_infos_[j].get_point (state.dir_), state.dir_ * line_y);
               Real d = fabs (closest - y);
 
               convex_head_distances.push_back (d);
@@ -299,7 +296,7 @@ Slur_configuration::score_encompass (Slur_score_state const &state)
 
       for (vsize j = 0; j < n; j++)
         {
-          min_dist = std::min (min_dist, convex_head_distances[j]);
+          min_dist = min (min_dist, convex_head_distances[j]);
           avg_distance += convex_head_distances[j];
         }
 
@@ -322,9 +319,9 @@ Slur_configuration::score_encompass (Slur_score_state const &state)
       Real variance_penalty = state.parameters_.head_slur_distance_max_ratio_;
       if (min_dist > 0.0)
         variance_penalty
-          = std::min ((avg_distance / (min_dist + state.parameters_.absolute_closeness_measure_) - 1.0), variance_penalty);
+          = min ((avg_distance / (min_dist + state.parameters_.absolute_closeness_measure_) - 1.0), variance_penalty);
 
-      variance_penalty = std::max (variance_penalty, 0.0);
+      variance_penalty = max (variance_penalty, 0.0);
       variance_penalty *= state.parameters_.head_slur_distance_factor_;
 
       add_score (variance_penalty, "variance");
@@ -427,7 +424,7 @@ Slur_configuration::score_extra_encompass (Slur_score_state const &state)
       else
         programming_error ("unknown avoidance type");
 
-      dist = std::max (dist, 0.0);
+      dist = max (dist, 0.0);
 
       Real penalty = info.penalty_ * peak_around (0.1 * state.parameters_.extra_encompass_free_distance_,
                                                   state.parameters_.extra_encompass_free_distance_,
@@ -473,7 +470,7 @@ Slur_configuration::score_slopes (Slur_score_state const &state)
   Real slur_dy = slur_dz[Y_AXIS];
   Real demerit = 0.0;
 
-  demerit += std::max ((fabs (slur_dy / slur_dz[X_AXIS])
+  demerit += max ((fabs (slur_dy / slur_dz[X_AXIS])
                    - state.parameters_.max_slope_), 0.0)
              * state.parameters_.max_slope_factor_;
 
@@ -484,9 +481,9 @@ Slur_configuration::score_slopes (Slur_score_state const &state)
 
   if (!state.is_broken_)
     demerit += state.parameters_.steeper_slope_factor_
-               * (std::max (fabs (slur_dy) - max_dy, 0.0));
+               * (max (fabs (slur_dy) - max_dy, 0.0));
 
-  demerit += std::max ((fabs (slur_dy / slur_dz[X_AXIS])
+  demerit += max ((fabs (slur_dy / slur_dz[X_AXIS])
                    - state.parameters_.max_slope_), 0.0)
              * state.parameters_.max_slope_factor_;