X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-column.cc;h=2017a5ce44ce7b72a74dc63f754c07367cc30cf8;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=39c51fefc36ae0731c7d91a830bead7bf97a1258;hpb=afa98722d22b2cc4c98254ff05c9ee164cf98bae;p=lilypond.git

diff --git a/lily/tie-column.cc b/lily/tie-column.cc
index 39c51fefc3..2017a5ce44 100644
--- a/lily/tie-column.cc
+++ b/lily/tie-column.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "tie-column.hh"
@@ -69,7 +69,7 @@ Tie_column::before_line_breaking (SCM smob)
   return SCM_UNSPECIFIED;
 }
 
-MAKE_SCHEME_CALLBACK(Tie_column, calc_positioning_done, 1)
+MAKE_SCHEME_CALLBACK (Tie_column, calc_positioning_done, 1)
 SCM
 Tie_column::calc_positioning_done (SCM smob)
 {
@@ -79,14 +79,9 @@ Tie_column::calc_positioning_done (SCM smob)
   if (!ties.size ())
     return SCM_BOOL_T;
 
-  if (ties.size() == 1)
-    {
-      /*
-	Already handled by standard mechanisms.
-       */
-      return SCM_BOOL_T;
-    }
-  
+
+  me->set_property ("positioning-done", SCM_BOOL_T);
+
   vector_sort (ties, Tie::less);
 
   Tie_formatting_problem problem;
@@ -96,34 +91,19 @@ Tie_column::calc_positioning_done (SCM smob)
   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 < base.size(); i++)
+  for (vsize i = 0; i < base.size (); i++)
     {
-      Tie::set_control_points (ties[i], problem.common_x_refpoint (),
-			       base[i],
-			       problem.details_);
+      SCM cp = Tie::get_control_points (ties[i], problem.common_x_refpoint (),
+					base[i],
+					problem.details_);
+
+      ties[i]->set_property ("control-points", cp);
       set_grob_direction (ties[i],
 			  base[i].dir_);
 
-#if DEBUG_TIE_SCORING
-      if (to_boolean (me->layout ()
-		      ->lookup_variable (ly_symbol2scm ("debug-tie-scoring"))))
-	{
-	  string card = to_string ("%d (%.2f): ", base[i].position_, base[i].delta_y_)
-	    + base[i].card () + base.tie_card (i);
-
-	  
-	  if (i == 0)
-	    card += base.card ();
-	  if (i == base.size () - 1)
-	    card += to_string ("TOTAL=%.2f", base.score ());
-	  
-	  ties[i]->set_property ("quant-score",
-				 ly_string2scm (card));
-	}
-#endif
-      
+      problem.set_debug_scoring (base);
     }
   return SCM_BOOL_T;
 }
@@ -131,7 +111,7 @@ Tie_column::calc_positioning_done (SCM smob)
 
 
 ADD_INTERFACE (Tie_column,
-	       "Object that sets directions of multiple ties in a tied chord",
+	       "Object that sets directions of multiple ties in a tied chord.",
 
 	       /* properties */
 	       "positioning-done "