From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 15 Aug 2005 21:56:19 +0000 (+0000)
Subject: * lily/tuplet-bracket.cc (calc_position_and_height): add
X-Git-Tag: release/2.7.6~46
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7fba6ff598a8aedf39d67809593848ad8a90f668;p=lilypond.git

* 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 4a94357ba2..c1f611f7b9 100644
--- 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 b3748db4b0..4e55ed9c8a 100644
--- 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 e022d16977..65eb3f211b 100644
--- 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 faf1b7daa7..3709ac8b48 100644
--- 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 ");