CG: Use latest convert-ly for LSR updates (fix 2346)

[lilypond.git] / lily / hairpin.cc

diff --git a/lily/hairpin.cc b/lily/hairpin.cc
index 9f8c706893d6a5cf4fc2725d0b8e9e723594fff5..7ef0f847a1e8fdf30e3231434cbb84209d119f57 100644 (file)
--- a/lily/hairpin.cc
+++ b/lily/hairpin.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -165,9 +165,9 @@ Hairpin::print (SCM smob)
   do
     {
       Item *b = bounds[d];
-      Interval e = (Axis_group_interface::has_interface (b)
-                    ? Axis_group_interface::generic_bound_extent (b, common, X_AXIS)
-                    : robust_relative_extent (b, common, X_AXIS));
+      Interval e = (Paper_column::has_interface (b) && b->break_status_dir ())
+                   ? Axis_group_interface::generic_bound_extent (b, common, X_AXIS)
+                   : robust_relative_extent (b, common, X_AXIS);
 
       x_points[d] = b->relative_coordinate (common, X_AXIS);
       if (broken [d])
@@ -176,7 +176,8 @@ Hairpin::print (SCM smob)
             x_points[d] = e[-d];
           else
             {
-              Real broken_bound_padding = 0.0;
+              Real broken_bound_padding
+                = robust_scm2double (me->get_property ("broken-bound-padding"), 0.0);
               extract_grob_set (me, "concurrent-hairpins", chp);
               for (vsize i = 0; i < chp.size (); i++)
                 {
@@ -265,18 +266,19 @@ Hairpin::print (SCM smob)
     }
 
   bool continued = broken[Direction (-grow_dir)];
+  bool continuing = broken[Direction (grow_dir)];
 
   Real starth = 0;
   Real endh = 0;
   if (grow_dir < 0)
     {
-      starth = height;
-      endh = continued ? height / 2 : 0.0;
+      starth = continuing ? 2 * height / 3 : height;
+      endh = continued ? height / 3 : 0.0;
     }
   else
     {
-      starth = continued ? height / 2 : 0.0;
-      endh = height;
+      starth = continued ? height / 3 : 0.0;
+      endh = continuing ? 2 * height / 3 : height;
     }
 
   /*