X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-column.cc;h=2017a5ce44ce7b72a74dc63f754c07367cc30cf8;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=31b51592dc2d91093ff6de004f3ffacc89457c66;hpb=24894f0870559b225b3afae8663db9fea4dfb98e;p=lilypond.git

diff --git a/lily/tie-column.cc b/lily/tie-column.cc
index 31b51592dc..2017a5ce44 100644
--- 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--2008 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,22 +20,27 @@
 #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)
+Tie_column::add_tie (Grob *tc, Grob *tie)
 {
+  Spanner *me = dynamic_cast<Spanner *> (tc);
+  
   if (tie->get_parent (Y_AXIS)
       && Tie_column::has_interface (tie->get_parent (Y_AXIS)))
     return;
 
-  if (!Pointer_group_interface::count (me, ly_symbol2scm ("ties")))
+  if (!me->get_bound (LEFT)
+      || (Paper_column::get_rank (me->get_bound (LEFT)->get_column ())
+	  > Paper_column::get_rank (dynamic_cast<Spanner*> (tie)->get_bound (LEFT)->get_column ())))
     {
-      dynamic_cast<Spanner *> (me)->set_bound (LEFT, Tie::head (tie, LEFT));
-      dynamic_cast<Spanner *> (me)->set_bound (RIGHT, Tie::head (tie, RIGHT));
+	me->set_bound (LEFT, Tie::head (tie, LEFT));
+	me->set_bound (RIGHT, Tie::head (tie, RIGHT));
     }
-
+      
   tie->set_parent (me, Y_AXIS);
   Pointer_group_interface::add_grob (me, ly_symbol2scm ("ties"), tie);
 }
@@ -63,95 +69,49 @@ Tie_column::before_line_breaking (SCM smob)
   return SCM_UNSPECIFIED;
 }
 
-MAKE_SCHEME_CALLBACK(Tie_column, calc_positioning_done, 1)
+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 SCM_BOOL_T;
 
-  if (ties.size() == 1)
-    {
-      /*
-	Already handled by standard mechanisms.
-       */
-      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);
-    }
+  me->set_property ("positioning-done", SCM_BOOL_T);
 
-  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::less);
 
   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_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],
-			       problem.details_);
-      set_grob_direction (ties[i], ties_config.ties_[i].dir_);
+      SCM cp = Tie::get_control_points (ties[i], problem.common_x_refpoint (),
+					base[i],
+					problem.details_);
+
+      ties[i]->set_property ("control-points", cp);
+      set_grob_direction (ties[i],
+			  base[i].dir_);
+
+      problem.set_debug_scoring (base);
     }
   return SCM_BOOL_T;
 }
 
 
 
-ADD_INTERFACE (Tie_column, "tie-column-interface",
-	       "Object that sets directions of multiple ties in a tied chord",
+ADD_INTERFACE (Tie_column,
+	       "Object that sets directions of multiple ties in a tied chord.",
 
 	       /* properties */
 	       "positioning-done "