release: 1.2.7

[lilypond.git] / lily / bow.cc

diff --git a/lily/bow.cc b/lily/bow.cc
index 588c7f9c74f85261aef863b0dc8a41aafd0896c6..f3c4e59eeb638649971f9c386b04899fedc560c9 100644 (file)
--- a/lily/bow.cc
+++ b/lily/bow.cc
@@ -26,7 +26,7 @@ Bow::do_brew_molecule_p () const
 {
   Real thick = paper_l ()->get_var ("slur_thickness");
   Array<Offset> c = get_controls ();
-  Real dy = c[3].y () - c[0].y ();
+
   Molecule a;
 
   SCM d =  get_elt_property (dashed_scm_sym);
@@ -35,17 +35,6 @@ Bow::do_brew_molecule_p () const
   else
     a = lookup_l ()->dashed_slur (c, thick, gh_scm2int (SCM_CDR(d)));
 
-  if (check_debug && !monitor->silent_b ("Bow"))
-    {
-      static int i = 1;
-      cout << "******" << i++ << "******" << endl;
-      cout << "c0.y: " << c[0].y () << endl;
-      cout << "c3.y: " << c[3].y () << endl;
-      cout << "dy: " << dy << endl;
-      cout << "dy_f_l: " << dy_f_drul_[LEFT] << endl;
-      cout << "dy_f_r: " << dy_f_drul_[RIGHT] << endl;
-      cout << "dy_f: " << dy_f_drul_[RIGHT] - dy_f_drul_[LEFT] << endl;
-    }
   return new Molecule (a); 
 }
 
@@ -58,8 +47,6 @@ Bow::center () const
   return Offset (dx / 2, dy);
 }
 
-
-
 /*
    Ugh.  Control points are too crude measures.
  */
@@ -76,6 +63,14 @@ Bow::do_height () const
   return iv;
 }
 
+Drul_array<Interval>
+Bow::curve_extent_drul () const
+{
+  Bezier_bow b (paper_l ());
+  b.set (get_encompass_offset_arr (), dir_);
+  b.calc ();
+  return b.curve_extent_drul_;
+}
 
 Array<Offset>
 Bow::get_controls () const