CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/09/11 09:59:49
Modified files:
. : ChangeLog
lily : spacing-spanner.cc tie-column.cc
scm : define-music-types.scm
Log message:
(set_chord_outlines): bugfix: insert complete
box in skyline.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.4120&tr2=1.4121&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/spacing-spanner.cc.diff?tr1=1.152&tr2=1.153&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/tie-column.cc.diff?tr1=1.58&tr2=1.59&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-music-types.scm.diff?tr1=1.63&tr2=1.64&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.4120 lilypond/ChangeLog:1.4121
--- lilypond/ChangeLog:1.4120 Thu Sep 8 21:31:18 2005
+++ lilypond/ChangeLog Sun Sep 11 09:59:49 2005
@@ -1,3 +1,8 @@
+2005-09-11 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * lily/tie-column.cc (set_chord_outlines): bugfix: insert complete
+ box in skyline.
+
2005-09-08 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* lily/tie.cc (get_configuration): don't crash if left_dot is NULL.
Index: lilypond/lily/spacing-spanner.cc
diff -u lilypond/lily/spacing-spanner.cc:1.152
lilypond/lily/spacing-spanner.cc:1.153
--- lilypond/lily/spacing-spanner.cc:1.152 Thu Aug 18 12:54:25 2005
+++ lilypond/lily/spacing-spanner.cc Sun Sep 11 09:59:49 2005
@@ -439,9 +439,15 @@
"head width) A 16th note is followed by 0.5 note head width.
The\n"
"quarter note is followed by 3 NHW, the half by 4 NHW, etc.\n",
- "grace-space-factor spacing-increment base-shortest-duration
strict-note-spacing "
- "shortest-duration-space common-shortest-duration
uniform-stretching "
- "packed-spacing ");
+ "grace-space-factor "
+ "spacing-increment "
+ "base-shortest-duration "
+ "strict-note-spacing "
+ "shortest-duration-space "
+ "common-shortest-duration "
+ "uniform-stretching "
+ "packed-spacing "
+ );
ADD_INTERFACE (Spacing_interface, "spacing-interface",
"Something to do with line breaking and spacing. "
Index: lilypond/lily/tie-column.cc
diff -u lilypond/lily/tie-column.cc:1.58 lilypond/lily/tie-column.cc:1.59
--- lilypond/lily/tie-column.cc:1.58 Sun Sep 4 11:36:40 2005
+++ lilypond/lily/tie-column.cc Sun Sep 11 09:59:49 2005
@@ -107,7 +107,7 @@
Array<Box> boxes;
Interval x_union;
- Grob *stem = 0;
+ Grob *stem = 0;
for (int i = 0; i < ties.size (); i++)
{
Spanner *tie = dynamic_cast<Spanner*> (ties[i]);
@@ -178,15 +178,20 @@
do
{
Interval x ;
+ Interval y;
if (boxes.size())
{
Box b = boxes.boundary (updowndir, 0);
x = b[X_AXIS];
x[-d] = b[X_AXIS].linear_combination (-d / 2);
+ y[-updowndir] = b[Y_AXIS][updowndir];
+ y[updowndir] = updowndir * infinity_f;
}
-
+
if (!x.is_empty ())
- (*skyline_drul)[d].boundary (updowndir, 0).height_ = x[-d];
+ insert_extent_into_skyline (&skyline_drul->elem_ref (d),
+ Box (x,y),
+ Y_AXIS, -d);
}
while (flip (&updowndir) != DOWN);
Index: lilypond/scm/define-music-types.scm
diff -u lilypond/scm/define-music-types.scm:1.63
lilypond/scm/define-music-types.scm:1.64
--- lilypond/scm/define-music-types.scm:1.63 Fri Jul 22 18:28:35 2005
+++ lilypond/scm/define-music-types.scm Sun Sep 11 09:59:49 2005
@@ -218,7 +218,7 @@
(description . "Change the key signature.
Syntax: @code{\\key } @var{name} @var{scale}.")
-
+ (to-relative-callback . ,(lambda (x p) p))
(types . (general-music key-change-event event))
))
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
