X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fdocument.cpp;h=f8a17964cd24b1b5173e733d1207ed5d14efd99f;hp=cb52986cf215be67dea47a5d47ef1010bb74cb7d;hb=c4f8f7c6c7e43fc9fd5358197ca866b4186f636c;hpb=b8c16a61fc9df50a0254aeeb8875421836194981

diff --git a/src/document.cpp b/src/document.cpp
index cb52986..f8a1796 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -3,6 +3,9 @@
 #include <cstdio>
 #include <fstream>
 
+#include "../contrib/pugixml-1.4/src/pugixml.cpp"
+#include "transformationtype.h"
+
 #include "stb_truetype.h"
 
 using namespace IPDF;
@@ -92,28 +95,97 @@ void Document::Save(const string & filename)
 
 void Document::GenBaseQuadtree()
 {
-	m_quadtree.nodes.push_back(QuadTreeNode{QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QTC_UNKNOWN, 0, ObjectCount()});
+	m_quadtree.nodes.push_back(QuadTreeNode{QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QTC_UNKNOWN, 0, ObjectCount(), -1});
 	m_quadtree.root_id = 0;
-	GenQuadChild(0, QTC_TOP_LEFT);
 }
 
+int Document::ClipObjectToQuadChild(int object_id, QuadTreeNodeChildren type)
+{
+	switch (m_objects.types[object_id])
+	{
+	case RECT_FILLED:
+	case RECT_OUTLINE:
+	case PATH:
+		{
+		Rect obj_bounds = TransformToQuadChild(m_objects.bounds[object_id], type);
+		if (obj_bounds.x < 0)
+		{
+			obj_bounds.w += obj_bounds.x;
+			obj_bounds.x = 0;
+		}
+		if (obj_bounds.y < 0)
+		{
+			obj_bounds.h += obj_bounds.y;
+			obj_bounds.y = 0;
+		}
+		if (obj_bounds.x + obj_bounds.w > 1)
+		{
+			obj_bounds.w += (1 - (obj_bounds.x + obj_bounds.w));
+		}
+		if (obj_bounds.y + obj_bounds.h > 1)
+		{
+			obj_bounds.h += (1 - (obj_bounds.y + obj_bounds.h));
+		}
+		m_objects.bounds.push_back(obj_bounds);
+		m_objects.types.push_back(m_objects.types[object_id]);
+		m_objects.data_indices.push_back(m_objects.data_indices[object_id]);
+		return 1;
+		}
+	case BEZIER:
+		{
+		// If we're entirely within the quadtree node, no clipping need occur.
+		if (ContainedInQuadChild(m_objects.bounds[object_id], type))
+		{
+			m_objects.bounds.push_back(TransformToQuadChild(m_objects.bounds[object_id], type));
+			m_objects.types.push_back(m_objects.types[object_id]);
+			m_objects.data_indices.push_back(m_objects.data_indices[object_id]);
+			return 1;
+		}
+		Rect clip_bezier_bounds = TransformRectCoordinates(m_objects.bounds[object_id], TransformFromQuadChild(Rect{0,0,1,1}, type)); 
+		std::vector<Bezier> new_curves = m_objects.beziers[m_objects.data_indices[object_id]].ClipToRectangle(clip_bezier_bounds);
+		for (size_t i = 0; i < new_curves.size(); ++i)
+		{
+			Rect new_bounds = TransformToQuadChild(m_objects.bounds[object_id], type);
+			Bezier new_curve_data = new_curves[i].ToAbsolute(TransformToQuadChild(m_objects.bounds[object_id],type));
+			new_bounds = new_curve_data.SolveBounds();
+			Debug("New bounds: %s", new_bounds.Str().c_str());
+			new_curve_data = new_curve_data.ToRelative(new_bounds);
+			unsigned index = AddBezierData(new_curve_data);
+			m_objects.bounds.push_back(new_bounds);
+			m_objects.types.push_back(BEZIER);
+			m_objects.data_indices.push_back(index);
+		}
+		return new_curves.size();
+		}
+	default:
+		Debug("Adding %s -> %s", m_objects.bounds[object_id].Str().c_str(), TransformToQuadChild(m_objects.bounds[object_id], type).Str().c_str());
+		m_objects.bounds.push_back(TransformToQuadChild(m_objects.bounds[object_id], type));
+		m_objects.types.push_back(m_objects.types[object_id]);
+		m_objects.data_indices.push_back(m_objects.data_indices[object_id]);
+		return 1;
+	}
+	return 0;
+}
 QuadTreeIndex Document::GenQuadChild(QuadTreeIndex parent, QuadTreeNodeChildren type)
 {
 	QuadTreeIndex new_index = m_quadtree.nodes.size();
-	m_quadtree.nodes.push_back(QuadTreeNode{QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, parent, type, 0, 0});
+	Debug("-------------- Generating Quadtree Node %d (parent %d, type %d) ----------------------", new_index, parent, type);
+	m_quadtree.nodes.push_back(QuadTreeNode{QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, parent, type, 0, 0, -1});
 
 	m_quadtree.nodes[new_index].object_begin = m_objects.bounds.size();
-	for (unsigned i = m_quadtree.nodes[parent].object_begin; i < m_quadtree.nodes[parent].object_end; ++i)
+	for (QuadTreeIndex overlay = parent; overlay != -1; overlay = m_quadtree.nodes[overlay].next_overlay)
 	{
-		if (ContainedInQuadChild(m_objects.bounds[i], type))
+		for (unsigned i = m_quadtree.nodes[overlay].object_begin; i < m_quadtree.nodes[overlay].object_end; ++i)
 		{
-			m_objects.bounds.push_back(TransformToQuadChild(m_objects.bounds[i], type));
-			m_objects.types.push_back(m_objects.types[i]);
-			m_objects.data_indices.push_back(m_objects.data_indices[i]);
-			m_count++;
+			if (IntersectsQuadChild(m_objects.bounds[i], type))
+			{
+				m_count += ClipObjectToQuadChild(i, type);
+			}
 		}
 	}
 	m_quadtree.nodes[new_index].object_end = m_objects.bounds.size();
+	// No objects are dirty.
+	m_quadtree.nodes[new_index].object_dirty = m_objects.bounds.size();
 	switch (type)
 	{
 		case QTC_TOP_LEFT:
@@ -134,21 +206,101 @@ QuadTreeIndex Document::GenQuadChild(QuadTreeIndex parent, QuadTreeNodeChildren
 	return new_index;
 }
 
+void Document::OverlayQuadChildren(QuadTreeIndex orig_parent, QuadTreeIndex parent, QuadTreeNodeChildren type)
+{
+	QuadTreeIndex new_index = m_quadtree.nodes.size();
+	Debug("-------------- Generating Quadtree Node %d (orig %d parent %d, type %d) ----------------------", new_index, orig_parent, parent, type);
+	m_quadtree.nodes.push_back(QuadTreeNode{QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, orig_parent, type, 0, 0, -1});
+
+	m_quadtree.nodes[new_index].object_begin = m_objects.bounds.size();
+	for (unsigned i = m_quadtree.nodes[parent].object_dirty; i < m_quadtree.nodes[parent].object_end; ++i)
+	{
+		if (IntersectsQuadChild(m_objects.bounds[i], type))
+		{
+			m_count += ClipObjectToQuadChild(i, type);
+		}
+	}
+	m_quadtree.nodes[new_index].object_end = m_objects.bounds.size();
+	QuadTreeIndex orig_node = -1;
+	switch (type)
+	{
+		case QTC_TOP_LEFT:
+			orig_node = m_quadtree.nodes[orig_parent].top_left;
+			break;
+		case QTC_TOP_RIGHT:
+			orig_node = m_quadtree.nodes[orig_parent].top_right;
+			break;
+		case QTC_BOTTOM_LEFT:
+			orig_node = m_quadtree.nodes[orig_parent].bottom_left;
+			break;
+		case QTC_BOTTOM_RIGHT:
+			orig_node = m_quadtree.nodes[orig_parent].bottom_right;
+			break;
+		default:
+			Fatal("Tried to overlay a QuadTree child of invalid type!");
+	}
+	if (orig_node == -1)
+		Fatal("Tried to overlay a QuadTree child that didn't exist!");
+
+	// Add us to the node's overlay linked list.
+	QuadTreeIndex prev_overlay = orig_node;
+	while (m_quadtree.nodes[prev_overlay].next_overlay != -1) prev_overlay = m_quadtree.nodes[prev_overlay].next_overlay;
+	Debug("- Original node %d, Previous overlay %d, new overlay %d", orig_node, prev_overlay, new_index);
+	m_quadtree.nodes[prev_overlay].next_overlay = new_index;
+
+	// Recurse into any extant children.
+	if (m_quadtree.nodes[orig_node].top_left != -1)
+		OverlayQuadChildren(orig_node, new_index, QTC_TOP_LEFT);
+	if (m_quadtree.nodes[orig_node].top_right != -1)
+		OverlayQuadChildren(orig_node, new_index, QTC_TOP_RIGHT);
+	if (m_quadtree.nodes[orig_node].bottom_left != -1)
+		OverlayQuadChildren(orig_node, new_index, QTC_BOTTOM_LEFT);
+	if (m_quadtree.nodes[orig_node].bottom_right != -1)
+		OverlayQuadChildren(orig_node, new_index, QTC_BOTTOM_RIGHT);
+
+	m_quadtree.nodes[new_index].object_dirty = m_quadtree.nodes[new_index].object_end;
+	m_quadtree.nodes[new_index].next_overlay = -1;
+}
+
+void Document::PropagateQuadChanges(QuadTreeIndex node)
+{
+	for(QuadTreeIndex overlay = node; overlay != -1; overlay = m_quadtree.nodes[overlay].next_overlay)
+	{
+		// We don't care about clean overlays.
+		if (m_quadtree.nodes[overlay].object_dirty == m_quadtree.nodes[overlay].object_end) continue;
+		// Recurse into any extant children.
+		if (m_quadtree.nodes[node].top_left != -1)
+			OverlayQuadChildren(node, overlay, QTC_TOP_LEFT);
+		if (m_quadtree.nodes[node].top_right != -1)
+			OverlayQuadChildren(node, overlay, QTC_TOP_RIGHT);
+		if (m_quadtree.nodes[node].bottom_left != -1)
+			OverlayQuadChildren(node, overlay, QTC_BOTTOM_LEFT);
+		if (m_quadtree.nodes[node].bottom_right != -1)
+			OverlayQuadChildren(node, overlay, QTC_BOTTOM_RIGHT);
+
+		m_quadtree.nodes[overlay].object_dirty = m_quadtree.nodes[overlay].object_end;
+	}
+}
+
 // Reparent a quadtree node, making it the "type" child of a new node.
 QuadTreeIndex Document::GenQuadParent(QuadTreeIndex child, QuadTreeNodeChildren type)
 {
 	QuadTreeIndex new_index = m_quadtree.nodes.size();
-	m_quadtree.nodes.push_back(QuadTreeNode{QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, -1, QTC_UNKNOWN, 0, 0});
+	m_quadtree.nodes.push_back(QuadTreeNode{QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, QUADTREE_EMPTY, -1, QTC_UNKNOWN, 0, 0, -1});
 
 	m_quadtree.nodes[new_index].object_begin = m_objects.bounds.size();
-	for (unsigned i = m_quadtree.nodes[child].object_begin; i < m_quadtree.nodes[child].object_end; ++i)
+	for (QuadTreeIndex overlay = child; overlay != -1; overlay = m_quadtree.nodes[overlay].next_overlay)
 	{
-		m_objects.bounds.push_back(TransformFromQuadChild(m_objects.bounds[i], type));
-		m_objects.types.push_back(m_objects.types[i]);
-		m_objects.data_indices.push_back(m_objects.data_indices[i]);
-		m_count++;
+		for (unsigned i = m_quadtree.nodes[overlay].object_begin; i < m_quadtree.nodes[overlay].object_end; ++i)
+		{
+			m_objects.bounds.push_back(TransformFromQuadChild(m_objects.bounds[i], type));
+			m_objects.types.push_back(m_objects.types[i]);
+			m_objects.data_indices.push_back(m_objects.data_indices[i]);
+			m_count++;
+		}
 	}
 	m_quadtree.nodes[new_index].object_end = m_objects.bounds.size();
+	m_quadtree.nodes[new_index].object_dirty = m_objects.bounds.size();
 	switch (type)
 	{
 		case QTC_TOP_LEFT:
@@ -215,6 +367,11 @@ void Document::Load(const string & filename)
 			Debug("Bezier data...");
 			LoadStructVector<Bezier>(file, chunk_size/sizeof(Bezier), m_objects.beziers);
 			break;
+			
+		case CT_OBJPATHS:
+			Debug("Path data...");
+			Warn("Not handled because lazy");
+			break;
 		}
 	}
 	Debug("Successfully loaded %u objects from \"%s\"", ObjectCount(), filename.c_str());
@@ -226,12 +383,73 @@ void Document::Load(const string & filename)
 #endif
 }
 
-void Document::Add(ObjectType type, const Rect & bounds, unsigned data_index)
+unsigned Document::AddPath(unsigned start_index, unsigned end_index, const Colour & fill, const Colour & stroke)
+{
+	Path path(m_objects, start_index, end_index, fill, stroke);
+	unsigned data_index = AddPathData(path);
+	Rect bounds = path.SolveBounds(m_objects);
+	unsigned result = Add(PATH, bounds,data_index);
+	m_objects.paths[data_index].m_index = result;
+	//Debug("Added path %u -> %u (%u objects) colour {%u,%u,%u,%u}, stroke {%u,%u,%u,%u}", start_index, end_index, (end_index - start_index), fill.r, fill.g, fill.b, fill.a, stroke.r, stroke.g, stroke.b, stroke.a);
+	return result;
+}
+
+/**
+ * Add a Bezier using Absolute coords
+ */
+unsigned Document::AddBezier(const Bezier & bezier)
+{
+	Rect bounds = bezier.SolveBounds();
+	Bezier data = bezier.ToRelative(bounds); // Relative
+	if (data.ToAbsolute(bounds) != bezier)
+	{
+		Warn("%s != %s", data.ToAbsolute(bounds).Str().c_str(),
+			bezier.Str().c_str());
+		Warn("ToAbsolute on ToRelative does not give original Bezier");
+	}
+	unsigned index = AddBezierData(data);
+	return Add(BEZIER, bounds, index);
+}
+
+unsigned Document::Add(ObjectType type, const Rect & bounds, unsigned data_index, QuadTreeIndex qti)
 {
 	m_objects.types.push_back(type);
 	m_objects.bounds.push_back(bounds);
 	m_objects.data_indices.push_back(data_index);
-	++m_count; // Why can't we just use the size of types or something?
+#ifndef QUADTREE_DISABLED
+	if (qti != -1)
+	{
+		QuadTreeIndex new_qti = qti;
+		while (m_quadtree.nodes[new_qti].next_overlay != -1)
+		{
+			if (m_count == m_quadtree.nodes[new_qti].object_end+1)
+			{
+				m_quadtree.nodes[new_qti].object_end++;
+				goto done;
+			}
+			new_qti = m_quadtree.nodes[new_qti].next_overlay;
+		}
+		{
+			QuadTreeIndex overlay = m_quadtree.nodes.size();
+			Debug("Adding new overlay, nqti = %d, overlay = %d", new_qti, overlay);
+			m_quadtree.nodes.push_back(m_quadtree.nodes[qti]);
+			m_quadtree.nodes[overlay].object_begin = m_count;
+			// All objects are dirty.
+			m_quadtree.nodes[overlay].object_dirty = m_count;
+			m_quadtree.nodes[overlay].object_end = m_count+1;
+			m_quadtree.nodes[overlay].next_overlay = -1;
+			m_quadtree.nodes[new_qti].next_overlay = overlay;
+			new_qti = overlay;
+		}
+done: // matches is not amused, but sulix is nice and moved it inside the #ifdef for him.
+		m_count++;
+		PropagateQuadChanges(qti);
+	}
+	return m_count;
+#else // words fail me (still not amused)
+	return (m_count++);
+#endif
+	
 }
 
 unsigned Document::AddBezierData(const Bezier & bezier)
@@ -240,6 +458,11 @@ unsigned Document::AddBezierData(const Bezier & bezier)
 	return m_objects.beziers.size()-1;
 }
 
