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 df6b7f18c8c893d283cdcb51632841da3fd995f9..e8384f18554e820e28462d678093ed8396c2a54a 100644 (file)
--- a/lily/tie-column.cc
+++ b/lily/tie-column.cc
@@ -3,14 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "tie-column.hh"
 
-#include <math.h>
-#include <map>
+#include <cmath>
 
+#include "output-def.hh"
 #include "skyline.hh"
 #include "warn.hh"
 #include "paper-column.hh"
@@ -19,6 +19,10 @@
 #include "tie.hh"
 #include "directional-element-interface.hh"
 #include "tie-column-format.hh"
+#include "tie-formatting-problem.hh"
+#include "tie-configuration.hh"
+
+using namespace std;
 
 void
 Tie_column::add_tie (Grob *me, Grob *tie)
@@ -35,27 +39,6 @@ Tie_column::add_tie (Grob *me, Grob *tie)
 
   tie->set_parent (me, Y_AXIS);
   Pointer_group_interface::add_grob (me, ly_symbol2scm ("ties"), tie);
-  tie->add_dependency (me);
-}
-
-void
-Tie_column::set_directions (Grob *me)
-{
-  if (!to_boolean (me->get_property ("positioning-done")))
-    {
-      me->set_property ("positioning-done", SCM_BOOL_T); 
-      new_directions (me);
-    }
-}
-
-
-
-MAKE_SCHEME_CALLBACK (Tie_column, after_line_breaking, 1);
-SCM
-Tie_column::after_line_breaking (SCM smob)
-{
-  set_directions (unsmob_grob (smob));
-  return SCM_UNSPECIFIED;
 }
 
 /*
@@ -78,103 +61,67 @@ Tie_column::before_line_breaking (SCM smob)
        }
       while (flip (&dir) != LEFT);
     }
+  
   return SCM_UNSPECIFIED;
 }
 
-
-void
-Tie_column::new_directions (Grob *me)
+MAKE_SCHEME_CALLBACK(Tie_column, calc_positioning_done, 1)
+SCM
+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;
+    return SCM_BOOL_T;
 
   if (ties.size() == 1)
     {
-      Tie::set_default_control_points (ties[0]);
-      return ;
+      /*
+       Already handled by standard mechanisms.
+       */
+      return SCM_BOOL_T;
     }
   
-  ties.sort (&Tie::compare);
+  vector_sort (ties, &Tie::compare);
 
-  Array<Tie_configuration> tie_configs;
-  for (int i = 0; i < ties.size (); i++)
-    {
-      Tie_configuration conf;
-      conf.dir_ = get_grob_direction (ties[i]);
-      conf.position_ = Tie::get_position (ties[i]);
-      tie_configs.push (conf);
-    }
+  Tie_formatting_problem problem;
+  problem.from_ties (ties);
 
   SCM manual_configs = me->get_property ("tie-configuration");
-  bool manual_override = false;
-  set_manual_tie_configuration (&tie_configs,
-                               &manual_override,
-                               manual_configs);
-  set_tie_config_directions (&tie_configs);
-
-  Grob *common = me;
-  for (int i = 0; i < ties.size (); i++)
-    {
-      common = dynamic_cast<Spanner*> (ties[i])->get_bound (LEFT)->common_refpoint (common, X_AXIS); 
-      common = dynamic_cast<Spanner*> (ties[i])->get_bound (RIGHT)->common_refpoint (common, X_AXIS); 
-    }
-
-  Drul_array< Array<Skyline_entry> > skylines;
-  set_chord_outlines (&skylines, ties, common);
-  
-  Tie_details details;
-  details.init (ties[0]);
-
-  /*
-    Let the ties flow out, according to our single-tie formatting.
-   */
-  if (!manual_override)
-    {
-      Tie::get_configuration (ties[0], common, &tie_configs.elem_ref (0),
-                             &skylines,
-                             details
-                             );
-      Tie::get_configuration (ties.top (), common,
-                             &tie_configs.elem_ref (tie_configs.size()-1),
-                             &skylines,
-                             details
-                             );
-    }
-
-  /*
-    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;
+  problem.set_manual_tie_configuration (manual_configs);
 
 
-      final_shape_adjustment (tie_configs[i],
-                             skylines,
-                             ties[0],
-                             details);
-    }
+  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 (&tie_configs, ties[0], details);
-    }
-  
-  for (int i = 0; i < ties.size(); i++)
-    {
-      Tie::set_control_points (ties[i], common, tie_configs[i],
-                              details
-                              );
-      set_grob_direction (ties[i], tie_configs[i].dir_);
+      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;
 }