X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fdocument.cpp;h=a4b20d08f091ecaa4585377343a9f97f7fccf9af;hp=b229baf5f8f891a04fa8bb84fbe1c72c1cd3791d;hb=46fa3e99a49b47c18836d44d806971192907c304;hpb=bb2746f9e7e4660ec33909190dd7aaf093e80993

diff --git a/src/document.cpp b/src/document.cpp
index b229baf..a4b20d0 100644
--- 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;
 
@@ -261,6 +263,9 @@ bool Document::operator==(const Document & equ) const
 #include "../contrib/pugixml-1.4/src/pugixml.hpp"
 #include "../contrib/pugixml-1.4/src/pugixml.cpp"
 
+/**
+ * Load an SVG into a rectangle
+ */
 void Document::LoadSVG(const string & filename, const Rect & bounds)
 {
 	using namespace pugi;
@@ -342,7 +347,7 @@ static string & GetToken(const string & d, string & token, unsigned & i)
 	
 	while (i < d.size())
 	{
-		if (d[i] == ',' || isalpha(d[i]) || iswspace(d[i]))
+		if (d[i] == ',' || (isalpha(d[i]) && d[i] != 'e') || iswspace(d[i]))
 		{
 			if (token.size() == 0 && !iswspace(d[i]))
 			{
@@ -361,17 +366,20 @@ static string & GetToken(const string & d, string & token, unsigned & i)
 // Seriously this isn't really very DOM-like at all is it?
 void Document::AddPathFromString(const string & d, const Rect & bounds)
 {
-	Real x[3] = {0,0,0};
-	Real y[3] = {0,0,0};
+	Real x[4] = {0,0,0,0};
+	Real y[4] = {0,0,0,0};
 	
 	string token("");
 	string command("m");
 	
+	Real x0(0);
+	Real y0(0);
+	
 	unsigned i = 0;
 	unsigned prev_i = 0;
-	Real x0;
-	Real y0;
-	bool started = false;
+	
+	bool start = false;
+	
 	while (i < d.size() && GetToken(d, token, i).size() > 0)
 	{
 		if (isalpha(token[0]))
@@ -380,87 +388,116 @@ void Document::AddPathFromString(const string & d, const Rect & bounds)
 		{
 			i = prev_i; // hax
 			if(command == "")
-				command = "l";
+				command = "L";
 		}
+		
+		bool relative = islower(command[0]);
 			
-		if (command == "m")
+		if (command == "m" || command == "M")
 		{
 			Debug("Construct moveto command");
-			x[0] = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.w;
+			Real dx = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.w;
 			assert(GetToken(d,token,i) == ",");
-			y[0] = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.h;
-			if (!started)
-			{
-				x0 = x[0];
-				y0 = y[0];
-				started = true;
-			}
+			Real dy = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.h;
+			
+			x[0] = (relative) ? x[0] + dx : dx;
+			y[0] = (relative) ? y[0] + dy : dy;
+			
+
+			
 			Debug("mmoveto %f,%f", Float(x[0]),Float(y[0]));
-			command = "l";
+			command = (command == "m") ? "l" : "L";
 		}
-		else if (command == "c")
+		else if (command == "c" || command == "C" || command == "q" || command == "Q")
 		{
 			Debug("Construct curveto command");
-			x[0] = strtod(GetToken(d,token,i).c_str(),NULL)/bounds.w;
+			Real dx = strtod(GetToken(d,token,i).c_str(),NULL)/bounds.w;
 			assert(GetToken(d,token,i) == ",");
-			y[0] = strtod(GetToken(d,token,i).c_str(),NULL)/bounds.h;
+			Real dy = strtod(GetToken(d,token,i).c_str(),NULL)/bounds.h;
 			
-			x[1] = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.w;
-			assert(GetToken(d,token,i) == ",");
-			y[1] = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.h;
+			x[1] = (relative) ? x[0] + dx : dx;
+			y[1] = (relative) ? y[0] + dy : dy;
 			
-			x[2] = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.w;
+			dx = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.w;
 			assert(GetToken(d,token,i) == ",");
-			y[2] = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.h;
+			dy = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.h;
+			
+			x[2] = (relative) ? x[0] + dx : dx;
+			y[2] = (relative) ? y[0] + dy : dy;
+			
+			if (command != "q" && command != "Q")
+			{
+				dx = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.w;
+				assert(GetToken(d,token,i) == ",");
+				dy = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.h;
+				x[3] = (relative) ? x[0] + dx : dx;
+				y[3] = (relative) ? y[0] + dy : dy;
+			}
+			else
+			{
+				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]));
-			Add(BEZIER,bounds,index);
+			unsigned index = AddBezierData(Bezier(x[0],y[0],x[1],y[1],x[2],y[2],x[3],y[3]));
+			Add(BEZIER,Rect(0,0,1,1),index);
 			
 			
-			Debug("[%u] curveto %f,%f %f,%f %f,%f", index, Float(x[0]),Float(y[0]),Float(x[1]),Float(y[1]),Float(x[2]),Float(y[2]));
+			Debug("[%u] curveto %f,%f %f,%f %f,%f", index, Float(x[1]),Float(y[1]),Float(x[2]),Float(y[2]),Float(x[3]),Float(y[3]));
 			
-			x[0] = x[2];
-			y[0] = y[2];
+			x[0] = x[3];
+			y[0] = y[3];
 
 			
 		}
-		else if (command == "l")
+		else if (command == "l" || command == "L")
 		{
 			Debug("Construct lineto command");
 		
-			x[1] = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.w;
+			Real dx = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.w;
 			assert(GetToken(d,token,i) == ",");
-			y[1] = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.h;
+			Real dy = strtod(GetToken(d,token,i).c_str(),NULL) / bounds.h;
+			
+			x[1] = (relative) ? x[0] + dx : dx;
+			y[1] = (relative) ? y[0] + dy : dy;
 			
 			x[2] = x[1];
 			y[2] = y[1];
-
-			Rect segment_bounds(x[0], y[0], x[2] - x[0], y[2] - y[0]);
 			
-			unsigned index = AddBezierData(Bezier(x[0],y[0],x[1],y[1],x[2],y[2]));
-			Add(BEZIER,bounds,index);
+			x[3] = x[1];
+			y[3] = y[1];
+
+			unsigned index = AddBezierData(Bezier(x[0],y[0],x[1],y[1],x[2],y[2],x[3],y[3]));
+			Add(BEZIER,Rect(0,0,1,1),index);
 			
 			Debug("[%u] lineto %f,%f %f,%f", index, Float(x[0]),Float(y[0]),Float(x[1]),Float(y[1]));
 			
-			x[0] = x[2];
-			y[0] = y[2];
+			x[0] = x[3];
+			y[0] = y[3];
 
 		}
-		else if (command == "z")
+		else if (command == "z" || command == "Z")
 		{
 			Debug("Construct returnto command");
 			x[1] = x0;
 			y[1] = y0;
 			x[2] = x0;
 			y[2] = y0;
+			x[3] = x0;
+			y[3] = y0;
 			
-			unsigned index = AddBezierData(Bezier(x[0],y[0],x[1],y[1],x[2],y[2]));
-			Add(BEZIER,bounds,index);
+			unsigned index = AddBezierData(Bezier(x[0],y[0],x[1],y[1],x[2],y[2],x[3],y[3]));
+			Add(BEZIER,Rect(0,0,1,1),index);
 			
 			Debug("[%u] returnto %f,%f %f,%f", index, Float(x[0]),Float(y[0]),Float(x[1]),Float(y[1]));
 			
-			x[0] = x[2];
-			y[0] = y[2];
+			x[0] = x[3];
+			y[0] = y[3];
 			command = "m";
 		}
 		else
@@ -468,6 +505,67 @@ void Document::AddPathFromString(const string & d, const Rect & bounds)
 			Warn("Unrecognised command \"%s\", set to \"m\"", command.c_str());
 			command = "m";
 		}
+		
+		if (!start)
+		{
+			x0 = x[0];
+			y0 = y[0];
+			start = true;
+		}
 		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);
+}