+unsigned Document::AddPathData(const Path & path)
+{
+	m_objects.paths.push_back(path);
+	return m_objects.paths.size()-1;
+}
 
 void Document::DebugDumpObjects()
 {
@@ -259,112 +482,373 @@ 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)
+// Behold my amazing tokenizing abilities
+static string & GetToken(const string & d, string & token, unsigned & i, const string & delims = "()[],{}<>;:=")
 {
-	using namespace pugi;
-	
-	xml_document doc_xml;
-	ifstream input(filename.c_str(), ios_base::in);
-	xml_parse_result result = doc_xml.load(input);
-	
-	if (!result)
-		Fatal("Couldn't load \"%s\" - %s", filename.c_str(), result.description());
-		
-	Debug("Loaded XML - %s", result.description());
+	token.clear();
+	while (i < d.size() && iswspace(d[i]))
+	{
+		++i;
+	}
 	
-	input.close();
+	while (i < d.size())
+	{
+		if (iswspace(d[i]) || strchr(delims.c_str(),d[i]) != NULL)
+		{
+			if (token.size() == 0 && !iswspace(d[i]))
+			{
+				token += d[i++];
+			}
+			break;	
+		}
+		token += d[i++];
+	}
+	//Debug("Got token \"%s\"", token.c_str());
+	return token;
+}
 
