2003 -> 2004

[lilypond.git] / lily / tie.cc

diff --git a/lily/tie.cc b/lily/tie.cc
index bd569c4f87b68cb5880fed8c0fbc56af57f1e5e8..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>
 
@@ -58,9 +58,11 @@ Grob*
 Tie::head (Grob*me, Direction d) 
 {
   SCM c = me->get_grob_property ("head-pair");
-  c = index_get_cell (c, d);
 
-  return unsmob_grob (c);
+  if (gh_pair_p)
+    return unsmob_grob (index_get_cell (c, d));
+  else
+    return 0;
 }
 
 Real
@@ -134,7 +136,7 @@ Tie::get_control_points (SCM smob)
     {
       programming_error ("Tie without heads.");
       me->suicide ();
-      return SCM_UNSPECIFIED;
+      return SCM_EOL;
     }
 
   set_direction (me);
@@ -324,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;