From 4a618b7040022b9f1b18d030139f09ddabc4e3e3 Mon Sep 17 00:00:00 2001
From: Chris Young <chris@unsatisfactorysoftware.co.uk>
Date: Sat, 25 May 2013 14:05:32 +0100
Subject: Another attempt to fix the moving split position when a string fits
 exactly.

---
 amiga/font.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/amiga/font.c b/amiga/font.c
index 441f4d408..68ec8da1a 100755
--- a/amiga/font.c
+++ b/amiga/font.c
@@ -308,7 +308,7 @@ bool nsfont_split(const plot_font_style_t *fstyle,
 	*char_offset = 0;
 	*actual_x = 0;
 
-	while (utf8_pos < length) {
+	while (utf8_pos <= length) {
 		if ((*utf16 < 0xD800) || (0xDBFF < *utf16))
 			utf16charlen = 1;
 		else
@@ -341,15 +341,14 @@ bool nsfont_split(const plot_font_style_t *fstyle,
 			}
 		}
 
-		tx+= tempx;
-
 		if ((x < tx) && (*char_offset != 0)) {
 			/* Reached available width, and a space was found;
 			 * split there. */
 			free(outf16);
 			return true;
 		}
-		
+
+		tx += tempx;		
 		utf16 = utf16next;
 		utf8_pos = utf8_next(string, length, utf8_pos);
 	}
-- 
cgit v1.2.3