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

diff --git a/lily/tie-column.cc b/lily/tie-column.cc
index e364bf7f03..2017a5ce44 100644
--- a/lily/tie-column.cc
+++ b/lily/tie-column.cc
@@ -1,119 +1,120 @@
-/*   
-  tie-column.cc --  implement Tie_column
-  
+/*
+  tie-column.cc -- implement Tie_column
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
 
-#include "spanner.hh"
+  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
 #include "tie-column.hh"
-#include "group-interface.hh"
-#include "tie.hh"
-#include "directional-element-interface.hh"
-#include "rhythmic-head.hh"
 
+#include <cmath>
 
+#include "output-def.hh"
+#include "skyline.hh"
+#include "warn.hh"
+#include "paper-column.hh"
+#include "spanner.hh"
+#include "pointer-group-interface.hh"
+#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 *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 (!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 ())))
+    {
+	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);
+}
 
 /*
-  tie dir depends on what Tie_column does.
+  Extend the spanner over its Tie constituents.
 */
-
-void
-Tie_column::add_tie (Grob*me,Grob *s)
+MAKE_SCHEME_CALLBACK (Tie_column, before_line_breaking, 1);
+SCM
+Tie_column::before_line_breaking (SCM smob)
 {
-  if (!  Pointer_group_interface ::count (me, "ties"))
+  Spanner *me = dynamic_cast<Spanner *> (unsmob_grob (smob));
+  for (SCM s = me->get_property ("ties"); scm_is_pair (s); s = scm_cdr (s))
     {
-      dynamic_cast<Spanner*> (me)->set_bound (LEFT, Tie::head (s,LEFT));
-      dynamic_cast<Spanner*> (me)->set_bound (RIGHT, Tie::head (s,RIGHT));
+      Spanner *tie = dynamic_cast<Spanner *> (unsmob_grob (scm_car (s)));
+      Direction dir = LEFT;
+      do
+	{
+	  if (dir * tie->get_bound (dir)->get_column ()->get_rank ()
+	      > dir * me->get_bound (dir)->get_column ()->get_rank ())
+	    me->set_bound (dir, Tie::head (tie, dir));
+	}
+      while (flip (&dir) != LEFT);
     }
   
-  Pointer_group_interface::add_grob (me, ly_symbol2scm ("ties"), s);
-  s->add_dependency (me);
+  return SCM_UNSPECIFIED;
 }
 
-
-int
-tie_compare (Grob* const & s1,
-	     Grob* const & s2)
+MAKE_SCHEME_CALLBACK (Tie_column, calc_positioning_done, 1)
+SCM
+Tie_column::calc_positioning_done (SCM smob)
 {
-  return sign (Tie::position_f (s1) - Tie::position_f (s2));
-}
+  Grob *me = unsmob_grob (smob);
+  extract_grob_set (me, "ties", ro_ties);
+  vector<Grob*> ties (ro_ties);
+  if (!ties.size ())
+    return SCM_BOOL_T;
 
-/*
-  See [Ross p. 138].
 
+  me->set_property ("positioning-done", SCM_BOOL_T);
 
-  In normal chord cases, the outer ties point outwards, and the
-  direction of the rest is determined by their staff position.
+  vector_sort (ties, Tie::less);
 
-  Ross forgets about the tie that is *on* the middle staff line. We
-  assume it goes UP. (TODO: make me settable) */
-void
-Tie_column::set_directions (Grob*me)
-{
-  Link_array<Grob> ties =
-    Pointer_group_interface__extract_grobs (me, (Grob*)0, "ties");
+  Tie_formatting_problem problem;
+  problem.from_ties (ties);
 
-  for (int i = ties.size (); i--;)
-    if (Directional_element_interface::get (ties[i]))
-      ties.del (i);
-  
+  SCM manual_configs = me->get_property ("tie-configuration");
+  problem.set_manual_tie_configuration (manual_configs);
 
-  if (!ties.size ())
-    return ;
-  
 
-  Direction d = Directional_element_interface::get (me);
-  if (d)
-    {
-      for (int i = ties.size (); i--;)
-	{
-	  Grob *  t = ties[i];
-	  Directional_element_interface::set (t, d);
-	}
-      return;
-    }
-  
-  if (ties.size () == 1)
-    {
-      Grob *  t = ties[0];      
-      Directional_element_interface::set (t,Tie::get_default_dir (t));
-      return;
-    }
-  
-  ties.sort (tie_compare);
-  Directional_element_interface::set (ties[0], DOWN);
-  ties.del (0);
-  
-  Directional_element_interface ::set (ties.pop (), UP);
-  for (int i=ties.size (); i--;)
+  Ties_configuration base = problem.generate_optimal_configuration ();
+
+  for (vsize i = 0; i < base.size (); i++)
     {
-      Grob *  t = ties[i];
-      Real p = Tie::position_f (t);
-      Direction d = (Direction) sign (p);
-      if (!d)
-	d = UP;
-      Directional_element_interface::set (t, d);
+      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;
 }
 
-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;
-}
 
 
+ADD_INTERFACE (Tie_column,
+	       "Object that sets directions of multiple ties in a tied chord.",
 
-ADD_INTERFACE (Tie_column,"tie-column-interface",
-  "that sets tie directions in a tied chord",
-  "direction");
+	       /* properties */
+	       "positioning-done "
+	       "tie-configuration "
+	       );