* Documentation/user/refman.itely (Printing named chords): add

[lilypond.git] / lily / hairpin.cc

diff --git a/lily/hairpin.cc b/lily/hairpin.cc
index 0a45b6a1842a661a6196ddcd8c5f02af555c441f..503b575f6e931ede8dbba762eb4100918e24a878 100644 (file)
--- a/lily/hairpin.cc
+++ b/lily/hairpin.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "molecule.hh"
@@ -12,8 +12,9 @@
 #include "font-interface.hh"
 #include "dimensions.hh"
 #include "paper-def.hh"
-#include "debug.hh"
+#include "warn.hh"
 #include "paper-column.hh"
+#include "lookup.hh"
 
 MAKE_SCHEME_CALLBACK (Hairpin, brew_molecule, 1);
 
@@ -23,7 +24,7 @@ Hairpin::brew_molecule (SCM smob)
   Grob *me= unsmob_grob (smob);
   Spanner *spanner = dynamic_cast<Spanner*> (me);
 
-  Real line = me->paper_l ()->get_var ("linethickness");  
+  Real line = me->get_paper ()->get_var ("linethickness");  
   
   SCM s = me->get_grob_property ("grow-direction");
   if (!ly_dir_p (s))
@@ -35,7 +36,11 @@ 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::brew_molecule.  */
+
+  /*
+    Ugh. property name is not general.
+   */
   Real padding = gh_scm2double (me->get_grob_property ("if-text-padding"));
  
   Drul_array<bool> broken;
@@ -110,27 +115,14 @@ Hairpin::brew_molecule (SCM smob)
       starth = continued ? height/2 : 0.0;
       endh = height;
     }
-  
-  /*
-    TODO: junk this and, make a general
-
-    Lookup::line  (XY1, XY2).
-  */
-  SCM hairpin = scm_list_n (ly_symbol2scm ("hairpin"),
-                        gh_double2scm (thick),
-                        gh_double2scm (width),
-                        gh_double2scm (starth),
-                        gh_double2scm (endh),
-                        SCM_UNDEFINED);
 
-  /*
-    We make the hairpin too large in Y direction, so it stays at
-    proper distance from the staff.
-  */
-  Interval yext = 2* height  * Interval (-1,1);
-  Box b (Interval (0, width), yext);
-  Molecule mol (b, hairpin);
-  
+  Molecule 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);
@@ -141,10 +133,6 @@ Hairpin::brew_molecule (SCM smob)
 
 
 ADD_INTERFACE (Hairpin, "hairpin-interface",
-  "hairpin crescendo.
-
-padding -- horizontal padding. This is useful if a crescendo is set next to a text like `mf'
-
-",
-  "grow-direction thickness height padding");
+  "hairpin crescendo.",
+  "grow-direction thickness height if-text-padding");