X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fhairpin.cc;h=afd94f3ee06ada9f66d16a851fed3da119037de5;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=b14872573e0be49daf5ca3382178537b288528ed;hpb=59a6d1a06432fc0ca88c3023c646182f389ec1b5;p=lilypond.git

diff --git a/lily/hairpin.cc b/lily/hairpin.cc
index b14872573e..afd94f3ee0 100644
--- a/lily/hairpin.cc
+++ b/lily/hairpin.cc
@@ -157,6 +157,8 @@ Hairpin::print (SCM smob)
   if (circled_tip)
     thick = robust_scm2double (me->get_property ("thickness"), 1.0)
             * Staff_symbol_referencer::line_thickness (me);
+  Drul_array<Real> shorten = robust_scm2interval (me->get_property ("shorten-pair"),
+                                                  Interval (0, 0));
 
   for (LEFT_and_RIGHT (d))
     {
@@ -177,7 +179,7 @@ Hairpin::print (SCM smob)
                 {
                   Spanner *span_elt = dynamic_cast<Spanner *> (chp[i]);
                   if (span_elt->get_bound (RIGHT)->break_status_dir () == LEFT)
-                    broken_bound_padding = std::max (broken_bound_padding,
+                    broken_bound_padding = max (broken_bound_padding,
                                                 robust_scm2double (span_elt->get_property ("broken-bound-padding"), 0.0));
                 }
               x_points[d] -= d * broken_bound_padding;
@@ -220,7 +222,10 @@ Hairpin::print (SCM smob)
                         Handle back-to-back hairpins with a circle in the middle
                       */
                       if (circled_tip && (grow_dir != d))
-                        x_points[d] = e.center () + d * (rad - thick / 2.0);
+                        {
+                          x_points[d] = e.center () + d * (rad - thick / 2.0);
+                          shorten[d] = 0.0;
+                        }
                       /*
                         If we're hung on a paper column, that means we're not
                         adjacent to a text-dynamic, and we may move closer. We
@@ -248,6 +253,8 @@ Hairpin::print (SCM smob)
                 }
             }
         }
+
+        x_points[d] -= shorten[d] * d;
     }
 
   Real width = x_points[RIGHT] - x_points[LEFT];
@@ -336,4 +343,5 @@ ADD_INTERFACE (Hairpin,
                "bound-padding "
                "grow-direction "
                "height "
+               "shorten-pair "
               );