CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/04/19 12:48:41
Modified files:
. : ChangeLog
lily : break-align-interface.cc
ttftool : parse.c ps.c util.c
Log message:
(do_alignment): don't translate if
total_extent is empty.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3472&tr2=1.3473&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/break-align-interface.cc.diff?tr1=1.48&tr2=1.49&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ttftool/parse.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ttftool/ps.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ttftool/util.c.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3472 lilypond/ChangeLog:1.3473
--- lilypond/ChangeLog:1.3472 Tue Apr 19 00:14:59 2005
+++ lilypond/ChangeLog Tue Apr 19 12:48:40 2005
@@ -1,11 +1,14 @@
2005-04-19 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+ * lily/break-align-interface.cc (do_alignment): don't translate if
+ total_extent is empty.
+
* buildscripts/lilypond-{login,profile}.sh (Module): remove file.
2005-04-18 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* scm/output-ps.scm (grob-cause): don't add cwd if path starts
- with
+ with slash.
2005-04-18 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
Index: lilypond/lily/break-align-interface.cc
diff -u lilypond/lily/break-align-interface.cc:1.48
lilypond/lily/break-align-interface.cc:1.49
--- lilypond/lily/break-align-interface.cc:1.48 Mon Apr 18 00:36:45 2005
+++ lilypond/lily/break-align-interface.cc Tue Apr 19 12:48:41 2005
@@ -247,6 +247,9 @@
total_extent.unite (extents[i] + here);
}
+ if (total_extent.is_empty ())
+ return ;
+
if (me->break_status_dir () == LEFT)
{
alignment_off = -total_extent[RIGHT] - extra_right_space;
Index: lilypond/ttftool/parse.c
diff -u lilypond/ttftool/parse.c:1.1 lilypond/ttftool/parse.c:1.2
--- lilypond/ttftool/parse.c:1.1 Sun Feb 20 18:07:11 2005
+++ lilypond/ttftool/parse.c Tue Apr 19 12:48:41 2005
@@ -3,7 +3,7 @@
#include <sys/types.h>
#include <unistd.h>
#include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
#include "types.h"
#include "proto.h"
Index: lilypond/ttftool/ps.c
diff -u lilypond/ttftool/ps.c:1.4 lilypond/ttftool/ps.c:1.5
--- lilypond/ttftool/ps.c:1.4 Sat Feb 26 11:20:36 2005
+++ lilypond/ttftool/ps.c Tue Apr 19 12:48:41 2005
@@ -3,7 +3,7 @@
#include <sys/types.h>
#include <stdio.h>
#include <unistd.h>
-#include <malloc.h>
+#include <stdlib.h>
#include "types.h"
#include "proto.h"
Index: lilypond/ttftool/util.c
diff -u lilypond/ttftool/util.c:1.3 lilypond/ttftool/util.c:1.4
--- lilypond/ttftool/util.c:1.3 Sat Feb 26 11:20:36 2005
+++ lilypond/ttftool/util.c Tue Apr 19 12:48:41 2005
@@ -2,7 +2,6 @@
#include <sys/types.h>
#include <unistd.h>
-#include <malloc.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
