X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-column.cc;h=ad89411d5d89c1ea23cd3519a8f21befb0c7d277;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=85529ef1d559585edac3d6e7bf4e5723f18fef6b;hpb=2c8c61b3a5cddbb155786a1ca027528701c91ac9;p=lilypond.git

diff --git a/lily/tie-column.cc b/lily/tie-column.cc
index 85529ef1d5..ad89411d5d 100644
--- a/lily/tie-column.cc
+++ b/lily/tie-column.cc
@@ -1,9 +1,20 @@
 /*
-  tie-column.cc -- implement Tie_column
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2000--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "tie-column.hh"
@@ -18,23 +29,26 @@
 #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 *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);
@@ -48,41 +62,32 @@ MAKE_SCHEME_CALLBACK (Tie_column, before_line_breaking, 1);
 SCM
 Tie_column::before_line_breaking (SCM smob)
 {
-  Spanner *me = dynamic_cast<Spanner *> (unsmob_grob (smob));
+  Spanner *me = dynamic_cast<Spanner *> (Grob::unsmob (smob));
   for (SCM s = me->get_property ("ties"); scm_is_pair (s); s = scm_cdr (s))
     {
-      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);
+      Spanner *tie = dynamic_cast<Spanner *> (Grob::unsmob (scm_car (s)));
+      for (LEFT_and_RIGHT (dir))
+        {
+          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));
+        }
     }
-  
+
   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);
+  Grob *me = Grob::unsmob (smob);
   extract_grob_set (me, "ties", ro_ties);
-  vector<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;
-    }
-  
+  me->set_property ("positioning-done", SCM_BOOL_T);
   vector_sort (ties, Tie::less);
 
   Tie_formatting_problem problem;
@@ -91,46 +96,29 @@ Tie_column::calc_positioning_done (SCM smob)
   SCM manual_configs = me->get_property ("tie-configuration");
   problem.set_manual_tie_configuration (manual_configs);
 
-
-  Ties_configuration base = problem.generate_optimal_chord_configuration ();
-
-  for (vsize i = 0; i < base.size(); i++)
+  Ties_configuration base = problem.generate_optimal_configuration ();
+  for (vsize i = 0; i < base.size (); i++)
     {
-      Tie::set_control_points (ties[i], problem.common_x_refpoint (),
-			       base[i],
-			       problem.details_);
+      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_);
-
-#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
-      
+                          base[i].dir_);
+
+      problem.set_debug_scoring (base);
     }
   return SCM_BOOL_T;
 }
 
-
-
 ADD_INTERFACE (Tie_column,
-	       "Object that sets directions of multiple ties in a tied chord",
-
-	       /* properties */
-	       "positioning-done "
-	       "tie-configuration "
-	       );
+               "Object that sets directions of multiple ties in a tied"
+               " chord.",
+
+               /* properties */
+               "positioning-done "
+               "tie-configuration "
+               "ties "
+              );