* lily/vaticana-ligature-engraver.cc: bugfix: another few

[lilypond.git] / lily / hairpin.cc

diff --git a/lily/hairpin.cc b/lily/hairpin.cc
index 28b5a0910f5ef5ca1fc5c3937d06322970b6c80a..5e7aa98720df10e21684f21118e7fe23df5f5dc7 100644 (file)
--- a/lily/hairpin.cc
+++ b/lily/hairpin.cc
@@ -3,27 +3,28 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include "hairpin.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"
+#include "text-item.hh"
 
 MAKE_SCHEME_CALLBACK (Hairpin, print, 1);
 
 SCM
 Hairpin::print (SCM smob) 
 {
-  Grob *me= unsmob_grob (smob);
+  Grob *me = unsmob_grob (smob);
   Spanner *spanner = dynamic_cast<Spanner*> (me);
 
   SCM s = me->get_property ("grow-direction");
@@ -34,15 +35,8 @@ Hairpin::print (SCM smob)
     }
   
   Direction grow_dir = to_dir (s);
+  Real padding = robust_scm2double (me->get_property ("bound-padding"), 0.5);
 
-
-  /* Ugh, must be same as Text_spanner::print.  */
-
-  /*
-    Ugh. property name is not general.
-   */
-  Real padding = ly_scm2double (me->get_property ("if-text-padding"));
- 
   Drul_array<bool> broken;
   Drul_array<Item*> bounds ;
   Direction d = LEFT;
@@ -63,28 +57,43 @@ Hairpin::print (SCM smob)
       if (broken [d])
        {
          if (d == LEFT)
-           x_points[d] = b->extent (common,X_AXIS)[RIGHT] ;
+           x_points[d] = b->extent (common, X_AXIS)[RIGHT] ;
        }
       else
        {
-         if (dynamic_cast<Paper_column*> (b))
+         if (Text_interface::has_interface (b))
+           {
+             Interval e = b->extent (common, X_AXIS);
+             if (!e.is_empty ())
+               x_points[d] = e[-d] - d*padding;
+           }
+         else
            {
+             bool neighbor_found = false;
+             for (SCM  adj = me->get_property ("adjacent-hairpins");
+                  scm_is_pair (adj); adj = scm_cdr (adj))
+               {
+                 /*
+                   FIXME: this will fuck up in case of polyphonic
+                   notes in other voices. Need to look at note-columns
+                   in the current staff/voice.
+                 */
+                 
+                 Spanner *pin = unsmob_spanner (scm_car (adj));
+                 if (pin
+                     && (pin->get_bound (LEFT)->get_column() == b->get_column ()
+                         || pin->get_bound (RIGHT)->get_column() == b->get_column() ))
+                   neighbor_found = true; 
+               }
+             
              /*
                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.is_empty ())
-               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.is_empty ())
-               x_points[d] = e[-d] - d*padding;
+             Interval e = robust_relative_extent (b, common, X_AXIS);
+             x_points[d] =
+               neighbor_found ? e.center() - d * padding / 3 : e[d];
            }
        }
     }
@@ -92,11 +101,10 @@ Hairpin::print (SCM smob)
 
 
   Real width = x_points[RIGHT] - x_points[LEFT];
-
   if (width < 0)
     {
       me->warning (_ ((grow_dir < 0) ? "decrescendo too small"
-                 : "crescendo too small"));
+                     : "crescendo too small"));
       width = 0;
     }
 
@@ -136,5 +144,5 @@ Hairpin::print (SCM smob)
 
 ADD_INTERFACE (Hairpin, "hairpin-interface",
   "A hairpin (de)crescendo.",
-  "grow-direction height if-text-padding");
+  "grow-direction height bound-padding adjacent-hairpins");