From f67c6e4fd47ec1f9c01b50978b5000b6a2ab94c9 Mon Sep 17 00:00:00 2001
From: Hermann Kraus <hermr2d2@gmail.com>
Date: Sat, 4 Aug 2012 18:36:55 +0200
Subject: [PATCH] Only advance if glyph is not part of a multiple glyph
 sequence.

---
 src/text/placement_finder_ng.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/text/placement_finder_ng.cpp b/src/text/placement_finder_ng.cpp
index 15aae463b..2483ca714 100644
--- a/src/text/placement_finder_ng.cpp
+++ b/src/text/placement_finder_ng.cpp
@@ -229,7 +229,11 @@ bool placement_finder_ng::find_point_placement(pixel_position pos)
             double dx = x * cosa_ - y * sina_;
             double dy = x * sina_ + y * cosa_;
             glyphs->push_back(*glyph_itr, pixel_position(dx, dy), angle_); //TODO: Store cosa, sina instead
-            x += glyph_itr->width + glyph_itr->format->character_spacing;
+            if (glyph_itr->width)
+            {
+                //Only advance if glyph is not part of a multiple glyph sequence
+                x += glyph_itr->width + glyph_itr->format->character_spacing;
+            }
         }
     }
     placements_.push_back(glyphs);