X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-column.cc;h=5f111a8581274bc026c21059f09da714f836a214;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=3c4ddae5045c33c20cf15e564929a81fbb90ca09;hpb=3484ff062a7402ddeb4b73fcc155afddcf6fea3f;p=lilypond.git

diff --git a/lily/tie-column.cc b/lily/tie-column.cc
index 3c4ddae504..5f111a8581 100644
--- a/lily/tie-column.cc
+++ b/lily/tie-column.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2000--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2000--2015 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
@@ -29,29 +29,28 @@
 #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)
+Tie_column::add_tie (Grob *tc, Spanner *tie)
 {
   Spanner *me = dynamic_cast<Spanner *> (tc);
-  
+
   if (tie->get_parent (Y_AXIS)
-      && Tie_column::has_interface (tie->get_parent (Y_AXIS)))
+      && has_interface<Tie_column> (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 ())))
+          > 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));
+      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,20 +62,18 @@ 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 = unsmob<Spanner> (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 = unsmob<Spanner> (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;
 }
 
@@ -84,15 +81,13 @@ MAKE_SCHEME_CALLBACK (Tie_column, calc_positioning_done, 1)
 SCM
 Tie_column::calc_positioning_done (SCM smob)
 {
-  Grob *me = unsmob_grob (smob);
+  Grob *me = unsmob<Grob> (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;
 
-
   me->set_property ("positioning-done", SCM_BOOL_T);
-
   vector_sort (ties, Tie::less);
 
   Tie_formatting_problem problem;
@@ -101,32 +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_configuration ();
-
   for (vsize i = 0; i < base.size (); i++)
     {
       SCM cp = Tie::get_control_points (ties[i], problem.common_x_refpoint (),
-					base[i],
-					problem.details_);
+                                        base[i],
+                                        problem.details_);
 
       ties[i]->set_property ("control-points", cp);
       set_grob_direction (ties[i],
-			  base[i].dir_);
+                          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 "
+              );