X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftuplet-bracket.cc;h=639472399c3737bf4c52a9f372bff87856eef92c;hb=62a502b7a020a0414058b7bfda405f644e8261f5;hp=cfae0b98650d2317976c2ff9fae9338fe434a149;hpb=89006169468f47d1fece73a935ca6c1b1f26f481;p=lilypond.git

diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc
index cfae0b9865..639472399c 100644
--- a/lily/tuplet-bracket.cc
+++ b/lily/tuplet-bracket.cc
@@ -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);
@@ -280,12 +283,20 @@ Tuplet_bracket::print (SCM smob)
   else if (bracket == ly_symbol2scm ("if-no-beam"))
     bracket_visibility = !par_beam;
   
+  /* Don't print a tuplet bracket and number if no control-points were calculated */
   SCM cpoints =  me->get_property ("control-points");
   if (scm_ilength (cpoints) < 2)
     {
       me->suicide ();
       return SCM_EOL;
     }
+  /*  if the tuplet does not span any time, i.e. a single-note tuplet, hide
+      the bracket, but still let the number be displayed */
+  if (robust_scm2moment (me->get_bound (LEFT)->get_column ()->get_property ("when"), Moment (0))
+      == robust_scm2moment (me->get_bound (RIGHT)->get_column ()->get_property ("when"), Moment (0)))
+  {
+      bracket_visibility = false;
+  }
   
   Drul_array<Offset> points;
   points[LEFT] = ly_scm2offset (scm_car (cpoints));
@@ -686,16 +697,6 @@ Tuplet_bracket::calc_positions (SCM smob)
 {
   Spanner *me = unsmob_spanner (smob);
 
-  /*
-    Don't print if it doesn't span time.
-   */
-  if (robust_scm2moment (me->get_bound (LEFT)->get_column ()->get_property ("when"), Moment (0))
-      == robust_scm2moment (me->get_bound (RIGHT)->get_column ()->get_property ("when"), Moment (0)))
-    {
-      me->suicide ();
-      return SCM_EOL;
-    }
-
   Real dy = 0.0;
   Real offset = 0.0;
   calc_position_and_height (me, &offset, &dy);
@@ -769,13 +770,11 @@ Tuplet_bracket::calc_cross_staff (SCM smob)
 }
 
 ADD_INTERFACE (Tuplet_bracket,
-	       "A bracket with a number in the middle, used for tuplets. "
-	       "When the bracket spans  a line break, the value of "
-	       "@code{break-overshoot} determines how far it extends "
-	       "beyond the staff. "
-	       "At a line break, the markups in the @code{edge-text} are printed "
-	       "at the edges. ",
-
+	       "A bracket with a number in the middle, used for tuplets."
+	       "  When the bracket spans a line break, the value of"
+	       " @code{break-overshoot} determines how far it extends"
+	       " beyond the staff.  At a line break, the markups in the"
+	       " @code{edge-text} are printed at the edges.",
 
 	       /* properties */
 	       "bracket-flare "
@@ -786,6 +785,8 @@ ADD_INTERFACE (Tuplet_bracket,
 	       "direction "
 	       "edge-height "
 	       "edge-text "
+	       "full-length-padding "
+	       "full-length-to-extent "
 	       "gap "
 	       "positions "
 	       "note-columns "
@@ -794,6 +795,7 @@ ADD_INTERFACE (Tuplet_bracket,
 	       "shorten-pair "
 	       "staff-padding "
 	       "thickness "
-	       "tuplets ");
+	       "tuplets "
+	       );