(do_alignment): don't translate if

total_extent is empty.

diff --git a/ChangeLog b/ChangeLog
index 088f4b02595c0ef610d60871ee6284c60e0d2159..6ebeb307b870df1b70f65408d15c2c74d123280a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,14 @@
 2005-04-19  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * 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  <hanwen@xs4all.nl>
 
        * scm/output-ps.scm (grob-cause): don't add cwd if path starts
-       with 
+       with slash.
 
 2005-04-18  Jan Nieuwenhuizen  <janneke@gnu.org>
 

diff --git a/lily/break-align-interface.cc b/lily/break-align-interface.cc
index c2d4b09828197cf8d4eafb595ced3e029243c98c..7c1d1ff2199b0b3ad2469830ae35f7b265d76a8b 100644 (file)
--- a/lily/break-align-interface.cc
+++ b/lily/break-align-interface.cc
@@ -247,6 +247,9 @@ Break_align_interface::do_alignment (Grob *grob)
       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;

diff --git a/ttftool/parse.c b/ttftool/parse.c
index e519d81ceba8cdec3d6631136816125212d49a16..13e1a13b7530657ebc719278262db8e0eb62e9f8 100644 (file)
--- a/ttftool/parse.c
+++ b/ttftool/parse.c
@@ -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"
 

diff --git a/ttftool/ps.c b/ttftool/ps.c
index b567a2c4b1c1b4619364d2cb1e44da839c1a6660..13ee16a2dab5652e79f45202fa9b86f2e74c6e4a 100644 (file)
--- a/ttftool/ps.c
+++ b/ttftool/ps.c
@@ -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"
 

diff --git a/ttftool/util.c b/ttftool/util.c
index f53656c2ba8c59d95a9f58de97b3bd60780c7c09..43db6d55ec58e7d5e80ad59f05656efd2adc00e7 100644 (file)
--- a/ttftool/util.c
+++ b/ttftool/util.c
@@ -2,7 +2,6 @@
 
 #include <sys/types.h>
 #include <unistd.h>
-#include <malloc.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>