Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/tie-column.cc b/lily/tie-column.cc
index 51bce9bc909fc4f719a5f39a3d54624f147f8ae4..e8384f18554e820e28462d678093ed8396c2a54a 100644 (file)
--- a/lily/tie-column.cc
+++ b/lily/tie-column.cc
@@ -3,13 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "tie-column.hh"
 
 #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::compare);
 
   Tie_formatting_problem problem;
   problem.from_ties (ties);
@@ -93,13 +94,32 @@ Tie_column::calc_positioning_done (SCM smob)
 
   Ties_configuration base = problem.generate_optimal_chord_configuration ();
 
-  for (int 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_);
       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;
 }