X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fdocument.cpp;h=aff9a2326ac25263aba808af3cdd927bedf7b5c8;hp=8a5635c7bb2aa6d833128fc626870794b12a5039;hb=a8297c3461718f2d9afc7a2f8ca620d320ac5f97;hpb=d83560835237d360f6d12776435e91676c8ab45f

diff --git a/src/document.cpp b/src/document.cpp
index 8a5635c..aff9a23 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -1,9 +1,11 @@
 #include "document.h"
 #include "bezier.h"
+#include "profiler.h"
 #include <cstdio>
 #include <fstream>
 
 #include "../contrib/pugixml-1.4/src/pugixml.cpp"
+#include "transformationtype.h"
 
 #include "stb_truetype.h"
 
@@ -94,17 +96,18 @@ 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)
 {
+	PROFILE_SCOPE("Document::ClipObjectToQuadChild");
 	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)
@@ -132,13 +135,25 @@ int Document::ClipObjectToQuadChild(int object_id, QuadTreeNodeChildren type)
 		}
 	case BEZIER:
 		{
-		Rect child_node_bounds = TransformFromQuadChild({0,0,1,1}, type);
-		std::vector<Bezier> new_curves = m_objects.beziers[m_objects.data_indices[object_id]].ClipToRectangle(child_node_bounds);
-		Rect obj_bounds = TransformToQuadChild(m_objects.bounds[object_id], type);
+		// 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)
 		{
-			unsigned index = AddBezierData(new_curves[i]);
-			m_objects.bounds.push_back(obj_bounds);
+			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);
 		}
@@ -155,18 +170,25 @@ int Document::ClipObjectToQuadChild(int object_id, QuadTreeNodeChildren type)
 }
 QuadTreeIndex Document::GenQuadChild(QuadTreeIndex parent, QuadTreeNodeChildren type)
 {
+	PROFILE_SCOPE("Document::GenQuadChild()");
 	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 (IntersectsQuadChild(m_objects.bounds[i], type))
+		for (unsigned i = m_quadtree.nodes[overlay].object_begin; i < m_quadtree.nodes[overlay].object_end; ++i)
 		{
-			m_count += ClipObjectToQuadChild(i, type);
+			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:
@@ -187,21 +209,102 @@ QuadTreeIndex Document::GenQuadChild(QuadTreeIndex parent, QuadTreeNodeChildren
 	return new_index;
 }
 
+void Document::OverlayQuadChildren(QuadTreeIndex orig_parent, QuadTreeIndex parent, QuadTreeNodeChildren type)
+{
+	PROFILE_SCOPE("Document::OverlayQuadChildren()");
+	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:
@@ -269,8 +372,8 @@ void Document::Load(const string & filename)
 			LoadStructVector<Bezier>(file, chunk_size/sizeof(Bezier), m_objects.beziers);
 			break;
 			
-		case CT_OBJGROUPS:
-			Debug("Group data...");
+		case CT_OBJPATHS:
+			Debug("Path data...");
 			Warn("Not handled because lazy");
 			break;
 		}
@@ -284,32 +387,14 @@ void Document::Load(const string & filename)
 #endif
 }
 
-unsigned Document::AddGroup(unsigned start_index, unsigned end_index, const Colour & shading)
+unsigned Document::AddPath(unsigned start_index, unsigned end_index, const Colour & fill, const Colour & stroke)
 {
-	Real xmin = 0; Real ymin = 0; 
-	Real xmax = 0; Real ymax = 0;
-	
-	for (unsigned i = start_index; i <= end_index; ++i)
-	{
-		Rect & objb = m_objects.bounds[i];
-		
-		if (i == start_index || objb.x < xmin)
-			xmin = objb.x;
-		if (i == start_index || (objb.x+objb.w) > xmax)
-			xmax = (objb.x+objb.w);
-			
-		if (i == start_index || objb.y < ymin)
-			ymin = objb.y;
-		if (i == start_index || (objb.y+objb.h) > ymax)
-			ymax = (objb.y+objb.h);
-	}
-	
-	Rect bounds(xmin,ymin, xmax-xmin, ymax-ymin);
-	
-	Group group = {start_index, end_index, shading};
-	
-	unsigned data_index = AddGroupData(group);
-	unsigned result = Add(GROUP, bounds,data_index);
+	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;
 }
 
@@ -320,16 +405,56 @@ 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)
+unsigned Document::Add(ObjectType type, const Rect & bounds, unsigned data_index, QuadTreeIndex qti)
 {
+	PROFILE_SCOPE("Document::Add");
 	m_objects.types.push_back(type);
 	m_objects.bounds.push_back(bounds);
 	m_objects.data_indices.push_back(data_index);
-	return (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-1;
+#else // words fail me (still not amused)
+	return (m_count++);
+#endif
+	
 }
 
 unsigned Document::AddBezierData(const Bezier & bezier)
@@ -338,10 +463,10 @@ unsigned Document::AddBezierData(const Bezier & bezier)
 	return m_objects.beziers.size()-1;
 }
 
