* scm/lily.scm (ly:all-stencil-expressions):

[lilypond.git] / lily / hairpin.cc

diff --git a/lily/hairpin.cc b/lily/hairpin.cc
index c757f4ce1e645facc3dc3761c6a85a6ca23f53c7..4c31cbad2e1ea83508f29742fe7124792d5bbe9b 100644 (file)
--- a/lily/hairpin.cc
+++ b/lily/hairpin.cc
@@ -3,30 +3,30 @@
 
   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 "molecule.hh"
+#include "staff-symbol-referencer.hh"
+#include "stencil.hh"
+#include "line-interface.hh"
 #include "hairpin.hh"
 #include "spanner.hh"
 #include "font-interface.hh"
 #include "dimensions.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "warn.hh"
 #include "paper-column.hh"
 #include "lookup.hh"
 
-MAKE_SCHEME_CALLBACK (Hairpin, brew_molecule, 1);
+MAKE_SCHEME_CALLBACK (Hairpin, print, 1);
 
 SCM
-Hairpin::brew_molecule (SCM smob) 
+Hairpin::print (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");
+  SCM s = me->get_property ("grow-direction");
   if (!is_direction (s))
     {
       me->suicide ();
@@ -36,19 +36,19 @@ Hairpin::brew_molecule (SCM smob)
   Direction grow_dir = to_dir (s);
 
 
-  /* Ugh, must be same as Text_spanner::brew_molecule.  */
+  /* Ugh, must be same as Text_spanner::print.  */
 
   /*
     Ugh. property name is not general.
    */
-  Real padding = gh_scm2double (me->get_grob_property ("if-text-padding"));
+  Real padding = ly_scm2double (me->get_property ("if-text-padding"));
  
   Drul_array<bool> broken;
   Drul_array<Item*> bounds ;
   Direction d = LEFT;
   do
     {
-      bounds[d] =spanner->get_bound (d);
+      bounds[d] = spanner->get_bound (d);
       broken[d] = bounds[d]->break_status_dir () != CENTER;
     }
   while (flip (&d) != LEFT);
@@ -59,7 +59,7 @@ Hairpin::brew_molecule (SCM smob)
   do
     {
       Item *b = bounds[d];
-      x_points[d]  = b->relative_coordinate (common, X_AXIS);
+      x_points[d] = b->relative_coordinate (common, X_AXIS);
       if (broken [d])
        {
          if (d == LEFT)
@@ -74,16 +74,16 @@ Hairpin::brew_molecule (SCM smob)
                adjacent to a text-dynamic, and we may move closer. We
                make the padding a little smaller, here.
              */
-             Interval e =b->extent (common, X_AXIS);
-             if (e.empty_b ())
+             Interval e = b->extent (common, X_AXIS);
+             if (e.is_empty ())
                e = Interval (0,0) + b->relative_coordinate (common, X_AXIS);
              
-             x_points[d] = e.center () - d  * padding /3; // ugh.
+             x_points[d] = e.center () - d  * padding / 3; // ugh.
            }
          else
            {
-             Interval e =b->extent (common, X_AXIS);
-             if (!e.empty_b ())
+             Interval e = b->extent (common, X_AXIS);
+             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_property ("height"), 0.2) *
+    Staff_symbol_referencer::staff_space (me);
 
   Real starth, endh;
   if (grow_dir < 0)
@@ -118,43 +118,14 @@ Hairpin::brew_molecule (SCM smob)
 
   /*
     should do relative to staff-symbol staff-space?
-   */
+  */
+
+  Stencil mol;
+  mol  = Line_interface::line (me, Offset (0, starth), Offset (width, endh));
+  mol.add_stencil (Line_interface::line (me,
+                                        Offset (0, -starth),
+                                        Offset (width, -endh)));
 
-  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.translate_axis (x_points[LEFT]
                      - bounds[LEFT]->relative_coordinate (common, X_AXIS),
                      X_AXIS);
@@ -164,6 +135,6 @@ Hairpin::brew_molecule (SCM smob)
 
 
 ADD_INTERFACE (Hairpin, "hairpin-interface",
-  "hairpin crescendo.",
-  "dash-period dash-fraction grow-direction thickness height if-text-padding");
+  "A hairpin (de)crescendo.",
+  "grow-direction height if-text-padding");