X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftuplet-bracket.cc;h=4ddb09245ee236f98a17c5e7cb359f8b8711ffa2;hb=c8c3f3cb3714cd487435f35aaf86615716020141;hp=dde38da22d9fc984a029a6c6b48ca81a5a79207a;hpb=ecf2b5e9dcfa7654803fb0050d7127e0ec7fd934;p=lilypond.git

diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc
index dde38da22d..4ddb09245e 100644
--- a/lily/tuplet-bracket.cc
+++ b/lily/tuplet-bracket.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
@@ -231,17 +231,20 @@ Tuplet_bracket::calc_control_points (SCM smob)
 	  /*
 	    We're connecting to a column, for the last bit of a broken
 	    fullLength bracket.
-	    
-	    TODO: make padding tunable?
 	  */
-	  Real padding = 1.0;
+	  Real padding =
+	    robust_scm2double(me->get_property("full-length-padding"), 1.0);
 
 	  if (bounds[d]->break_status_dir ())
 	    padding = 0.0;
-	  
-	  x_span[d]
-	    = robust_relative_extent (bounds[d], commonx, X_AXIS) [LEFT]
-	    - padding;
+
+	  Real coord = bounds[d]->relative_coordinate(commonx, X_AXIS);
+	  if (to_boolean (me->get_property ("full-length-to-extent")))
+	    coord = robust_relative_extent(bounds[d], commonx, X_AXIS)[LEFT];
+
+	  coord = max (coord, x_span[LEFT]);
+
+	  x_span[d] = coord - padding;
 	}
     }
   while (flip (&d) != LEFT);
@@ -782,6 +785,8 @@ ADD_INTERFACE (Tuplet_bracket,
 	       "direction "
 	       "edge-height "
 	       "edge-text "
+	       "full-length-padding "
+	       "full-length-to-extent "
 	       "gap "
 	       "positions "
 	       "note-columns "