CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/09/02 21:02:20
Modified files:
scm : define-grobs.scm
lily : slur-engraver.cc hairpin.cc
. : ChangeLog
Added files:
input/regression: slur-dynamics.ly
Log message:
(DynamicLineSpanner): Add
X-extent-callback. Fixes hairpin-slur collision.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-grobs.scm.diff?tr1=1.235&tr2=1.236&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/slur-engraver.cc.diff?tr1=1.116&tr2=1.117&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/hairpin.cc.diff?tr1=1.56&tr2=1.57&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/regression/slur-dynamics.ly?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.4105&tr2=1.4106&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.4105 lilypond/ChangeLog:1.4106
--- lilypond/ChangeLog:1.4105 Thu Sep 1 03:26:31 2005
+++ lilypond/ChangeLog Fri Sep 2 21:02:19 2005
@@ -1,3 +1,8 @@
+2005-09-02 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+
+ * scm/define-grobs.scm (DynamicLineSpanner): Add
+ X-extent-callback. Fixes hairpin-slur collision.
+
2005-08-31 Graham Percival <[EMAIL PROTECTED]>
* Documentation/user/advanced-notation.itely,
Index: lilypond/lily/hairpin.cc
diff -u lilypond/lily/hairpin.cc:1.56 lilypond/lily/hairpin.cc:1.57
--- lilypond/lily/hairpin.cc:1.56 Sat Aug 13 21:35:23 2005
+++ lilypond/lily/hairpin.cc Fri Sep 2 21:02:19 2005
@@ -163,6 +163,10 @@
}
ADD_INTERFACE (Hairpin, "hairpin-interface",
- "A hairpin (de)crescendo.",
- "grow-direction height bound-padding adjacent-hairpins");
+ "A hairpin crescendo/decrescendo.",
+ "adjacent-hairpins "
+ "bound-padding "
+ "grow-direction "
+ "height "
+ );
Index: lilypond/lily/slur-engraver.cc
diff -u lilypond/lily/slur-engraver.cc:1.116
lilypond/lily/slur-engraver.cc:1.117
--- lilypond/lily/slur-engraver.cc:1.116 Thu Aug 18 09:55:08 2005
+++ lilypond/lily/slur-engraver.cc Fri Sep 2 21:02:19 2005
@@ -33,8 +33,8 @@
virtual bool try_music (Music *);
DECLARE_ACKNOWLEDGER (accidental);
- DECLARE_ACKNOWLEDGER (fingering);
DECLARE_ACKNOWLEDGER (dynamic_line_spanner);
+ DECLARE_ACKNOWLEDGER (fingering);
DECLARE_ACKNOWLEDGER (note_column);
DECLARE_ACKNOWLEDGER (script);
DECLARE_ACKNOWLEDGER (text_script);
Index: lilypond/scm/define-grobs.scm
diff -u lilypond/scm/define-grobs.scm:1.235 lilypond/scm/define-grobs.scm:1.236
--- lilypond/scm/define-grobs.scm:1.235 Sun Aug 28 23:12:13 2005
+++ lilypond/scm/define-grobs.scm Fri Sep 2 21:02:19 2005
@@ -475,6 +475,7 @@
. (
(axes . (1))
(Y-extent-callback . ,Axis_group_interface::group_extent_callback)
+ (X-extent-callback . ,Axis_group_interface::group_extent_callback)
(Y-offset-callbacks . (,Side_position_interface::aligned_side))
(staff-padding . 0.1)
(padding . 0.6)
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