-	// Combine all SVG tags into one thing because lazy
-	for (xml_node svg : doc_xml.children("svg"))
+static void GetXYPair(const string & d, Real & x, Real & y, unsigned & i,const string & delims = "()[],{}<>;:=")
+{
+	string token("");
+	while (GetToken(d, token, i, delims) == ",");
+	x = RealFromStr(token);
+	if (GetToken(d, token, i, delims) != ",")
 	{
-		Real width = Real(svg.attribute("width").as_float()) * bounds.w;
-		Real height = Real(svg.attribute("width").as_float()) * bounds.h;
-		
-		
-		// Rectangles
-		Real coords[4];
-		const char * attrib_names[] = {"x", "y", "width", "height"};
-		for (pugi::xml_node rect : svg.children("rect"))
+		Fatal("Expected \",\" seperating x,y pair");
+	}
+	y = RealFromStr(GetToken(d,token,i,delims));
+}
+
+static bool GetKeyValuePair(const string & d, string & key, string & value, unsigned & i, const string & delims = "()[],{}<>;:=")
+{
+	key = "";
+	string token;
+	while (GetToken(d, token, i, delims) == ":" || token == ";");
+	key = token;
+	if (GetToken(d, token, i, delims) != ":")
+	{
+		Error("Expected \":\" seperating key:value pair");
+		return false;
+	}
+	value = "";
+	GetToken(d, value, i, delims);
+	return true;
+}
+
+static void TransformXYPair(Real & x, Real & y, const SVGMatrix & transform)
+{
+	Real x0(x);
+	x = transform.a * x + transform.c * y + transform.e;
+	y = transform.b * x0 + transform.d * y + transform.f;
+}
+
+void Document::ParseSVGTransform(const string & s, SVGMatrix & transform)
+{
+	//Debug("Parsing transform %s", s.c_str());
+	string token;
+	string command;
+	unsigned i = 0;
+	
+	while (i < s.size())
+	{
+		GetToken(s, command, i);
+		if (command == "," || command == "" || command == ":")
 		{
-			for (size_t i = 0; i < 4; ++i)
-				coords[i] = rect.attribute(attrib_names[i]).as_float();
-			
-			bool outline = !(rect.attribute("fill"));
-			Add(outline?RECT_OUTLINE:RECT_FILLED, Rect(coords[0]/width + bounds.x, coords[1]/height + bounds.y, coords[2]/width, coords[3]/height),0);
-			Debug("Added rectangle");
-		}		
-		
-		// Circles
-		for (pugi::xml_node circle : svg.children("circle"))
+			if (i < s.size())
+				GetToken(s, command, i);
+			else
+				return;
+		}
+		//Debug("Token is \"%s\"", command.c_str());
+	
+		SVGMatrix delta = {1,0,0,0,1,0};
+	
+	
+		assert(GetToken(s,token, i) == "(");
+		if (command == "translate")
 		{
-			Real cx = circle.attribute("cx").as_float();
-			Real cy = circle.attribute("cy").as_float();
-			Real r = circle.attribute("r").as_float();
-			
-			Real x = (cx - r)/width + bounds.x; 
-			Real y = (cy - r)/height + bounds.y; 
-			Real w = Real(2)*r/width; 
-			Real h = Real(2)*r/height;
-			
-			Rect rect(x,y,w,h);
-			Add(CIRCLE_FILLED, rect,0);
-			Debug("Added Circle %s", rect.Str().c_str());
-
-		}		
-		
-		// paths
-		for (pugi::xml_node path : svg.children("path"))
+			GetXYPair(s, delta.e, delta.f, i);
+			assert(GetToken(s,token, i) == ")");	
+		}
+		else if (command == "matrix")
 		{
-			
-			string d = path.attribute("d").as_string();
-			Debug("Path data attribute is \"%s\"", d.c_str());
-			AddPathFromString(d, Rect(bounds.x,bounds.y,width,height));
+			GetXYPair(s, delta.a, delta.b,i);
+			GetXYPair(s, delta.c, delta.d,i);
+			GetXYPair(s, delta.e, delta.f,i);
+			assert(GetToken(s,token, i) == ")");	
+		}
+		else if (command == "scale")
+		{
+			delta.a = RealFromStr(GetToken(s,token,i));
+			GetToken(s, token, i);
+			if (token == ",")
+			{
+				delta.d = RealFromStr(GetToken(s,token,i));
+				assert(GetToken(s, token, i) == ")");
+			}
+			else
+			{
+				delta.d = delta.a;
+				assert(token == ")");
+			}
 			
 		}
