Fix #138 & #139

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

diff --git a/lily/tie-column.cc b/lily/tie-column.cc
index 1f6738ef6d7cf4fc5512738bd2929d4111d3913c..9eefbbf8ee10252c5b3360152280c9e759703392 100644 (file)
--- a/lily/tie-column.cc
+++ b/lily/tie-column.cc
@@ -79,14 +79,6 @@ 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;
-    }
-  
   vector_sort (ties, Tie::less);
 
   Tie_formatting_problem problem;
@@ -96,7 +88,7 @@ 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++)
     {
@@ -108,24 +100,7 @@ Tie_column::calc_positioning_done (SCM smob)
       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;
 }