* mf/GNUmakefile: always trace pfa fonts.

[lilypond.git] / lily / hairpin.cc

diff --git a/lily/hairpin.cc b/lily/hairpin.cc
index 4fc4bce8d3c66538e5f19bf149cf1e0c15b31d75..c757f4ce1e645facc3dc3761c6a85a6ca23f53c7 100644 (file)
--- a/lily/hairpin.cc
+++ b/lily/hairpin.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 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,10 +24,10 @@ Hairpin::brew_molecule (SCM smob)
   Grob *me= unsmob_grob (smob);
   Spanner *spanner = dynamic_cast<Spanner*> (me);
 
-  Real line = me->paper_l ()->get_var ("stafflinethickness");  
+  Real line = me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));  
   
   SCM s = me->get_grob_property ("grow-direction");
-  if (!isdir_b (s))
+  if (!is_direction (s))
     {
       me->suicide ();
       return SCM_EOL;
@@ -35,40 +36,66 @@ Hairpin::brew_molecule (SCM smob)
   Direction grow_dir = to_dir (s);
 
 
-  /* Ugh, must be same as Text_spanner::brew_molecule.  */  
-  Real padding = gh_scm2double (me->get_grob_property ("if-text-padding"));
-  Real broken_left =  spanner->get_broken_left_end_align ();
-  Real width = spanner->spanner_length ();
-  width -= broken_left;
+  /* 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;
-  Drul_array<Real> extra_off;
+  Drul_array<Item*> bounds ;
   Direction d = LEFT;
   do
     {
-      Item *b = spanner->get_bound (d);
-      broken[d] = b->break_status_dir () != CENTER;
+      bounds[d] =spanner->get_bound (d);
+      broken[d] = bounds[d]->break_status_dir () != CENTER;
+    }
+  while (flip (&d) != LEFT);
 
-      if (!broken [d])
+  Grob *common = bounds[LEFT]->common_refpoint (bounds[RIGHT], X_AXIS);
+  Drul_array<Real> x_points ;
+  
+  do
+    {
+      Item *b = bounds[d];
+      x_points[d]  = b->relative_coordinate (common, X_AXIS);
+      if (broken [d])
        {
-
-         Interval e =b->extent (b, X_AXIS);
-         Real r = 0.0;
-         if (!e.empty_b ())
-           r = e[-d] + padding;
-         width += d * r;
-         extra_off[d] = r;
+         if (d == LEFT)
+           x_points[d] = b->extent (common,X_AXIS)[RIGHT] ;
+       }
+      else
+       {
+         if (dynamic_cast<Paper_column*> (b))
+           {
+             /*
+               If we're hung on a paper column, that means we're not
+               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 ())
+               e = Interval (0,0) + b->relative_coordinate (common, X_AXIS);
+             
+             x_points[d] = e.center () - d  * padding /3; // ugh.
+           }
+         else
+           {
+             Interval e =b->extent (common, X_AXIS);
+             if (!e.empty_b ())
+               x_points[d] = e[-d] - d*padding;
+           }
        }
     }
   while (flip (&d) != LEFT);
 
-  // FIXME: ecs tells us
-  width += gh_scm2double (me->get_grob_property ("width-correct"));
-  /* /Ugh */
-  
+
+  Real width = x_points[RIGHT] - x_points[LEFT];
+
   if (width < 0)
     {
-      warning (_ ((grow_dir < 0) ? "decrescendo too small"
+      me->warning (_ ((grow_dir < 0) ? "decrescendo too small"
                  : "crescendo too small"));
       width = 0;
     }
@@ -88,26 +115,55 @@ 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 = gh_list (ly_symbol2scm ("hairpin"),
-                        gh_double2scm (thick),
-                        gh_double2scm (width),
-                        gh_double2scm (starth),
-                        gh_double2scm (endh),
-                        SCM_UNDEFINED);
-
-  Interval yext = 2* height  * Interval (-1,1);
-  Box b (Interval (0, width), yext);
-  Molecule mol (b, hairpin);
-  mol.translate_axis (broken_left + extra_off[LEFT], X_AXIS);
+    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.translate_axis (x_points[LEFT]
+                     - bounds[LEFT]->relative_coordinate (common, X_AXIS),
+                     X_AXIS);
   return mol.smobbed_copy ();
 }
 
 
 
+ADD_INTERFACE (Hairpin, "hairpin-interface",
+  "hairpin crescendo.",
+  "dash-period dash-fraction grow-direction thickness height if-text-padding");
+