-unsigned Document::AddGroupData(const Group & group)
+unsigned Document::AddPathData(const Path & path)
 {
-	m_objects.groups.push_back(group);
-	return m_objects.groups.size()-1;
+	m_objects.paths.push_back(path);
+	return m_objects.paths.size()-1;
 }
 
 void Document::DebugDumpObjects()
@@ -392,12 +517,12 @@ static void GetXYPair(const string & d, Real & x, Real & y, unsigned & i,const s
 {
 	string token("");
 	while (GetToken(d, token, i, delims) == ",");
-	x = strtod(token.c_str(),NULL);
+	x = RealFromStr(token);
 	if (GetToken(d, token, i, delims) != ",")
 	{
 		Fatal("Expected \",\" seperating x,y pair");
 	}
-	y = strtod(GetToken(d, token, i, delims).c_str(),NULL);
+	y = RealFromStr(GetToken(d,token,i,delims));
 }
 
 static bool GetKeyValuePair(const string & d, string & key, string & value, unsigned & i, const string & delims = "()[],{}<>;:=")
@@ -460,11 +585,11 @@ void Document::ParseSVGTransform(const string & s, SVGMatrix & transform)
 		}
 		else if (command == "scale")
 		{
-			delta.a = (strtod(GetToken(s,token,i).c_str(), NULL));
+			delta.a = RealFromStr(GetToken(s,token,i));
 			GetToken(s, token, i);
 			if (token == ",")
 			{
-				delta.d = (strtod(GetToken(s,token,i).c_str(), NULL));
+				delta.d = RealFromStr(GetToken(s,token,i));
 				assert(GetToken(s, token, i) == ")");
 			}
 			else
@@ -495,11 +620,48 @@ void Document::ParseSVGTransform(const string & s, SVGMatrix & transform)
 	}
 }
 
+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;
+}
+
 void Document::ParseSVGNode(pugi::xml_node & root, SVGMatrix & parent_transform)
 {
 	//Debug("Parse node <%s>", root.name());
 
-		
+	
+	// Centre the SVGs
+	if (strcmp(root.name(),"svg") == 0)
+	{
+		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);
+	}
+	
 	for (pugi::xml_node child = root.first_child(); child; child = child.next_sibling())
 	{
 		SVGMatrix transform(parent_transform);	
@@ -524,9 +686,9 @@ void Document::ParseSVGNode(pugi::xml_node & root, SVGMatrix & parent_transform)
 			//Debug("Path data attribute is \"%s\"", d.c_str());
 			bool closed = false;
 			pair<unsigned, unsigned> range = ParseSVGPathData(d, transform, closed);
-			if (closed)
+			if (true && range.first < m_count && range.second < m_count)//(closed)
 			{
-				Colour c(0,0,0,0);
+				
 				string colour_str("");
 				map<string, string> style;
 				if (child.attribute("style"))
@@ -543,41 +705,39 @@ void Document::ParseSVGNode(pugi::xml_node & root, SVGMatrix & parent_transform)
 				{
 					colour_str = style["fill"];
 				}
-				if (colour_str == "red")
-					c = {1,0,0,1};
-				else if (colour_str == "blue")
-					c = {0,0,1,1};
-				else if (colour_str == "green")
-					c = {0,1,0,1};
-				else if (colour_str == "black")
-					c = {0,0,0,1};
-				else if (colour_str == "white")
-					c = {1,1,1,1};
-				else if (colour_str.size() == 7 && colour_str[0] == '#')
+				Colour fill = ParseColourString(colour_str);
+				Colour stroke = fill;
+			
+				if (child.attribute("stroke"))
 				{
-					Debug("Parse colour string: \"%s\"", colour_str.c_str());
-					char comp[2] = {colour_str[1], colour_str[2]};
-					c.r = Real(strtoul(comp, NULL, 16))/Real(255);
-					comp[0] = colour_str[3]; comp[1] = colour_str[4];
-					c.g = Real(strtoul(comp, NULL, 16))/Real(255);
-					comp[0] = colour_str[5]; comp[1] = colour_str[6];
-					c.b = Real(strtoul(comp, NULL, 16))/Real(255);
-					c.a = 1;
-					Debug("Colour is: %f, %f, %f, %f", Float(c.r), Float(c.g), Float(c.b), Float(c.a));
+					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"))
 				{
-					c.a = child.attribute("fill-opacity").as_float();
+					fill.a = 255*child.attribute("fill-opacity").as_float();
 				}
 				else if (style.find("fill-opacity") != style.end())
 				{
-					c.a = strtod(style["fill-opacity"].c_str(), NULL);
+					fill.a = 255*strtod(style["fill-opacity"].c_str(), NULL);
 				}
-				
-					Debug("fill-opacity is %f", Float(c.a));
-				AddGroup(range.first, range.second, c);
+				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);
 			}
 			
 		}
