Merge with master

[lilypond.git] / lily / semi-tie-column.cc

diff --git a/lily/semi-tie-column.cc b/lily/semi-tie-column.cc
index 7a02ac578b6b3ba14e57fd6c203f5f1378cd9b09..ee18953aef22247e8472eae4319ee81b20069cba 100644 (file)
--- a/lily/semi-tie-column.cc
+++ b/lily/semi-tie-column.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
@@ -39,7 +39,9 @@ SCM
 Semi_tie_column::calc_positioning_done (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
-  
+
+  me->set_property ("positioning-done", SCM_BOOL_T);
+    
   extract_grob_set (me, "ties", lv_ro_ties);
   vector<Grob*> lv_ties (lv_ro_ties);
 
@@ -55,14 +57,18 @@ Semi_tie_column::calc_positioning_done (SCM smob)
   SCM manual_configs = me->get_property ("tie-configuration");
   problem.set_manual_tie_configuration (manual_configs);
 
-  Ties_configuration base = problem.generate_optimal_chord_configuration ();
+  Ties_configuration base = problem.generate_optimal_configuration ();
   for (vsize i = 0; i < lv_ties.size(); i++)
     {
-      Tie::set_control_points (lv_ties[i], problem.common_x_refpoint (), base[i],
-                              problem.details_);
+      SCM cp = Tie::get_control_points (lv_ties[i], problem.common_x_refpoint (), base[i],
+                                       problem.details_);
+
+      lv_ties[i]->set_property ("control-points", cp);
       set_grob_direction (lv_ties[i], base[i].dir_);
-    }
 
+      problem.set_debug_scoring (base);
+    }
+  
   return SCM_BOOL_T;
 }