-	}
+		else
+		{
+			Warn("Unrecognised transform \"%s\", using identity", command.c_str());
+		}
+	
+		//Debug("Old transform is {%f,%f,%f,%f,%f,%f}", transform.a, transform.b, transform.c, transform.d,transform.e,transform.f);
+		//Debug("Delta transform is {%f,%f,%f,%f,%f,%f}", delta.a, delta.b, delta.c, delta.d,delta.e,delta.f);
 	
-	//Fatal("Done");
+		SVGMatrix old(transform);
+		transform.a = old.a * delta.a + old.c * delta.b;
+		transform.c = old.a * delta.c + old.c * delta.d;
+		transform.e = old.a * delta.e + old.c * delta.f + old.e;
 	
+		transform.b = old.b * delta.a + old.d * delta.b;
+		transform.d = old.b * delta.c + old.d * delta.d;
+		transform.f = old.b * delta.e + old.d * delta.f + old.f;
 	
+		//Debug("New transform is {%f,%f,%f,%f,%f,%f}", transform.a, transform.b, transform.c, transform.d,transform.e,transform.f);
+	}
+}
 
+inline Colour ParseColourString(const string & colour_str)
+{
+	Colour c(0,0,0,0);
+	if (colour_str == "red")
+		c = {255,0,0,255};
+	else if (colour_str == "blue")
+		c = {0,0,255,255};
+	else if (colour_str == "green")
+		c = {0,255,0,255};
+	else if (colour_str == "black")
+		c = {0,0,0,255};
+	else if (colour_str == "white")
+		c = {255,255,255,255};
+	else if (colour_str.size() == 7 && colour_str[0] == '#')
+	{
+		//Debug("Parse colour string: \"%s\"", colour_str.c_str());
+		char comp[3] = {colour_str[1], colour_str[2], '\0'};
+		c.r = strtoul(comp, NULL, 16);
+		comp[0] = colour_str[3]; comp[1] = colour_str[4];
+		c.g = strtoul(comp, NULL, 16);
+		comp[0] = colour_str[5]; comp[1] = colour_str[6];
+		c.b = strtoul(comp, NULL, 16);
+		c.a = 255;
+		//Debug("Colour is: %u, %u, %u, %u", c.r, c.g, c.b, c.a);
+	}
+	return c;
 }
 
