Merge branch 'master' into lilypond/translation

[lilypond.git] / lily / slur.cc

diff --git a/lily/slur.cc b/lily/slur.cc
index 7b0553124a6449dc016305c4fbe604cedeff3840..28eed394739e50217a3b1b74f4fcd8c7f459f8d2 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -120,20 +120,10 @@ Slur::print (SCM smob)
   Stencil a;
 
   SCM dash_definition = me->get_property ("dash-definition");
-//  SCM p = me->get_property ("dash-period");
-//  SCM f = me->get_property ("dash-fraction");
-//  SCM interval = me->get_property ("dash-interval");
-//  if (scm_is_number (p) && scm_is_number (f))
-//    a = Lookup::dashed_slur (one, line_thick, robust_scm2double (p, 1.0),
-//                          robust_scm2double (f, 0));
-//  else
-    a = Lookup::slur (one,
-                     get_grob_direction (me) * base_thick,
-                     line_thick,
-                      dash_definition);
-//                      robust_scm2double (p, 1.0),
-//                      robust_scm2double (f, 0),
-//                      robust_scm2double (interval, 1));
+  a = Lookup::slur (one,
+                    get_grob_direction (me) * base_thick,
+                   line_thick,
+                    dash_definition);
 
 #if DEBUG_SLUR_SCORING
   SCM annotation = me->get_property ("annotation");
@@ -166,7 +156,7 @@ Slur::print (SCM smob)
 
 /*
   it would be better to do this at engraver level, but that is
-  fragile, as the breakabl items are generated on staff level, at
+  fragile, as the breakable items are generated on staff level, at
   which point slur starts and ends have to be tracked
 */
 void
@@ -285,9 +275,9 @@ Slur::outside_slur_callback (SCM grob, SCM offset_scm)
                                         0.0);
   yext.widen (slur_padding);
 
-  Real EPS = 1e-3;
+  const Real EPS = 1e-3;
   Interval bezext (curve.control_[0][X_AXIS], curve.control_[3][X_AXIS]);
-  bool consider[] = { false, false, false };
+  bool consider[] = {false, false, false};
   Real ys[] = {0, 0, 0};
   bool do_shift = false;
   
@@ -361,7 +351,7 @@ Slur::auxiliary_acknowledge_extra_object (Grob_info const &info,
          e->set_object ("slur", slur->self_scm ());
        }
     }
-  else
+  else if (avoid != ly_symbol2scm ("ignore"))
     e->warning (_f ("Ignoring grob for slur: %s. avoid-slur not set?",
                    e->name().c_str ()));
 }