* lily/hairpin.cc: lengthen hairpin if space is available.

[lilypond.git] / lily / hairpin.cc

diff --git a/lily/hairpin.cc b/lily/hairpin.cc
index 629f8254609f5042453d3f2167c36f01d0f03cfe..828bb6ec52b11694f23826e98391146d40bc2138 100644 (file)
--- a/lily/hairpin.cc
+++ b/lily/hairpin.cc
@@ -13,7 +13,7 @@
 #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"
@@ -35,13 +35,7 @@ Hairpin::print (SCM smob)
   
   Direction grow_dir = to_dir (s);
 
-
-  /* Ugh, must be same as Text_spanner::print.  */
-
-  /*
-    Ugh. property name is not general.
-   */
-  Real padding = gh_scm2double (me->get_property ("if-text-padding"));
+  Real padding = scm_to_double (me->get_property ("bound-padding"));
  
   Drul_array<bool> broken;
   Drul_array<Item*> bounds ;
@@ -69,16 +63,31 @@ Hairpin::print (SCM smob)
        {
          if (dynamic_cast<Paper_column*> (b))
            {
+             bool neighbor_found = false;
+             for (SCM  adj = me->get_property ("adjacent-hairpins");
+                  ly_c_pair_p (adj); adj = ly_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 (ly_car (adj));
+                 if (pin
+                     && (pin->get_bound (LEFT)->get_column() == b
+                         || pin->get_bound (RIGHT)->get_column() == b))
+                   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.
+             Interval e = robust_relative_extent (b, common, X_AXIS);
+             x_points[d] =
+               neighbor_found ? e.center() - d * padding / 3 : e[d];
            }
          else
            {
@@ -136,5 +145,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");