Fix SVG rendering of glyphs.svg

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

diff --git a/src/document.cpp b/src/document.cpp
index 71f3ed4..a4b20d0 100644 (file)
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -3,6 +3,8 @@
 #include <cstdio>
 #include <fstream>
 
+#include "stb_truetype.h"
+
 using namespace IPDF;
 using namespace std;
 
@@ -435,6 +437,11 @@ void Document::AddPathFromString(const string & d, const Rect & bounds)
                        {
                                x[3] = x[2];
                                y[3] = y[2];
+                               Real old_x1(x[1]), old_y1(y[1]);
+                               x[1] = x[0] + Real(2) * (old_x1 - x[0])/ Real(3);
+                               y[1] = y[0] + Real(2) * (old_y1 - y[0])/ Real(3);
+                               x[2] = x[3] + Real(2) * (old_x1 - x[3])/ Real(3);
+                               y[2] = y[3] + Real(2) * (old_y1 - y[3])/ Real(3);
                        }
                        
                        unsigned index = AddBezierData(Bezier(x[0],y[0],x[1],y[1],x[2],y[2],x[3],y[3]));
@@ -456,8 +463,8 @@ void Document::AddPathFromString(const string & d, const Rect & bounds)
                        assert(GetToken(d,token,i) == ",");
                        Real dy = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.h;
                        
-                       x[1] = (relative) ? x0 + dx : dx;
-                       y[1] = (relative) ? y0 + dy : dy;
+                       x[1] = (relative) ? x[0] + dx : dx;
+                       y[1] = (relative) ? y[0] + dy : dy;
                        
                        x[2] = x[1];
                        y[2] = y[1];
@@ -508,3 +515,57 @@ void Document::AddPathFromString(const string & d, const Rect & bounds)
                prev_i = i;
        }
 }
+
+void Document::AddFontGlyphAtPoint(stbtt_fontinfo *font, int character, Real scale, Real x, Real y)
+{
+       int glyph_index = stbtt_FindGlyphIndex(font, character);
+
+       // Check if there is actully a glyph to render.
+       if (stbtt_IsGlyphEmpty(font, glyph_index))
+       {
+               return;
+       }
+
+       stbtt_vertex *instructions;
+       int num_instructions = stbtt_GetGlyphShape(font, glyph_index, &instructions);
+
+       Real current_x(0), current_y(0);
+
+       for (int i = 0; i < num_instructions; ++i)
+       {
+               // TTF uses 16-bit signed ints for coordinates:
+               // with the y-axis inverted compared to us.
+               // Convert and scale any data.
+               Real inst_x = Real(instructions[i].x)*scale;
+               Real inst_y = Real(instructions[i].y)*-scale;
+               Real inst_cx = Real(instructions[i].cx)*scale;
+               Real inst_cy = Real(instructions[i].cy)*-scale;
+               Real old_x(current_x), old_y(current_y);
+               current_x = inst_x;
+               current_y = inst_y;
+               unsigned bezier_index;
+               switch(instructions[i].type)
+               {
+               // Move To
+               case STBTT_vmove:
+                       break;
+               // Line To
+               case STBTT_vline:
+                       bezier_index = AddBezierData(Bezier(old_x + x, old_y + y, old_x + x, old_y + y, current_x + x, current_y + y, current_x + x, current_y + y));
+                       Add(BEZIER,Rect(0,0,1,1),bezier_index);
+                       break;
+               // Quadratic Bezier To:
+               case STBTT_vcurve:
+                       // Quadratic -> Cubic:
+                       // - Endpoints are the same.
+                       // - cubic1 = quad0+(2/3)*(quad1-quad0)
+                       // - cubic2 = quad2+(2/3)*(quad1-quad2)
+                       bezier_index = AddBezierData(Bezier(old_x + x, old_y + y, old_x + Real(2)*(inst_cx-old_x)/Real(3) + x, old_y + Real(2)*(inst_cy-old_y)/Real(3) + y,
+                                               current_x + Real(2)*(inst_cx-current_x)/Real(3) + x, current_y + Real(2)*(inst_cy-current_y)/Real(3) + y, current_x + x, current_y + y));
+                       Add(BEZIER,Rect(0,0,1,1),bezier_index);
+                       break;
+               }
+       }
+
+       stbtt_FreeShape(font, instructions);
+}