-// Behold my amazing tokenizing abilities
-static string & GetToken(const string & d, string & token, unsigned & i)
+void Document::ParseSVGNode(pugi::xml_node & root, SVGMatrix & parent_transform)
 {
-	token.clear();
-	while (i < d.size() && iswspace(d[i]))
+	//Debug("Parse node <%s>", root.name());
+
+	
+	// Centre the SVGs
+	if (strcmp(root.name(),"svg") == 0)
 	{
-		++i;
+		Real ww = RealFromStr(root.attribute("width").as_string());
+		Real hh = RealFromStr(root.attribute("height").as_string());
+		parent_transform.e -= parent_transform.a * ww/Real(2);
+		parent_transform.f -= parent_transform.d * hh/Real(2);
 	}
 	
-	while (i < d.size())
+	for (pugi::xml_node child = root.first_child(); child; child = child.next_sibling())
 	{
-		if (d[i] == ',' || (isalpha(d[i]) && d[i] != 'e') || iswspace(d[i]))
+		SVGMatrix transform(parent_transform);	
+		pugi::xml_attribute attrib_trans = child.attribute("transform");
+		if (!attrib_trans.empty())
 		{
-			if (token.size() == 0 && !iswspace(d[i]))
+			ParseSVGTransform(attrib_trans.as_string(), transform);
+		}
+		
+		
+		
+		if (strcmp(child.name(), "svg") == 0 || strcmp(child.name(),"g") == 0
+			|| strcmp(child.name(), "group") == 0)
+		{
+			
+			ParseSVGNode(child, transform);
+			continue;
+		}
+		else if (strcmp(child.name(), "path") == 0)
+		{
+			string d = child.attribute("d").as_string();
+			//Debug("Path data attribute is \"%s\"", d.c_str());
+			bool closed = false;
+			pair<unsigned, unsigned> range = ParseSVGPathData(d, transform, closed);
+			if (true && range.first < m_count && range.second < m_count)//(closed)
 			{
-				token += d[i++];
+				
+				string colour_str("");
+				map<string, string> style;
+				if (child.attribute("style"))
+				{
+					ParseSVGStyleData(child.attribute("style").as_string(), style);
+				}
+				
+				// Determine shading colour
+				if (child.attribute("fill"))
+				{
+					colour_str = child.attribute("fill").as_string();
+				}
+				else if (style.find("fill") != style.end())
+				{
+					colour_str = style["fill"];
+				}
+				Colour fill = ParseColourString(colour_str);
+				Colour stroke = fill;
+			
+				if (child.attribute("stroke"))
+				{
+					colour_str = child.attribute("stroke").as_string();
+					stroke = ParseColourString(colour_str);
+				}
+				else if (style.find("stroke") != style.end())
+				{
+					colour_str = style["stroke"];
+					stroke = ParseColourString(colour_str);
+				}
+				
+				
+				// Determin shading alpha
+				if (child.attribute("fill-opacity"))
+				{
+					fill.a = 255*child.attribute("fill-opacity").as_float();
+				}
+				else if (style.find("fill-opacity") != style.end())
+				{
+					fill.a = 255*strtod(style["fill-opacity"].c_str(), NULL);
+				}
+				if (child.attribute("stroke-opacity"))
+				{
+					stroke.a = 255*child.attribute("stroke-opacity").as_float();
+				}
+				else if (style.find("stroke-opacity") != style.end())
+				{
+					stroke.a = 255*strtod(style["stroke-opacity"].c_str(), NULL);
+				}
+				AddPath(range.first, range.second, fill, stroke);
 			}
-			break;	
+			
+		}
+		else if (strcmp(child.name(), "line") == 0)
+		{
+			Real x0(child.attribute("x1").as_float());
+			Real y0(child.attribute("y1").as_float());
+			Real x1(child.attribute("x2").as_float());
+			Real y1(child.attribute("y2").as_float());
+			TransformXYPair(x0,y0,transform);
+			TransformXYPair(x1,y1,transform);
+			AddBezier(Bezier(x0,y0,x1,y1,x1,y1,x1,y1));
+		}
+		else if (strcmp(child.name(), "rect") == 0)
+		{
+			Real coords[4];
+			const char * attrib_names[] = {"x", "y", "width", "height"};
+			for (size_t i = 0; i < 4; ++i)
+				coords[i] = child.attribute(attrib_names[i]).as_float();
+			
+			Real x2(coords[0]+coords[2]);
+			Real y2(coords[1]+coords[3]);
+			TransformXYPair(coords[0],coords[1],transform); // x, y, transform
+			TransformXYPair(x2,y2,transform);
+			coords[2] = x2 - coords[0];
+			coords[3] = y2 - coords[1];
+			
+			bool outline = !(child.attribute("fill") && strcmp(child.attribute("fill").as_string(),"none") != 0);
+			Add(outline?RECT_OUTLINE:RECT_FILLED, Rect(coords[0], coords[1], coords[2], coords[3]),0);
+		}
+		else if (strcmp(child.name(), "circle") == 0)
+		{
+			Real cx = child.attribute("cx").as_float();
+			Real cy = child.attribute("cy").as_float();
+			Real r = child.attribute("r").as_float();
+			
+			Real x = (cx - r);
+			Real y = (cy - r);
+			TransformXYPair(x,y,transform);
+			Real w = Real(2)*r*transform.a; // width scales
+			Real h = Real(2)*r*transform.d; // height scales
+			
+			
+			Rect rect(x,y,w,h);
+			Add(CIRCLE_FILLED, rect,0);
+			Debug("Added Circle %s", rect.Str().c_str());			
+		}
+		else if (strcmp(child.name(), "text") == 0)
+		{
+			Real x = child.attribute("x").as_float();
+			Real y = child.attribute("y").as_float();
+			TransformXYPair(x,y,transform);
+			Debug("Add text \"%s\"", child.child_value());
+			AddText(child.child_value(), 0.05, x, y);
 		}
-		token += d[i++];
 	}
-	Debug("Got token \"%s\"", token.c_str());
-	return token;
 }
 
