2003 -> 2004

[lilypond.git] / lily / tie.cc

diff --git a/lily/tie.cc b/lily/tie.cc
index f314d8bc1727f544a6e899024ac5404c61fef6ad..debdfc8e2d0b906c7a4092d5710cd376df9fb510 100644 (file)
--- a/lily/tie.cc
+++ b/lily/tie.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include <math.h>
 
@@ -22,6 +22,7 @@
 #include "bezier-bow.hh"
 #include "stem.hh"
 #include "note-head.hh"
+#include "tie-column.hh"
 
 /*
   tie: Connect two noteheads.
@@ -40,7 +41,7 @@ void
 Tie::set_head (Grob*me,Direction d, Grob * h)
 {
   assert (!head (me,d));
-  index_set_cell (me->get_grob_property ("heads"), d, h->self_scm ());
+  index_set_cell (me->get_grob_property ("head-pair"), d, h->self_scm ());
   
   dynamic_cast<Spanner*> (me)->set_bound (d, h);
   me->add_dependency (h);
@@ -49,17 +50,19 @@ Tie::set_head (Grob*me,Direction d, Grob * h)
 void
 Tie::set_interface (Grob*me)
 {
-  me->set_grob_property ("heads", gh_cons (SCM_EOL, SCM_EOL));
+  me->set_grob_property ("head-pair", gh_cons (SCM_EOL, SCM_EOL));
 }
 
 
 Grob*
 Tie::head (Grob*me, Direction d) 
 {
-  SCM c = me->get_grob_property ("heads");
-  c = index_get_cell (c, d);
+  SCM c = me->get_grob_property ("head-pair");
 
-  return unsmob_grob (c);
+  if (gh_pair_p)
+    return unsmob_grob (index_get_cell (c, d));
+  else
+    return 0;
 }
 
 Real
@@ -77,29 +80,44 @@ Tie::get_position (Grob*me)
   
   The direction of the Tie is more complicated (See [Ross] p136 and
   further).
+
+  (what about linebreaks? )  
+  
 */
 Direction
 Tie::get_default_dir (Grob*me) 
 {
   Item * sl =  head (me,LEFT) ? Rhythmic_head::get_stem (head (me,LEFT)) :0;
   Item * sr =  head (me,RIGHT) ? Rhythmic_head::get_stem (head (me,RIGHT)) :0;  
-
   if (sl && sr)
     {
-      if (Directional_element_interface::get (sl) == UP
-         && Directional_element_interface::get (sr) == UP)
+      if (get_grob_direction (sl) == UP
+         && get_grob_direction (sr) == UP)
        return DOWN;
     }
   else if (sl || sr)
     {
       Item *s = sl ? sl : sr;
-      return - Directional_element_interface::get (s);
+      return - get_grob_direction (s);
     }
 
   
   return UP;
 }
 
+
+void
+Tie::set_direction (Grob*me)
+{
+  if (!get_grob_direction (me))
+    {
+      if (Tie_column::has_interface (me->get_parent (Y_AXIS)))
+       Tie_column::set_directions (me->get_parent (Y_AXIS));
+      else
+       set_grob_direction (me, Tie::get_default_dir (me));
+    }
+}
+
 /*
   TODO: we should also use thickness for computing the clearance
   between head and tie. Very thick ties will now touch the note head.
@@ -118,17 +136,16 @@ Tie::get_control_points (SCM smob)
     {
       programming_error ("Tie without heads.");
       me->suicide ();
-      return SCM_UNSPECIFIED;
+      return SCM_EOL;
     }
 
-  
-  if (!Directional_element_interface::get (me))
-    Directional_element_interface::set (me, Tie::get_default_dir (me));
-  Direction dir = Directional_element_interface::get (me);
+  set_direction (me);
+
+  Direction dir = get_grob_direction (me);
   
   Real staff_space = Staff_symbol_referencer::staff_space (me);
 
-  Real x_gap_f = gh_scm2double (me->get_grob_property ("x-gap"));
+  Real x_gap_f = robust_scm2double (me->get_grob_property ("x-gap"), 0);
 
   Grob* l = me->get_bound (LEFT);
   Grob* r = me->get_bound (RIGHT);  
@@ -309,15 +326,18 @@ Tie::brew_molecule (SCM smob)
   Grob*me = unsmob_grob (smob);
 
   SCM cp = me->get_grob_property ("control-points");
-  if (cp == SCM_EOL)
+  if (!gh_pair_p (cp))         // list is more accurate
     {
       cp = get_control_points (smob);
       me->set_grob_property ("control-points", cp);
     }
+
+  if (!gh_pair_p (cp))
+    return Molecule ().smobbed_copy ();
   
-  Real thick =
-    gh_scm2double (me->get_grob_property ("thickness"))
-    * me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));
+  Real thick
+    = Staff_symbol_referencer::line_thickness (me)
+    *  robust_scm2double (me->get_grob_property ("thickness"), 1);
 
   Bezier b;
   int i = 0;
@@ -327,7 +347,7 @@ Tie::brew_molecule (SCM smob)
       i++;
     }
   
-   Molecule a = Lookup::slur (b, Directional_element_interface::get (me) * thick, thick);
+   Molecule a = Lookup::slur (b, get_grob_direction (me) * thick, thick);
    
    return a.smobbed_copy ();
 }
@@ -337,4 +357,4 @@ Tie::brew_molecule (SCM smob)
 ADD_INTERFACE (Tie,"tie-interface",
   "A tie connecting two noteheads.\n"
 "direction = Forced direction for all ties",
-  "y-offset staffline-clearance control-points heads details thickness x-gap direction minimum-length");
+  "y-offset staffline-clearance control-points head-pair details thickness x-gap direction minimum-length");