Fix kerning for the first pair of characters

[ipdf/code.git] / src / document.cpp

diff --git a/src/document.cpp b/src/document.cpp
index 35673d4..3f00e64 100644 (file)
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -615,6 +615,8 @@ pair<unsigned, unsigned> Document::ParseSVGPathData(const string & d, const SVGM
                        x[0] = (relative) ? x[0] + dx : dx;
                        y[0] = (relative) ? y[0] + dy : dy;
                        
+                       x0 = x[0];
+                       y0 = y[0];
                        //Debug("mmoveto %f,%f", Float(x[0]),Float(y[0]));
                        command = (command == "m") ? "l" : "L";
                }
@@ -796,11 +798,12 @@ void Document::AddText(const string & text, Real scale, Real x, Real y)
                        
                int advance_width = 0, left_side_bearing = 0, kerning = 0;
                stbtt_GetCodepointHMetrics(&m_font, text[i], &advance_width, &left_side_bearing);
-               if (i > 1)
+               if (i >= 1)
                {
                        kerning = stbtt_GetCodepointKernAdvance(&m_font, text[i-1], text[i]);
                }
-               x += Real(font_scale) * Real(left_side_bearing + kerning);
+               Debug("%c: lsb %d, kern %d, adv_width %d", text[i], left_side_bearing, kerning, advance_width);
+               x += Real(font_scale) * Real(kerning);
                AddFontGlyphAtPoint(&m_font, text[i], font_scale, x, y);
                x += Real(font_scale) * Real(advance_width);
        }