X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsemi-tie-column.cc;h=202195d830634fbb41f99dcd0f1cd041ab91802a;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=7a02ac578b6b3ba14e57fd6c203f5f1378cd9b09;hpb=9e69cb84d6ee5b0a861cd97869b10e3bdf0c833c;p=lilypond.git

diff --git a/lily/semi-tie-column.cc b/lily/semi-tie-column.cc
index 7a02ac578b..202195d830 100644
--- a/lily/semi-tie-column.cc
+++ b/lily/semi-tie-column.cc
@@ -1,10 +1,21 @@
 /*
-  semi-tie-column.cc -- implement Semi_tie_column
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005--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 "semi-tie-column.hh"
@@ -17,53 +28,74 @@
 #include "staff-symbol-referencer.hh"
 #include "item.hh"
 #include "tie-formatting-problem.hh"
-#include "tie-column-format.hh"
-
-
-ADD_INTERFACE(Semi_tie_column,
-	      "The interface for a column of l.v. ties.",
 
-	      /* properties */
-	      "positioning-done "
-	      "head-direction "
-	      "tie-configuration "
-	      );
-			   
+ADD_INTERFACE (Semi_tie_column,
+               "The interface for a column of l.v. (laissez vibrer) ties.",
 
+               /* properties */
+               "positioning-done "
+               "head-direction "
+               "tie-configuration "
+               "ties "
+              );
 
 /*
   Cut & paste from tie-column.cc
- */   
-MAKE_SCHEME_CALLBACK(Semi_tie_column, calc_positioning_done, 1);
+ */
+MAKE_SCHEME_CALLBACK (Semi_tie_column, calc_positioning_done, 1);
 SCM
 Semi_tie_column::calc_positioning_done (SCM smob)
 {
-  Grob *me = unsmob_grob (smob);
-  
+  Grob *me = unsmob<Grob> (smob);
+
+  me->set_property ("positioning-done", SCM_BOOL_T);
+
   extract_grob_set (me, "ties", lv_ro_ties);
-  vector<Grob*> lv_ties (lv_ro_ties);
+  vector<Grob *> lv_ties (lv_ro_ties);
 
   vector_sort (lv_ties, Semi_tie::less);
 
   Ties_configuration ties_config;
-  
 
   Tie_formatting_problem problem;
-  
+
   problem.from_semi_ties (lv_ties, to_dir (me->get_property ("head-direction")));
 
   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 < lv_ties.size(); i++)
+  Ties_configuration base = problem.generate_optimal_configuration ();
+  for (vsize i = 0; i < lv_ties.size (); i++)
     {
-      Tie::set_control_points (lv_ties[i], problem.common_x_refpoint (), base[i],
-			       problem.details_);
+      SCM cp = Tie::get_control_points (lv_ties[i], problem.common_x_refpoint (), base[i],
+                                        problem.details_);
+
+      lv_ties[i]->set_property ("control-points", cp);
       set_grob_direction (lv_ties[i], base[i].dir_);
+
+      problem.set_debug_scoring (base);
     }
 
   return SCM_BOOL_T;
 }
-  
 
+MAKE_SCHEME_CALLBACK (Semi_tie_column, calc_head_direction, 1);
+SCM
+Semi_tie_column::calc_head_direction (SCM smob)
+{
+  Grob *me = unsmob<Grob> (smob);
+
+  extract_grob_set (me, "ties", ties);
+  Direction d = LEFT;
+  for (vsize i = 0; i < ties.size (); i++)
+    {
+      Direction this_d = to_dir (ties[i]->get_property ("head-direction"));
+      if (i > 0 && d != this_d)
+        {
+          programming_error ("all semi-ties in a semi-tie-column should have the same head-direction");
+          return scm_from_int (d);
+        }
+      d = this_d;
+    }
+  return scm_from_int (d);
+}