CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/08/15 21:56:19
Modified files:
. : ChangeLog VERSION
input : proportional.ly
lily : tuplet-bracket.cc
Log message:
* 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.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.4012&tr2=1.4013&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/VERSION.diff?tr1=1.651&tr2=1.652&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/proportional.ly.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/tuplet-bracket.cc.diff?tr1=1.102&tr2=1.103&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.4012 lilypond/ChangeLog:1.4013
--- lilypond/ChangeLog:1.4012 Mon Aug 15 21:11:12 2005
+++ lilypond/ChangeLog Mon Aug 15 21:56:19 2005
@@ -1,5 +1,12 @@
2005-08-15 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * 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.
Index: lilypond/VERSION
diff -u lilypond/VERSION:1.651 lilypond/VERSION:1.652
--- lilypond/VERSION:1.651 Fri Aug 5 20:16:55 2005
+++ lilypond/VERSION Mon Aug 15 21:56:19 2005
@@ -1,6 +1,6 @@
PACKAGE_NAME=LilyPond
MAJOR_VERSION=2
MINOR_VERSION=7
-PATCH_LEVEL=5
+PATCH_LEVEL=6
MY_PATCH_LEVEL=
Index: lilypond/input/proportional.ly
diff -u lilypond/input/proportional.ly:1.7 lilypond/input/proportional.ly:1.8
--- lilypond/input/proportional.ly:1.7 Mon Aug 15 13:07:32 2005
+++ lilypond/input/proportional.ly Mon Aug 15 21:56:19 2005
@@ -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 {
Index: lilypond/lily/tuplet-bracket.cc
diff -u lilypond/lily/tuplet-bracket.cc:1.102
lilypond/lily/tuplet-bracket.cc:1.103
--- lilypond/lily/tuplet-bracket.cc:1.102 Mon Aug 15 18:47:48 2005
+++ lilypond/lily/tuplet-bracket.cc Mon Aug 15 21:56:19 2005
@@ -402,8 +402,12 @@
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 @@
"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 ");
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
