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 31b51592dc2d91093ff6de004f3ffacc89457c66..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"
@@ -19,6 +20,7 @@
 #include "directional-element-interface.hh"
 #include "tie-column-format.hh"
 #include "tie-formatting-problem.hh"
+#include "tie-configuration.hh"
 
 using namespace std;
 
@@ -69,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;
 
@@ -81,69 +83,43 @@ Tie_column::calc_positioning_done (SCM smob)
       return SCM_BOOL_T;
     }
   
-  ties.sort (&Tie::compare);
-
-  Ties_configuration ties_config;
-  for (int i = 0; i < ties.size (); i++)
-    {
-      Tie_configuration conf;
-      if (scm_is_number (ties[i]->get_property_data (ly_symbol2scm ("direction"))))
-       conf.dir_ = get_grob_direction (ties[i]);
-      conf.position_ = Tie::get_position (ties[i]);
-      ties_config.ties_.push (conf);
-    }
-
-  SCM manual_configs = me->get_property ("tie-configuration");
-  bool manual_override = false;
-  set_manual_tie_configuration (&ties_config,
-                               &manual_override,
-                               manual_configs);
-  set_tie_config_directions (&ties_config);
+  vector_sort (ties, &Tie::compare);
 
   Tie_formatting_problem problem;
   problem.from_ties (ties);
-  
-  /*
-    Let the ties flow out, according to our single-tie formatting.
-   */
-  if (!manual_override)
-    {
-      Tie::get_configuration (ties[0], &ties_config.ties_.elem_ref (0),
-                             problem);
-      Tie::get_configuration (ties.top (), 
-                             &ties_config.ties_.elem_ref (ties_config.ties_.size()-1),
-                             problem);
-    }
 
-  /*
-    Calculate final width and shape of the ties.
-   */
-  for (int i = 0; i < ties.size(); i++)
-    {
-      if (!manual_override
-         && (i == 0 || i == ties.size () -1))
-       continue;
+  SCM manual_configs = me->get_property ("tie-configuration");
+  problem.set_manual_tie_configuration (manual_configs);
 
 
-      final_shape_adjustment (ties_config.ties_[i],
-                             problem,
-                             ties[0]);
-    }
+  Ties_configuration base = problem.generate_optimal_chord_configuration ();
 
-  
-  /*
-    Try to shift small ties into available spaces.
-   */
-  if (!manual_override)
+  for (vsize i = 0; i < base.size(); i++)
     {
-      shift_small_ties (&ties_config, ties[0], problem.details_);
-    }
-  
-  for (int i = 0; i < ties.size(); i++)
-    {
-      Tie::set_control_points (ties[i], problem.common_x_refpoint (), ties_config.ties_[i],
+      Tie::set_control_points (ties[i], problem.common_x_refpoint (),
+                              base[i],
                               problem.details_);
-      set_grob_direction (ties[i], ties_config.ties_[i].dir_);
+      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;
 }