* lily/tuplet-bracket.cc (calc_position_and_height): add

staff-padding support.

* input/proportional.ly: set staff-padding.

* VERSION (PATCH_LEVEL): release 2.7.5

* lily/tuplet-bracket.cc (calc_position_and_height): revert
erroneous fix. Add spanner bounds to offset array with relative X
positions.

diff --git a/ChangeLog b/ChangeLog
index 4a94357ba2b3f8c1e52fee005c5c38bb40ecb8b5..c1f611f7b9cd84a3f79aa420ed35dfe7951f378d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2005-08-15  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/tuplet-bracket.cc (calc_position_and_height): add
+       staff-padding support.
+
+       * input/proportional.ly: set staff-padding.
+       
+       * VERSION (PATCH_LEVEL): release 2.7.5
+
        * input/mutopia/J.S.Bach/wtk1-fugue2.ly (bassdux): text formatting
        fixes. Remove tweaks.
 

diff --git a/VERSION b/VERSION
index b3748db4b069248cfd44933baa1211043f9973ff..4e55ed9c8ad076ef455c02032c974989e5c8b185 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=7
-PATCH_LEVEL=5
+PATCH_LEVEL=6
 MY_PATCH_LEVEL=
 

diff --git a/input/proportional.ly b/input/proportional.ly
index e022d16977316a90a487a1b340a8c15c8eb48a0c..65eb3f211b6f6488219db5c4d202db27b9ba2f2a 100644 (file)
--- a/input/proportional.ly
+++ b/input/proportional.ly
@@ -27,6 +27,7 @@
    \override TimeSignature #'break-visibility = #end-of-line-invisible
    \override Beam #'break-overshoot = #'(-0.5 . 1.0)
    \override TupletBracket #'break-overshoot = #'(-0.5 . 1.0)
+   \override TupletBracket #'staff-padding = #4
    \override PaperColumn #'used = ##t 
  }
  \context {

diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc
index faf1b7daa7457c631c4150855cf423c19de3ffa0..3709ac8b489abdf8acb5a3091435f81da0ff4e52 100644 (file)
--- a/lily/tuplet-bracket.cc
+++ b/lily/tuplet-bracket.cc
@@ -402,8 +402,12 @@ Tuplet_bracket::calc_position_and_height (Grob *me_grob, Real *offset, Real *dy)
 
   Interval staff;
   if (Grob *st = Staff_symbol_referencer::get_staff_symbol (me))
-    staff = st->extent (commony, Y_AXIS);
-
+    {
+      staff = st->extent (commony, Y_AXIS);
+      Real pad = robust_scm2double (me->get_property ("staff-padding"), 0.5);
+      staff.widen (pad);
+    }
+  
   Direction dir = get_grob_direction (me);
 
   /*
@@ -653,8 +657,20 @@ ADD_INTERFACE (Tuplet_bracket,
               "At a line break, the markups in the @code{edge-text} are printed "
               "at the edges. ",
 
-              "note-columns bracket-flare edge-height shorten-pair "
-              "tuplets edge-text break-overshoot "
-              "padding left-position right-position bracket-visibility "
-              "number-visibility thickness direction");
+              
+              "bracket-flare "
+              "bracket-visibility "
+              "break-overshoot "
+              "direction"
+              "edge-height "
+              "edge-text "
+              "left-position "
+              "note-columns "
+              "number-visibility "
+              "padding "
+              "right-position "
+              "shorten-pair "
+              "staff-padding "
+              "thickness "
+              "tuplets ");