Issue 4938 (2/3) Refactor handling of MIDI control changes

[lilypond.git] / lily / multi-measure-rest.cc

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index 056989a60ed26477b20c816d9b4932ea6932997f..7f2a720d6f809e06736272397e703d577d70f827 100644 (file)
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -80,7 +80,7 @@ Multi_measure_rest::percent (SCM smob)
     we gotta stay clear of sp_iv, so move a bit to the right if
     needed.
   */
-  x_off += std::max (sp_iv[LEFT] - rx, 0.0);
+  x_off += max (sp_iv[LEFT] - rx, 0.0);
 
   /*
     center between stuff.
@@ -107,7 +107,7 @@ Multi_measure_rest::print (SCM smob)
     we gotta stay clear of sp_iv, so move a bit to the right if
     needed.
   */
-  Real x_off = std::max (sp_iv[LEFT] - rx, 0.0);
+  Real x_off = max (sp_iv[LEFT] - rx, 0.0);
 
   Stencil mol;
   mol.add_stencil (symbol_stencil (me, space));
@@ -251,9 +251,9 @@ Multi_measure_rest::big_rest (Grob *me, Real width)
   Real slt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
   Real y = slt * thick_thick / 2 * ss;
   Real ythick = hair_thick * slt * ss;
-  Box b (Interval (0.0, std::max (0.0, (width - 2 * ythick))), Interval (-y, y));
+  Box b (Interval (0.0, max (0.0, (width - 2 * ythick))), Interval (-y, y));
 
-  Real blot = width ? (.8 * std::min (y, ythick)) : 0.0;
+  Real blot = width ? (.8 * min (y, ythick)) : 0.0;
 
   Stencil m = Lookup::round_filled_box (b, blot);
   Stencil yb = Lookup::round_filled_box (Box (Interval (-0.5, 0.5) * ythick, Interval (-ss, ss)), blot);
@@ -392,7 +392,7 @@ Multi_measure_rest::calculate_spacing_rods (Grob *me, Real length)
       rod.item_drul_[LEFT] = li;
       rod.item_drul_[RIGHT] = ri;
 
-      rod.distance_ = std::max (Paper_column::minimum_distance (li, ri) + length,
+      rod.distance_ = max (Paper_column::minimum_distance (li, ri) + length,
                            minlen);
       rod.add_to_cols ();
     }