Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / tie.cc

diff --git a/lily/tie.cc b/lily/tie.cc
index 264bc9172a2b6f60d018c92863195787520e4581..1d4e7fca9ac296659d01bfdfd2deaeae3e9f7df6 100644 (file)
--- a/lily/tie.cc
+++ b/lily/tie.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "tie.hh"
@@ -148,20 +148,21 @@ Tie::calc_direction (SCM smob)
   if ((Tie_column::has_interface (yparent)
        || Semi_tie_column::has_interface (yparent)) 
       && unsmob_grob_array (yparent->get_object ("ties"))
-      && unsmob_grob_array (yparent->get_object ("ties"))->size () > 1)
+      //      && unsmob_grob_array (yparent->get_object ("ties"))->size () > 1
+      )
     {
       /* trigger positioning. */
       (void) yparent->get_property ("positioning-done");
+
+      return me->get_property_data ("direction");
     }
   else
-    set_grob_direction (me, Tie::get_default_dir (me));
-
-  return SCM_UNSPECIFIED;
+    return scm_from_int (Tie::get_default_dir (me));
 }
 
 
-void
-Tie::set_default_control_points (Grob *me_grob)
+SCM
+Tie::get_default_control_points (Grob *me_grob)
 {
   Spanner *me = dynamic_cast<Spanner*> (me_grob);
   Grob *common  = me;
@@ -170,21 +171,21 @@ Tie::set_default_control_points (Grob *me_grob)
   
   Tie_formatting_problem problem;
   problem.from_tie (me);
+  
   Tie_specification spec = problem.get_tie_specification (0);
-  spec.has_manual_dir_ = true;
-  spec.manual_dir_ = get_grob_direction (me);
+  if (!me->is_live ())
+    return SCM_EOL;
 
-  if (me->is_live ())
-    {
-      Tie_configuration conf
-       = problem.find_optimal_tie_configuration (spec);
   
-      set_control_points (me, problem.common_x_refpoint (),
-                         conf, problem.details_);
-    }
+  Ties_configuration conf
+    = problem.generate_optimal_configuration ();
+  
+  return get_control_points (me, problem.common_x_refpoint (),
+                            conf[0], problem.details_);
 }
-void
-Tie::set_control_points (Grob *me,
+
+SCM
+Tie::get_control_points (Grob *me,
                         Grob *common,
                         Tie_configuration const &conf,
                         Tie_details const &details
@@ -200,37 +201,38 @@ Tie::set_control_points (Grob *me,
        programming_error ("Insane offset");
       controls = scm_cons (ly_offset2scm (b.control_[i]), controls);
     }
-  me->set_property ("control-points", controls);
+  return controls;
 }
 
+
 MAKE_SCHEME_CALLBACK(Tie, calc_control_points, 1);
 SCM
 Tie::calc_control_points (SCM smob)
 {
   Grob *me = unsmob_grob (smob);
 
-  // trigger Tie-column
-  (void)  get_grob_direction (me);
-
   Grob *yparent = me->get_parent (Y_AXIS);
-  if (Tie_column::has_interface (yparent)
+  if ((Tie_column::has_interface (yparent)
+       || Semi_tie_column::has_interface (yparent)) 
       && unsmob_grob_array (yparent->get_object ("ties"))
-      && unsmob_grob_array (yparent->get_object ("ties"))->size () > 1)
+      //      && unsmob_grob_array (yparent->get_object ("ties"))->size () > 1
+      )
     {
       /* trigger positioning. */
       (void) yparent->get_property ("positioning-done");
     }
 
-  if (!scm_is_pair (me->get_property_data ("control-points")))
+  SCM cp = me->get_property_data ("control-points");
+  if (!scm_is_pair (cp))
     {
-      set_default_control_points (me);
+      cp = get_default_control_points (me);
     }
 
-  return SCM_UNSPECIFIED;
+  return cp;
 }
 
 /*
-  TODO: merge witnh Slur::print.
+  TODO: merge with Slur::print.
  */
 MAKE_SCHEME_CALLBACK (Tie, print, 1);
 SCM
@@ -279,8 +281,15 @@ Tie::print (SCM smob)
       Stencil tm = *unsmob_stencil (Text_interface::interpret_markup
                                    (me->layout ()->self_scm (), properties,
                                     quant_score));
-      tm.translate_axis (b.control_[0][Y_AXIS]*2, Y_AXIS);
-      a.add_at_edge (X_AXIS, RIGHT, tm, 1.0, 0);
+      tm.translate (Offset (b.control_[3][X_AXIS] + 0.5,
+                           b.control_[0][Y_AXIS] * 2));
+      tm = tm.in_color (1, 0, 0);
+
+      /*
+       It would be nice if we could put this in a different layer,
+       but alas, this must be done with a Tie override.
+       */
+      a.add_stencil (tm);
     }
 #endif
 
@@ -288,8 +297,6 @@ Tie::print (SCM smob)
 }
 
 ADD_INTERFACE (Tie,
-              "tie-interface",
-              
               "A horizontal curve connecting two noteheads. \n\n"
               ,
               
@@ -301,12 +308,16 @@ ADD_INTERFACE (Tie,
               "dash-period "
               "details "
               "direction "
+              "separation-item "
+              "head-direction "
               "line-thickness " 
               "quant-score "
               "staff-position "
               "thickness "
+
               );
 
 
 
 
+