+void Document::ParseSVGStyleData(const string & style, map<string, string> & results)
+{
+	unsigned i = 0;
+	string key;
+	string value;
+	while (i < style.size() && GetKeyValuePair(style, key, value, i))
+	{
+		results[key] = value;
+	}
+}
+
+/**
+ * Parse an SVG string into a rectangle
+ */
+void Document::ParseSVG(const string & input, const Rect & bounds)
+{
+	using namespace pugi;
+	
+	xml_document doc_xml;
+	xml_parse_result result = doc_xml.load(input.c_str());
+	
+	if (!result)
+		Error("Couldn't parse SVG input - %s", result.description());
+		
+	Debug("Loaded XML - %s", result.description());
+	SVGMatrix transform = {bounds.w, 0,bounds.x, 0,bounds.h,bounds.y};
+	ParseSVGNode(doc_xml, transform);
+}
+
+/**
+ * Load an SVG into a rectangle
+ */
+void Document::LoadSVG(const string & filename, const Rect & bounds)
+{
+	using namespace pugi;
+	
+	xml_document doc_xml;
+	ifstream input(filename.c_str(), ios_base::in);
+	xml_parse_result result = doc_xml.load(input);
+	
+	if (!result)
+		Error("Couldn't load \"%s\" - %s", filename.c_str(), result.description());
+		
+	Debug("Loaded XML from \"%s\" - %s", filename.c_str(), result.description());
+	
+	input.close();
+						// a c e, b d f
+	SVGMatrix transform = {bounds.w,0 ,bounds.x, 0,bounds.h,bounds.y};
+	ParseSVGNode(doc_xml, transform);
+}
+
+
 
 // Fear the wrath of the tokenizing svg data
 // Seriously this isn't really very DOM-like at all is it?
-void Document::AddPathFromString(const string & d, const Rect & bounds)
+pair<unsigned, unsigned> Document::ParseSVGPathData(const string & d, const SVGMatrix & transform, bool & closed)
 {
+	closed = false;
 	Real x[4] = {0,0,0,0};
 	Real y[4] = {0,0,0,0};
 	
@@ -379,7 +863,12 @@ void Document::AddPathFromString(const string & d, const Rect & bounds)
 	
 	bool start = false;
 	
-	while (i < d.size() && GetToken(d, token, i).size() > 0)
+
+	static string delims("()[],{}<>;:=LlHhVvmMqQzZcC");
+
+	pair<unsigned, unsigned> range(m_count, m_count);
+	
+	while (i < d.size() && GetToken(d, token, i, delims).size() > 0)
 	{
 		if (isalpha(token[0]))
 			command = token;
@@ -394,41 +883,41 @@ void Document::AddPathFromString(const string & d, const Rect & bounds)
 			
 		if (command == "m" || command == "M")
 		{
-			Debug("Construct moveto command");
-			Real dx = Real(strtod(GetToken(d,token,i).c_str(),NULL)) / bounds.w;
-			assert(GetToken(d,token,i) == ",");
-			Real dy = Real(strtod(GetToken(d,token,i).c_str(),NULL)) / bounds.h;
+			//Debug("Construct moveto command");
+			Real dx = RealFromStr(GetToken(d,token,i,delims));
+			assert(GetToken(d,token,i,delims) == ",");
+			Real dy = RealFromStr(GetToken(d,token,i,delims));
 			
 			x[0] = (relative) ? x[0] + dx : dx;
 			y[0] = (relative) ? y[0] + dy : dy;
 			
-
-			
-			Debug("mmoveto %f,%f", Float(x[0]),Float(y[0]));
+			x0 = x[0];
+			y0 = y[0];
+			//Debug("mmoveto %f,%f", Float(x[0]),Float(y[0]));
 			command = (command == "m") ? "l" : "L";
 		}
 		else if (command == "c" || command == "C" || command == "q" || command == "Q")
 		{
-			Debug("Construct curveto command");
-			Real dx = Real(strtod(GetToken(d,token,i).c_str(),NULL))/bounds.w;
-			assert(GetToken(d,token,i) == ",");
-			Real dy = Real(strtod(GetToken(d,token,i).c_str(),NULL))/bounds.h;
+			//Debug("Construct curveto command");
+			Real dx = RealFromStr(GetToken(d,token,i,delims));
+			assert(GetToken(d,token,i,delims) == ",");
+			Real dy = RealFromStr(GetToken(d,token,i,delims));
 			
 			x[1] = (relative) ? x[0] + dx : dx;
 			y[1] = (relative) ? y[0] + dy : dy;
 			
-			dx = Real(strtod(GetToken(d,token,i).c_str(),NULL)) / bounds.w;
-			assert(GetToken(d,token,i) == ",");
-			dy = Real(strtod(GetToken(d,token,i).c_str(),NULL)) / bounds.h;
+			dx = RealFromStr(GetToken(d,token,i,delims));
+			assert(GetToken(d,token,i,delims) == ",");
+			dy = RealFromStr(GetToken(d,token,i,delims));
 			
 			x[2] = (relative) ? x[0] + dx : dx;
 			y[2] = (relative) ? y[0] + dy : dy;
 			
 			if (command != "q" && command != "Q")
 			{
-				dx = Real(strtod(GetToken(d,token,i).c_str(),NULL)) / bounds.w;
-				assert(GetToken(d,token,i) == ",");
-				dy = Real(strtod(GetToken(d,token,i).c_str(),NULL)) / bounds.h;
+				dx = RealFromStr(GetToken(d,token,i,delims));
+				assert(GetToken(d,token,i,delims) == ",");
+				dy = RealFromStr(GetToken(d,token,i,delims));
 				x[3] = (relative) ? x[0] + dx : dx;
 				y[3] = (relative) ? y[0] + dy : dy;
 			}
@@ -443,46 +932,65 @@ void Document::AddPathFromString(const string & d, const Rect & bounds)
 				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]));
