From 26aa7a02d8cad410c4b496b87891653edbba771a Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 19 Apr 2005 12:48:41 +0000
Subject: [PATCH] (do_alignment): don't translate if total_extent is empty.

---
 ChangeLog                     | 5 ++++-
 lily/break-align-interface.cc | 3 +++
 ttftool/parse.c               | 2 +-
 ttftool/ps.c                  | 2 +-
 ttftool/util.c                | 1 -
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 088f4b0259..6ebeb307b8 100644
--- 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 c2d4b09828..7c1d1ff219 100644
--- 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 e519d81ceb..13e1a13b75 100644
--- 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 b567a2c4b1..13ee16a2da 100644
--- 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 f53656c2ba..43db6d55ec 100644
--- 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>
-- 
2.39.5