X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-column.cc;h=5f111a8581274bc026c21059f09da714f836a214;hb=92aff321d3a7418ca972b12baf130454f6a73d7e;hp=5ef23866d270f7c4712c79d523f593cf51c07a41;hpb=b0064942493df77833e6e41e05d362850f4874b0;p=lilypond.git

diff --git a/lily/tie-column.cc b/lily/tie-column.cc
index 5ef23866d2..5f111a8581 100644
--- a/lily/tie-column.cc
+++ b/lily/tie-column.cc
@@ -1,98 +1,124 @@
-/*   
-  tie-column.cc --  implement Tie_column
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  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
+  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"
-#include "group-interface.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 "note-head.hh"
+#include "tie-formatting-problem.hh"
+#include "tie-configuration.hh"
 
-Tie_column::Tie_column (SCM s)
-  : Spanner (s)
-{
-  set_elt_pointer ("ties", SCM_EOL);
-  set_extent_callback (0, X_AXIS);
-  set_extent_callback (0, Y_AXIS);  
-}
+using namespace std;
 
 void
-Tie_column::add_tie (Tie *s)
+Tie_column::add_tie (Grob *tc, Spanner *tie)
 {
-  Pointer_group_interface g (this, "ties");
-  if (!g.count ())
+  Spanner *me = dynamic_cast<Spanner *> (tc);
+
+  if (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 ())))
     {
-      set_bound (LEFT, s->head (LEFT));
-      set_bound (RIGHT, s->head (RIGHT));
+      me->set_bound (LEFT, Tie::head (tie, LEFT));
+      me->set_bound (RIGHT, Tie::head (tie, RIGHT));
     }
-  
-  Pointer_group_interface (this, "ties").add_element (s);
-  s->add_dependency (this);
-}
 
-
-int
-tie_compare (Tie* const & s1,
-	     Tie* const & s2)
-{
-  return sign (s1->position_f () - s2->position_f());
+  tie->set_parent (me, Y_AXIS);
+  Pointer_group_interface::add_grob (me, ly_symbol2scm ("ties"), tie);
 }
 
 /*
-  See [Ross p. 138].
-
+  Extend the spanner over its Tie constituents.
+*/
+MAKE_SCHEME_CALLBACK (Tie_column, before_line_breaking, 1);
+SCM
+Tie_column::before_line_breaking (SCM smob)
+{
+  Spanner *me = unsmob<Spanner> (smob);
+  for (SCM s = me->get_property ("ties"); scm_is_pair (s); s = scm_cdr (s))
+    {
+      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));
+        }
+    }
 
-  In normal chord cases, the outer ties point outwards, and the
-  direction of the rest is determined by their staff position.
+  return SCM_UNSPECIFIED;
+}
 
-  Ross forgets about the tie that is *on* the middle staff line. We
-  assume it goes UP. (TODO: make this settable) */
-void
-Tie_column::set_directions ()
+MAKE_SCHEME_CALLBACK (Tie_column, calc_positioning_done, 1)
+SCM
+Tie_column::calc_positioning_done (SCM smob)
 {
-  Link_array<Tie> s =
-    Pointer_group_interface__extract_elements (this, (Tie*)0, "ties");
+  Grob *me = unsmob<Grob> (smob);
+  extract_grob_set (me, "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);
 
-  Direction d = directional_element (this).get ();
+  Tie_formatting_problem problem;
+  problem.from_ties (ties);
 
-  if (d)
-    {
-      for (int i = s.size (); i--;)
-	directional_element (s[i]).set (d);
-      return;
-    }
-  
-  if (s.size () == 1)
-    {
-      directional_element (s[0]).set (s[0]->get_default_dir ());
-      return;
-    }
-  
-  s.sort (tie_compare);
-  directional_element (s[0]).set (DOWN);
-  s.del (0);
-  directional_element (s.pop ()).set (UP);
+  SCM manual_configs = me->get_property ("tie-configuration");
+  problem.set_manual_tie_configuration (manual_configs);
 
-  for (int i=s.size(); i--; )
+  Ties_configuration base = problem.generate_optimal_configuration ();
+  for (vsize i = 0; i < base.size (); i++)
     {
-      Real p = s[i]->position_f ();
-      Direction d = (Direction) sign (p);
-      if (!d)
-	d = UP;
+      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_);
 
-      directional_element (s[i]).set (d);
+      problem.set_debug_scoring (base);
     }
-  
+  return SCM_BOOL_T;
 }
 
-void
-Tie_column::after_line_breaking ()
-{
-  set_directions ();
-}
+ADD_INTERFACE (Tie_column,
+               "Object that sets directions of multiple ties in a tied"
+               " chord.",
+
+               /* properties */
+               "positioning-done "
+               "tie-configuration "
+               "ties "
+              );
+