-			Add(BEZIER,Rect(0,0,1,1),index);
-			
+			Real x3(x[3]);
+			Real y3(y[3]);
+			for (int j = 0; j < 4; ++j)
+				TransformXYPair(x[j],y[j], transform);
+
+			range.second = AddBezier(Bezier(x[0],y[0],x[1],y[1],x[2],y[2],x[3],y[3]));
 			
-			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]));
+			//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[3];
-			y[0] = y[3];
+			x[0] = x3;
+			y[0] = y3;
 
 			
 		}
-		else if (command == "l" || command == "L")
+		else if (command == "l" || command == "L" || command == "h" || command == "H" || command == "v" || command == "V")
 		{
-			Debug("Construct lineto command");
+			//Debug("Construct lineto command, relative %d", relative);
 		
-			Real dx = Real(strtod(GetToken(d,token,i).c_str(),NULL)) / bounds.w;
-			assert(GetToken(d,token,i) == ",");
-			Real dy = Real(strtod(GetToken(d,token,i).c_str(),NULL)) / bounds.h;
+			Real dx = RealFromStr(GetToken(d,token,i,delims));
+			Real dy = 0;
+			if (command == "l" || command == "L")
+			{
+				assert(GetToken(d,token,i,delims) == ",");
+				dy = RealFromStr(GetToken(d,token,i,delims));
+			}
+			else if (command == "v" || command == "V")
+			{
+				swap(dx,dy);
+			}
 			
 			x[1] = (relative) ? x[0] + dx : dx;
 			y[1] = (relative) ? y[0] + dy : dy;
+			if (command == "v" || command == "V")
+			{
+				x[1] = x[0];
+			}
+			else if (command == "h" || command == "H")
+			{
+				y[1] = y[0];
+			}
 			
-			x[2] = x[1];
-			y[2] = y[1];
+			Real x1(x[1]);
+			Real y1(y[1]);
 			
-			x[3] = x[1];
-			y[3] = y[1];
+			TransformXYPair(x[0],y[0],transform);
+			TransformXYPair(x[1],y[1],transform);
+
 
-			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);
+			range.second = AddBezier(Bezier(x[0],y[0],x[1],y[1],x[1],y[1],x[1],y[1]));
 			
-			Debug("[%u] lineto %f,%f %f,%f", index, Float(x[0]),Float(y[0]),Float(x[1]),Float(y[1]));
+			//Debug("[%u] lineto %f,%f %f,%f", index, Float(x[0]),Float(y[0]),Float(x[1]),Float(y[1]));
 			
-			x[0] = x[3];
-			y[0] = y[3];
+			x[0] = x1;
+			y[0] = y1;
 
 		}
 		else if (command == "z" || command == "Z")
 		{
-			Debug("Construct returnto command");
+			//Debug("Construct returnto command");
 			x[1] = x0;
 			y[1] = y0;
 			x[2] = x0;
@@ -490,14 +998,18 @@ void Document::AddPathFromString(const string & d, const Rect & bounds)
 			x[3] = x0;
 			y[3] = y0;
 			
-			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]));
+			Real x3(x[3]);
+			Real y3(y[3]);
+			for (int j = 0; j < 4; ++j)
+				TransformXYPair(x[j],y[j], transform);
+
+			range.second = AddBezier(Bezier(x[0],y[0],x[1],y[1],x[2],y[2],x[3],y[3]));
+			//Debug("[%u] returnto %f,%f %f,%f", index, Float(x[0]),Float(y[0]),Float(x[1]),Float(y[1]));
 			
-			x[0] = x[3];
-			y[0] = y[3];
+			x[0] = x3;
+			y[0] = y3;
 			command = "m";
+			closed = true;
 		}
 		else
 		{
@@ -513,6 +1025,65 @@ void Document::AddPathFromString(const string & d, const Rect & bounds)
 		}
 		prev_i = i;
 	}
