Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/lily/tie-column.cc b/lily/tie-column.cc
index a6633aca6e4c5cf9c58291adad77b2222741c7d4..85529ef1d559585edac3d6e7bf4e5723f18fef6b 100644 (file)
--- a/lily/tie-column.cc
+++ b/lily/tie-column.cc
@@ -10,6 +10,7 @@
 
 #include <cmath>
 
+#include "output-def.hh"
 #include "skyline.hh"
 #include "warn.hh"
 #include "paper-column.hh"
@@ -70,7 +71,7 @@ Tie_column::calc_positioning_done (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
   extract_grob_set (me, "ties", ro_ties);
-  Link_array<Grob> ties (ro_ties);
+  vector<Grob*> ties (ro_ties);
   if (!ties.size ())
     return SCM_BOOL_T;
 
@@ -82,7 +83,7 @@ Tie_column::calc_positioning_done (SCM smob)
       return SCM_BOOL_T;
     }
   
-  ties.sort (&Tie::compare);
+  vector_sort (ties, Tie::less);
 
   Tie_formatting_problem problem;
   problem.from_ties (ties);
@@ -100,13 +101,32 @@ Tie_column::calc_positioning_done (SCM smob)
                               problem.details_);
       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",
+                                scm_makfrom0str (card.c_str ()));
+       }
+#endif
+      
     }
   return SCM_BOOL_T;
 }
 
 
 
-ADD_INTERFACE (Tie_column, "tie-column-interface",
+ADD_INTERFACE (Tie_column,
               "Object that sets directions of multiple ties in a tied chord",
 
               /* properties */