2003 -> 2004

[lilypond.git] / lily / hairpin.cc

diff --git a/lily/hairpin.cc b/lily/hairpin.cc
index 66a9931df86835aa33ae3802d17af9d9fc551d2d..00d315f4099f39110e7548eb8c8a3e57485ce5d3 100644 (file)
--- a/lily/hairpin.cc
+++ b/lily/hairpin.cc
@@ -3,9 +3,10 @@
 
   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 "staff-symbol-referencer.hh"
 #include "molecule.hh"
 #include "line-interface.hh"
 #include "hairpin.hh"
@@ -100,7 +101,8 @@ Hairpin::brew_molecule (SCM smob)
     }
 
   bool continued = broken[Direction (-grow_dir)];
-  Real height = gh_scm2double (me->get_grob_property ("height"));
+  Real height = robust_scm2double (me->get_grob_property ("height"), 0.2) *
+    Staff_symbol_referencer::staff_space (me);
 
   Real starth, endh;
   if (grow_dir < 0)
@@ -119,9 +121,7 @@ Hairpin::brew_molecule (SCM smob)
    */
 
   Molecule mol;
-  mol  = Line_interface::line (me,
-                                     Offset (0, starth),
-                                     Offset (width, endh));
+  mol  = Line_interface::line (me, Offset (0, starth), Offset (width, endh));
   mol.add_molecule (Line_interface::line (me,
                                                 Offset (0, -starth),
                                                 Offset (width, -endh)));