+	return range;
+}
+
+void Document::SetFont(const string & font_filename)
+{
+	if (m_font_data != NULL)
+	{
+		free(m_font_data);
+	}
+	
+	FILE *font_file = fopen(font_filename.c_str(), "rb");
+	fseek(font_file, 0, SEEK_END);
+	size_t font_file_size = ftell(font_file);
+	fseek(font_file, 0, SEEK_SET);
+	m_font_data = (unsigned char*)malloc(font_file_size);
+	size_t read = fread(m_font_data, 1, font_file_size, font_file);
+	if (read != font_file_size)
+	{
+		Fatal("Failed to read font data from \"%s\" - Read %u bytes expected %u - %s", font_filename.c_str(), read, font_file_size, strerror(errno));
+	}
+	fclose(font_file);
+	stbtt_InitFont(&m_font, m_font_data, 0);
+}
+
+void Document::AddText(const string & text, Real scale, Real x, Real y)
+{
+	if (m_font_data == NULL)
+	{
+		Warn("No font loaded");
+		return;
+	}
+		
+	Real x0(x);
+	//Real y0(y);
+	int ascent = 0, descent = 0, line_gap = 0;
+	stbtt_GetFontVMetrics(&m_font, &ascent, &descent, &line_gap);
+	Real font_scale = scale;
+	font_scale /= Real(ascent - descent);
+	Real y_advance = Real(font_scale) * Real(ascent - descent + line_gap);
+	for (unsigned i = 0; i < text.size(); ++i)
+	{
+		if (text[i] == '\n')
+		{
+			y += y_advance;
+			x = x0;
+		}
+		if (!isprint(text[i]))
+			continue;
+			
+		int advance_width = 0, left_side_bearing = 0, kerning = 0;
+		stbtt_GetCodepointHMetrics(&m_font, text[i], &advance_width, &left_side_bearing);
+		if (i >= 1)
+		{
+			kerning = stbtt_GetCodepointKernAdvance(&m_font, text[i-1], text[i]);
+		}
+		x += font_scale * Real(kerning);
+		AddFontGlyphAtPoint(&m_font, text[i], font_scale, x, y);
+		x += font_scale * Real(advance_width);
+	}
 }
 
 void Document::AddFontGlyphAtPoint(stbtt_fontinfo *font, int character, Real scale, Real x, Real y)
@@ -529,7 +1100,8 @@ void Document::AddFontGlyphAtPoint(stbtt_fontinfo *font, int character, Real sca
 	int num_instructions = stbtt_GetGlyphShape(font, glyph_index, &instructions);
 
 	Real current_x(0), current_y(0);
-
+	unsigned start_index = m_count;
+	unsigned end_index = m_count;
 	for (int i = 0; i < num_instructions; ++i)
 	{
 		// TTF uses 16-bit signed ints for coordinates:
@@ -542,7 +1114,7 @@ void Document::AddFontGlyphAtPoint(stbtt_fontinfo *font, int character, Real sca
 		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
@@ -550,8 +1122,7 @@ void Document::AddFontGlyphAtPoint(stbtt_fontinfo *font, int character, Real sca
 			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);
+			end_index = AddBezier(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));
 			break;
 		// Quadratic Bezier To:
 		case STBTT_vcurve:
@@ -559,12 +1130,89 @@ void Document::AddFontGlyphAtPoint(stbtt_fontinfo *font, int character, Real sca
 			// - 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,
+			end_index = AddBezier(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;
 		}
 	}
+	
+	if (start_index < m_count && end_index < m_count)
+	{
+		AddPath(start_index, end_index);
+	}
+	//Debug("Added Glyph \"%c\" at %f %f, scale %f", (char)character, Float(x), Float(y), Float(scale));
 
 	stbtt_FreeShape(font, instructions);
 }
+
+void Document::TransformObjectBounds(const SVGMatrix & transform)
+{
+	for (unsigned i = 0; i < m_count; ++i)
+	{
+		TransformXYPair(m_objects.bounds[i].x, m_objects.bounds[i].y, transform);
+		m_objects.bounds[i].w *= transform.a;
+		m_objects.bounds[i].h *= transform.d;
+	}
+}
+
+void Document::TranslateObjects(const Real & dx, const Real & dy, ObjectType type)
+{
+	#ifdef TRANSFORM_BEZIERS_TO_PATH
+		for (unsigned i = 0; i < m_objects.paths.size(); ++i)
+		{
+			Path & p = m_objects.paths[i];
+			p.m_bounds.x += dx;
+			p.m_bounds.y += dy;
+		}
+		return;
+	#endif	
+	
+	for (unsigned i = 0; i < m_count; ++i)
+	{
+		if (type == NUMBER_OF_OBJECT_TYPES || m_objects.types[i] == type)
+		{
+			m_objects.bounds[i].x += dx;
+			m_objects.bounds[i].y += dy;
+		}
+	}
+}
+
+void Document::ScaleObjectsAboutPoint(const Real & x, const Real & y, const Real & scale_amount, ObjectType type)
+{
+	#ifdef TRANSFORM_BEZIERS_TO_PATH
+		for (unsigned i = 0; i < m_objects.paths.size(); ++i)
+		{
+			Path & p = m_objects.paths[i];
+			p.m_bounds.w /= scale_amount;
+			p.m_bounds.h /= scale_amount;
+			p.m_bounds.x -= x;
+			p.m_bounds.x /= scale_amount;
+			p.m_bounds.x += x;
+			p.m_bounds.y -= y;
+			p.m_bounds.y /= scale_amount;
+			p.m_bounds.y += y;
+		}
+		return;
+	#endif
+	
+	for (unsigned i = 0; i < m_count; ++i)
+	{
+		if (type != NUMBER_OF_OBJECT_TYPES && m_objects.types[i] != type)
+			continue;
+		
+		m_objects.bounds[i].w /= scale_amount;
+		m_objects.bounds[i].h /= scale_amount;
+		//m_objects.bounds[i].x = x + (m_objects.bounds[i].x-x)/scale_amount;
+		//m_objects.bounds[i].y = y + (m_objects.bounds[i].y-x)/scale_amount;
+		m_objects.bounds[i].x -= x;
+		m_objects.bounds[i].x /= scale_amount;
+		m_objects.bounds[i].x += x;
+		
+		m_objects.bounds[i].y -= y;
+		m_objects.bounds[i].y /= scale_amount;
+		m_objects.bounds[i].y += y;
+	}
+
+}
+
+