@@ -679,11 +839,11 @@ void Document::LoadSVG(const string & filename, const Rect & bounds)
 	if (!result)
 		Error("Couldn't load \"%s\" - %s", filename.c_str(), result.description());
 		
-	Debug("Loaded XML - %s", 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};
+	SVGMatrix transform = {bounds.w,0 ,bounds.x, 0,bounds.h,bounds.y};
 	ParseSVGNode(doc_xml, transform);
 }
 
@@ -729,9 +889,9 @@ pair<unsigned, unsigned> Document::ParseSVGPathData(const string & d, const SVGM
 		if (command == "m" || command == "M")
 		{
 			//Debug("Construct moveto command");
-			Real dx = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
+			Real dx = RealFromStr(GetToken(d,token,i,delims));
 			assert(GetToken(d,token,i,delims) == ",");
-			Real dy = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
+			Real dy = RealFromStr(GetToken(d,token,i,delims));
 			
 			x[0] = (relative) ? x[0] + dx : dx;
 			y[0] = (relative) ? y[0] + dy : dy;
@@ -744,25 +904,25 @@ pair<unsigned, unsigned> Document::ParseSVGPathData(const string & d, const SVGM
 		else if (command == "c" || command == "C" || command == "q" || command == "Q")
 		{
 			//Debug("Construct curveto command");
-			Real dx = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
+			Real dx = RealFromStr(GetToken(d,token,i,delims));
 			assert(GetToken(d,token,i,delims) == ",");
-			Real dy = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
+			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,delims).c_str(),NULL));
+			dx = RealFromStr(GetToken(d,token,i,delims));
 			assert(GetToken(d,token,i,delims) == ",");
-			dy = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
+			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,delims).c_str(),NULL));
+				dx = RealFromStr(GetToken(d,token,i,delims));
 				assert(GetToken(d,token,i,delims) == ",");
-				dy = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
+				dy = RealFromStr(GetToken(d,token,i,delims));
 				x[3] = (relative) ? x[0] + dx : dx;
 				y[3] = (relative) ? y[0] + dy : dy;
 			}
@@ -795,12 +955,12 @@ pair<unsigned, unsigned> Document::ParseSVGPathData(const string & d, const SVGM
 		{
 			//Debug("Construct lineto command, relative %d", relative);
 		
-			Real dx = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
-			Real dy;
+			Real dx = RealFromStr(GetToken(d,token,i,delims));
+			Real dy = 0;
 			if (command == "l" || command == "L")
 			{
 				assert(GetToken(d,token,i,delims) == ",");
-				dy = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
+				dy = RealFromStr(GetToken(d,token,i,delims));
 			}
 			else if (command == "v" || command == "V")
 			{
@@ -906,7 +1066,8 @@ void Document::AddText(const string & text, Real scale, Real x, Real y)
 	//Real y0(y);
 	int ascent = 0, descent = 0, line_gap = 0;
 	stbtt_GetFontVMetrics(&m_font, &ascent, &descent, &line_gap);
-	float font_scale = scale / (float)(ascent - descent);
+	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)
 	{
@@ -924,9 +1085,9 @@ void Document::AddText(const string & text, Real scale, Real x, Real y)
 		{
 			kerning = stbtt_GetCodepointKernAdvance(&m_font, text[i-1], text[i]);
 		}
-		x += Real(font_scale) * Real(kerning);
+		x += font_scale * Real(kerning);
 		AddFontGlyphAtPoint(&m_font, text[i], font_scale, x, y);
-		x += Real(font_scale) * Real(advance_width);
+		x += font_scale * Real(advance_width);
 	}
 }
 
@@ -982,9 +1143,96 @@ void Document::AddFontGlyphAtPoint(stbtt_fontinfo *font, int character, Real sca
 	
 	if (start_index < m_count && end_index < m_count)
 	{
-		AddGroup(start_index, end_index);
+		AddPath(start_index, end_index);
 	}
-	Debug("Added Glyph \"%c\" at %f %f, scale %f", (char)character, Float(x), Float(y), Float(scale));
+	//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, 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 = transform.a * p.m_bounds.x + transform.e;
+			p.m_bounds.y = transform.d * p.m_bounds.y + transform.f;
+			p.m_bounds.w *= transform.a;
+			p.m_bounds.h *= transform.d;
+		}
+		return;
+	#endif		
+	
+	for (unsigned i = 0; i < m_count; ++i)
+	{
+		if (type == NUMBER_OF_OBJECT_TYPES || m_objects.types[i] == type)
+		{
+			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;
+	}
+
+}
+
+