release: 1.3.3

[lilypond.git] / lily / bow.cc

diff --git a/lily/bow.cc b/lily/bow.cc
index a72e2fe4337ef56dc0108e3427799e46c43744e6..6033cfe926b4dd0190dbc9233c06abfe2f63af05 100644 (file)
--- a/lily/bow.cc
+++ b/lily/bow.cc
@@ -26,26 +26,15 @@ 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);
-  if (d == SCM_BOOL_F)
+  SCM d =  get_elt_property ("dashed");
+  if (d == SCM_UNDEFINED)
     a = lookup_l ()->slur (c, thick);
   else
-    a = lookup_l ()->dashed_slur (c, thick, gh_scm2int (SCM_CDR(d)));
+    a = lookup_l ()->dashed_slur (c, thick, gh_scm2int (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); 
 }
 
@@ -78,7 +67,7 @@ Drul_array<Interval>
 Bow::curve_extent_drul () const
 {
   Bezier_bow b (paper_l ());
-  b.set (get_encompass_offset_arr (), dir_);
+  b.set (get_encompass_offset_arr (), get_direction ());
   b.calc ();
   return b.curve_extent_drul_;
 }
@@ -87,7 +76,7 @@ Array<Offset>
 Bow::get_controls () const
 {
   Bezier_bow b (paper_l ());
-  b.set (get_encompass_offset_arr (), dir_);
+  b.set (get_encompass_offset_arr (), get_direction ());
   b.calc ();
   Array<Offset> controls;
   controls.set_size (8);
@@ -109,3 +98,4 @@ Bow::get_encompass_offset_arr () const
   return offset_arr;
 }
 
+