* lily/bar-line.cc: Add documentation for "||:" also in the

[lilypond.git] / lily / hairpin.cc

diff --git a/lily/hairpin.cc b/lily/hairpin.cc
index 7a349c7f3a316211a2f56c4d7c590e49da206a6c..4b9c215e2e9b7cbd4936a7262653ee0f06baa72f 100644 (file)
--- a/lily/hairpin.cc
+++ b/lily/hairpin.cc
@@ -101,9 +101,9 @@ Hairpin::print (SCM smob)
   Real height = robust_scm2double (me->get_property ("height"), 0.2) *
                Staff_symbol_referencer::staff_space (me);
   /*
-    FIXME: 0.65 is just a guess...
+    FIXME: 0.525 is still just a guess...
   */
-  Real rad = height * 0.65;
+  Real rad = height * 0.525;
   Real thick = 1.0;
   if (circled_tip)
     thick = robust_scm2double (me->get_property ("thickness"), 1.0)
@@ -162,7 +162,12 @@ Hairpin::print (SCM smob)
                    x_points[d] = e.center () - d * padding / 3;
                }
              else
-               x_points[d] = e[d];
+               {
+                 x_points[d] = e[d];
+                 Item *bound = me->get_bound (d);
+                 if (bound->is_non_musical (bound))
+                   x_points[d] -=  d * padding;
+               }
            }
        }
     }