2003 -> 2004

[lilypond.git] / lily / hairpin.cc

diff --git a/lily/hairpin.cc b/lily/hairpin.cc
index a7046766aa536f8644f07812673f41017661e9db..00d315f4099f39110e7548eb8c8a3e57485ce5d3 100644 (file)
--- a/lily/hairpin.cc
+++ b/lily/hairpin.cc
@@ -3,16 +3,18 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 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"
 #include "spanner.hh"
 #include "font-interface.hh"
 #include "dimensions.hh"
 #include "paper-def.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "paper-column.hh"
 #include "lookup.hh"
 
@@ -24,10 +26,8 @@ Hairpin::brew_molecule (SCM smob)
   Grob *me= unsmob_grob (smob);
   Spanner *spanner = dynamic_cast<Spanner*> (me);
 
-  Real line = me->paper_l ()->get_var ("linethickness");  
-  
   SCM s = me->get_grob_property ("grow-direction");
-  if (!ly_dir_p (s))
+  if (!is_direction (s))
     {
       me->suicide ();
       return SCM_EOL;
@@ -75,7 +75,7 @@ Hairpin::brew_molecule (SCM smob)
                make the padding a little smaller, here.
              */
              Interval e =b->extent (common, X_AXIS);
-             if (e.empty_b ())
+             if (e.is_empty ())
                e = Interval (0,0) + b->relative_coordinate (common, X_AXIS);
              
              x_points[d] = e.center () - d  * padding /3; // ugh.
@@ -83,7 +83,7 @@ Hairpin::brew_molecule (SCM smob)
          else
            {
              Interval e =b->extent (common, X_AXIS);
-             if (!e.empty_b ())
+             if (!e.is_empty ())
                x_points[d] = e[-d] - d*padding;
            }
        }
@@ -101,8 +101,8 @@ Hairpin::brew_molecule (SCM smob)
     }
 
   bool continued = broken[Direction (-grow_dir)];
-  Real height = gh_scm2double (me->get_grob_property ("height"));
-  Real thick = line * gh_scm2double (me->get_grob_property ("thickness"));
+  Real height = robust_scm2double (me->get_grob_property ("height"), 0.2) *
+    Staff_symbol_referencer::staff_space (me);
 
   Real starth, endh;
   if (grow_dir < 0)
@@ -116,17 +116,19 @@ Hairpin::brew_molecule (SCM smob)
       endh = height;
     }
 
-  Molecule mol  = Lookup::line (thick,
-                               Offset (0, starth),
-                               Offset (width, endh));
-  mol.add_molecule (Lookup::line (thick,
-                                 Offset (0, -starth),
-                                 Offset (width, -endh)));
-                   
+  /*
+    should do relative to staff-symbol staff-space?
+   */
+
+  Molecule mol;
+  mol  = Line_interface::line (me, Offset (0, starth), Offset (width, endh));
+  mol.add_molecule (Line_interface::line (me,
+                                                Offset (0, -starth),
+                                                Offset (width, -endh)));
+
   mol.translate_axis (x_points[LEFT]
                      - bounds[LEFT]->relative_coordinate (common, X_AXIS),
                      X_AXIS);
-
   return mol.smobbed_copy ();
 }
 
@@ -134,5 +136,5 @@ Hairpin::brew_molecule (SCM smob)
 
 ADD_INTERFACE (Hairpin, "hairpin-interface",
   "hairpin crescendo.",
-  "grow-direction thickness height if-text-padding");
+  "grow-direction height if-text-padding");