2003 -> 2004

[lilypond.git] / lily / hairpin.cc

diff --git a/lily/hairpin.cc b/lily/hairpin.cc
index c757f4ce1e645facc3dc3761c6a85a6ca23f53c7..00d315f4099f39110e7548eb8c8a3e57485ce5d3 100644 (file)
--- a/lily/hairpin.cc
+++ b/lily/hairpin.cc
@@ -3,10 +3,12 @@
 
   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"
 #include "spanner.hh"
 #include "font-interface.hh"
@@ -24,8 +26,6 @@ Hairpin::brew_molecule (SCM smob)
   Grob *me= unsmob_grob (smob);
   Spanner *spanner = dynamic_cast<Spanner*> (me);
 
-  Real line = me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));  
-  
   SCM s = me->get_grob_property ("grow-direction");
   if (!is_direction (s))
     {
@@ -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)
@@ -120,41 +120,12 @@ Hairpin::brew_molecule (SCM smob)
     should do relative to staff-symbol staff-space?
    */
 
-  Real period = 1.0;
-  s = me->get_grob_property ("dash-period");
-  if (gh_number_p (s))
-    period = gh_scm2double (s);
-  
-  Real fraction = 1.0;
-  s = me->get_grob_property ("dash-fraction");
-  if (gh_number_p (s))
-    fraction = gh_scm2double (s);
-  
-  /*
-    TODO: set line style.
-   */
   Molecule mol;
-  if (fraction < 1.0)
-    {
-      mol  = Lookup::dashed_line (thick,
-                                 Offset (0, starth),
-                                 Offset (width, endh),
-                                 period, fraction);
-      mol.add_molecule (Lookup::dashed_line (thick,
-                                            Offset (0, -starth),
-                                            Offset (width, -endh),
-                                            period, fraction));
-    }
-  else
-    {
-      mol  = Lookup::line (thick,
-                          Offset (0, starth),
-                          Offset (width, endh));
-      mol.add_molecule (Lookup::line (thick,
-                                     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)));
+
   mol.translate_axis (x_points[LEFT]
                      - bounds[LEFT]->relative_coordinate (common, X_AXIS),
                      X_AXIS);
@@ -165,5 +136,5 @@ Hairpin::brew_molecule (SCM smob)
 
 ADD_INTERFACE (Hairpin, "hairpin-interface",
   "hairpin crescendo.",
-  "dash-period dash-fraction grow-direction thickness height if-text-padding");
+  "grow-direction height if-text-padding");