X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie.cc;h=92daec75b10d6f4cdb7e2208d8576b08fb3b9cb1;hb=829caefcc215ddffe25806d0ff87bcc577c3286e;hp=846acaa28fe1f3331d9b20766d3a77c7f488f803;hpb=d9e57e198888ce00fbf9acd84c351356de94552f;p=lilypond.git

diff --git a/lily/tie.cc b/lily/tie.cc
index 846acaa28f..92daec75b1 100644
--- 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>
 
@@ -18,10 +18,11 @@
 #include "warn.hh"
 #include "staff-symbol-referencer.hh"
 #include "directional-element-interface.hh"
-#include "molecule.hh"
+#include "stencil.hh"
 #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 ("head-pair"), d, h->self_scm ());
+  index_set_cell (me->get_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 ("head-pair", gh_cons (SCM_EOL, SCM_EOL));
+  me->set_property ("head-pair", gh_cons (SCM_EOL, SCM_EOL));
 }
 
 
 Grob*
 Tie::head (Grob*me, Direction d) 
 {
-  SCM c = me->get_grob_property ("head-pair");
-  c = index_get_cell (c, d);
+  SCM c = me->get_property ("head-pair");
 
-  return unsmob_grob (c);
+  if (gh_pair_p (c))
+    return unsmob_grob (index_get_cell (c, d));
+  else
+    return 0;
 }
 
 Real
@@ -102,6 +105,19 @@ Tie::get_default_dir (Grob*me)
   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.
@@ -120,17 +136,16 @@ Tie::get_control_points (SCM smob)
     {
       programming_error ("Tie without heads.");
       me->suicide ();
-      return SCM_UNSPECIFIED;
+      return SCM_EOL;
     }
 
-  
-  if (!get_grob_direction (me))
-    set_grob_direction (me, Tie::get_default_dir (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_property ("x-gap"), 0);
 
   Grob* l = me->get_bound (LEFT);
   Grob* r = me->get_bound (RIGHT);  
@@ -186,7 +201,7 @@ Tie::get_control_points (SCM smob)
   
 
 
-  SCM details = me->get_grob_property ("details");
+  SCM details = me->get_property ("details");
 
   SCM lim // groetjes aan de chirurgendochter.
     = scm_assq (ly_symbol2scm ("height-limit"),details);
@@ -205,7 +220,7 @@ Tie::get_control_points (SCM smob)
   */
 
   Real ypos = Tie::get_position (me) * staff_space/2
-    + dir * gh_scm2double (me->get_grob_property ("y-offset"));;
+    + dir * gh_scm2double (me->get_property ("y-offset"));;
 
   /*
     Make sure we don't start on a dots
@@ -213,7 +228,7 @@ Tie::get_control_points (SCM smob)
   if (Note_head::has_interface (l) && Rhythmic_head::get_dots (l))
     {
       Grob* dots = Rhythmic_head::get_dots (l);
-      if(fabs (staff_space * Staff_symbol_referencer::get_position (dots) /2
+      if (fabs (staff_space * Staff_symbol_referencer::get_position (dots) /2
 	       - ypos) < 0.5)
 	{
 	  ypos += 0.5 * dir ;
@@ -253,7 +268,7 @@ Tie::get_control_points (SCM smob)
       Real diff = ry - y;
       Real newy = y;
 
-      Real clear = staff_space * gh_scm2double (me->get_grob_property ("staffline-clearance"));
+      Real clear = staff_space * gh_scm2double (me->get_property ("staffline-clearance"));
 
       if (fabs (y) <=
 	  Staff_symbol_referencer::staff_radius (me) * staff_space + clear
@@ -304,22 +319,25 @@ Tie::get_control_points (SCM smob)
 }
 
 
-MAKE_SCHEME_CALLBACK (Tie,brew_molecule,1);
+MAKE_SCHEME_CALLBACK (Tie,print,1);
 SCM
-Tie::brew_molecule (SCM smob) 
+Tie::print (SCM smob) 
 {
   Grob*me = unsmob_grob (smob);
 
-  SCM cp = me->get_grob_property ("control-points");
-  if (cp == SCM_EOL)
+  SCM cp = me->get_property ("control-points");
+  if (!gh_pair_p (cp))		// list is more accurate
     {
       cp = get_control_points (smob);
-      me->set_grob_property ("control-points", cp);
+      me->set_property ("control-points", cp);
     }
+
+  if (!gh_pair_p (cp))
+    return Stencil ().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_property ("thickness"), 1);
 
   Bezier b;
   int i = 0;
@@ -329,7 +347,7 @@ Tie::brew_molecule (SCM smob)
       i++;
     }
   
-   Molecule a = Lookup::slur (b, get_grob_direction (me) * thick, thick);
+   Stencil a = Lookup::slur (b, get_grob_direction (me) * thick, thick);
    
    return a.smobbed_copy ();
 }
@@ -337,6 +355,6 @@ Tie::brew_molecule (SCM smob)
 
 
 ADD_INTERFACE (Tie,"tie-interface",
-  "A tie connecting two noteheads.\n"
-"direction = Forced direction for all ties",
+	       "A tie connecting two noteheads.\n"
+	       ,
   "y-offset staffline-clearance control-points head-pair details thickness x-gap direction minimum-length");