2003 -> 2004

[lilypond.git] / lily / slur.cc

diff --git a/lily/slur.cc b/lily/slur.cc
index 4e4150bc83eb474a370710fce0d76b69250704a4..349f52cc45439027f383e69ad357597bac4dbb28 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
     Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -348,9 +348,7 @@ Slur::get_attachment (Grob *me, Direction dir,
              /*
                Default position is on stem X, at stem end Y
               */
-             Real stem_thickness =
-               robust_scm2double (stem->get_grob_property ("thickness"), 1)
-               * stem->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));
+             Real stem_thickness = Stem::thickness (stem);
              o += Offset (0.5 *
                           x_extent * (1 + Stem::get_direction (stem))
                           - ((dir + 1)/2) * stem_thickness
@@ -531,7 +529,10 @@ Slur::height (SCM smob, SCM ax)
   assert (a == Y_AXIS);
 
   SCM mol = me->get_uncached_molecule ();
-  return ly_interval2scm (unsmob_molecule (mol)->extent (a));
+  Interval ext;
+  if (Molecule * m = unsmob_molecule (mol))
+    ext = m->extent (a);
+  return ly_interval2scm (ext);
 }
 
 /*
@@ -549,9 +550,7 @@ Slur::brew_molecule (SCM smob)
     }
 
   Real base_thick = robust_scm2double (me->get_grob_property ("thickness"), 1);
-
-  Real thick = base_thick *
-    me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));
+  Real thick = base_thick * Staff_symbol_referencer::line_thickness (me);
 
   Real ss = Staff_symbol_referencer::staff_space (me);
   Bezier one = get_curve (me);