X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fdocument.cpp;h=dab086864e603d641a18c7d27ad8c0a2ea594822;hp=9ac96b39b8a09c0040add9d4358e809d8a9ed35c;hb=c1b5126edfd81846a0ecf19c6dcb9c0476df2196;hpb=255065a607d82846c4a8b730000d547b3f080d0c

diff --git a/src/document.cpp b/src/document.cpp
index 9ac96b3..dab0868 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -97,9 +97,48 @@ 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.root_id = 0;
 	GenQuadChild(0, QTC_TOP_LEFT);
-	GenQuadParent(0, QTC_BOTTOM_RIGHT);
 }
 
+int Document::ClipObjectToQuadChild(int object_id, QuadTreeNodeChildren type)
+{
+	switch (m_objects.types[object_id])
+	{
+	case RECT_FILLED:
+	case RECT_OUTLINE:
+		{
+		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;
+		}
+	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();
@@ -108,12 +147,9 @@ QuadTreeIndex Document::GenQuadChild(QuadTreeIndex parent, QuadTreeNodeChildren
 	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)
 	{
-		if (ContainedInQuadChild(m_objects.bounds[i], type))
+		if (IntersectsQuadChild(m_objects.bounds[i], type))
 		{
-			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++;
+			m_count += ClipObjectToQuadChild(i, type);
 		}
 	}
 	m_quadtree.nodes[new_index].object_end = m_objects.bounds.size();
@@ -291,7 +327,8 @@ static string & GetToken(const string & d, string & token, unsigned & i, const s
 static void GetXYPair(const string & d, Real & x, Real & y, unsigned & i,const string & delims = "()[],{}<>;:=")
 {
 	string token("");
-	x = strtod(GetToken(d, token, i, delims).c_str(),NULL);
+	while (GetToken(d, token, i, delims) == ",");
+	x = strtod(token.c_str(),NULL);
 	if (GetToken(d, token, i, delims) != ",")
 	{
 		Fatal("Expected \",\" seperating x,y pair");
@@ -299,7 +336,7 @@ static void GetXYPair(const string & d, Real & x, Real & y, unsigned & i,const s
 	y = strtod(GetToken(d, token, i, delims).c_str(),NULL);
 }
 
-static void TransformXYPair(Real & x, Real & y, SVGMatrix & transform)
+static void TransformXYPair(Real & x, Real & y, const SVGMatrix & transform)
 {
 	Real x0(x);
 	x = transform.a * x + transform.c * y + transform.e;
@@ -312,57 +349,70 @@ void Document::ParseSVGTransform(const string & s, SVGMatrix & transform)
 	string token;
 	string command;
 	unsigned i = 0;
-	GetToken(s, command, i);
-	Debug("Token is \"%s\"", command.c_str());
 	
-	SVGMatrix delta = {1,0,0,1,0,0};
+	while (i < s.size())
+	{
+		GetToken(s, command, i);
+		if (command == "," || command == "" || command == ":")
+		{
+			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")
-	{
-		GetXYPair(s, delta.e, delta.f, i);
-		assert(GetToken(s,token, i) == ")");	
-	}
-	else if (command == "matrix")
-	{
-		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 = (strtod(GetToken(s,token,i).c_str(), NULL));
-		GetToken(s, token, i);
-		if (token != ")")
+	
+		assert(GetToken(s,token, i) == "(");
+		if (command == "translate")
+		{
+			GetXYPair(s, delta.e, delta.f, i);
+			assert(GetToken(s,token, i) == ")");	
+		}
+		else if (command == "matrix")
 		{
-			delta.b = (strtod(token.c_str(), NULL));
+			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 = (strtod(GetToken(s,token,i).c_str(), NULL));
+			GetToken(s, token, i);
+			if (token == ",")
+			{
+				delta.d = (strtod(GetToken(s,token,i).c_str(), NULL));
+				assert(GetToken(s, token, i) == ")");
+			}
+			else
+			{
+				delta.d = delta.a;
+				assert(token == ")");
+			}
+			
 		}
 		else
 		{
-			delta.b = delta.a;
+			Warn("Unrecognised transform \"%s\", using identity", command.c_str());
 		}
-		
-	}
-	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);
+		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);
 	
-	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;
+		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;
+		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);
+		Debug("New transform is {%f,%f,%f,%f,%f,%f}", transform.a, transform.b, transform.c, transform.d,transform.e,transform.f);
+	}
 }
 
 void Document::ParseSVGNode(pugi::xml_node & root, SVGMatrix & parent_transform)
@@ -465,8 +515,8 @@ void Document::LoadSVG(const string & filename, const Rect & bounds)
 	Debug("Loaded XML - %s", result.description());
 	
 	input.close();
-
-	SVGMatrix transform = {bounds.w, 0,bounds.x, bounds.h,0,bounds.y};
+						// a c e, b d f
+	SVGMatrix transform = {bounds.w, 0,bounds.x, 0,bounds.h,bounds.y};
 	ParseSVGNode(doc_xml, transform);
 }
 
@@ -490,9 +540,9 @@ void Document::ParseSVGPathData(const string & d, const SVGMatrix & transform)
 	
 	bool start = false;
 	
-	static string delims("()[],{}<>;:=LlmMqQzZcC");
+	static string delims("()[],{}<>;:=LlHhVvmMqQzZcC");
 	
-	while (i < d.size() && GetToken(d, token, i).size() > 0)
+	while (i < d.size() && GetToken(d, token, i, delims).size() > 0)
 	{
 		if (isalpha(token[0]))
 			command = token;
@@ -508,14 +558,12 @@ void Document::ParseSVGPathData(const string & d, const SVGMatrix & transform)
 		if (command == "m" || command == "M")
 		{
 			//Debug("Construct moveto command");
-			Real dx = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL)) * transform.a;
+			Real dx = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
 			assert(GetToken(d,token,i,delims) == ",");
-			Real dy = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL)) * transform.d;
+			Real dy = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
 			
-			x[0] = (relative) ? x[0] + dx : dx + transform.e;
-			y[0] = (relative) ? y[0] + dy : dy + transform.f;
-			
-
+			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 = (command == "m") ? "l" : "L";
@@ -523,27 +571,27 @@ void Document::ParseSVGPathData(const string & d, const SVGMatrix & transform)
 		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)) * transform.a;
+			Real dx = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
 			assert(GetToken(d,token,i,delims) == ",");
-			Real dy = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL))*transform.d;
+			Real dy = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
 			
-			x[1] = (relative) ? x[0] + dx : dx + transform.e;
-			y[1] = (relative) ? y[0] + dy : dy + transform.f;
+			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)) *transform.a;
+			dx = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
 			assert(GetToken(d,token,i,delims) == ",");
-			dy = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL)) *transform.d;
+			dy = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
 			
-			x[2] = (relative) ? x[0] + dx : dx + transform.e;
-			y[2] = (relative) ? y[0] + dy : dy + transform.f;
+			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)) *transform.a;
+				dx = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
 				assert(GetToken(d,token,i,delims) == ",");
-				dy = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL)) *transform.d;
-				x[3] = (relative) ? x[0] + dx : dx + transform.e;
-				y[3] = (relative) ? y[0] + dy : dy + transform.f;
+				dy = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
+				x[3] = (relative) ? x[0] + dx : dx;
+				y[3] = (relative) ? y[0] + dy : dy;
 			}
 			else
 			{
@@ -556,41 +604,63 @@ void Document::ParseSVGPathData(const string & d, const SVGMatrix & transform)
 				y[2] = y[3] + Real(2) * (old_y1 - y[3])/ Real(3);
 			}
 			
+			Real x3(x[3]);
+			Real y3(y[3]);
+			for (int j = 0; j < 4; ++j)
+				TransformXYPair(x[j],y[j], 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);
 			
 			
 			//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,delims).c_str(),NULL)) *transform.a;
-			assert(GetToken(d,token,i,delims) == ",");
-			Real dy = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL)) *transform.d;
+			Real dx = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
+			Real dy;
+			if (command == "l" || command == "L")
+			{
+				assert(GetToken(d,token,i,delims) == ",");
+				dy = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL));
+			}
+			else if (command == "v" || command == "V")
+			{
+				swap(dx,dy);
+			}
 			
-			x[1] = (relative) ? x[0] + dx : dx + transform.e;
-			y[1] = (relative) ? y[0] + dy : dy + transform.f;
+			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]));
+
+			unsigned index = AddBezierData(Bezier(x[0],y[0],x[1],y[1],x[1],y[1],x[1],y[1]));
 			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[3];
-			y[0] = y[3];
+			x[0] = x1;
+			y[0] = y1;
 
 		}
 		else if (command == "z" || command == "Z")
@@ -603,13 +673,18 @@ void Document::ParseSVGPathData(const string & d, const SVGMatrix & transform)
 			x[3] = x0;
 			y[3] = y0;
 			
+			Real x3(x[3]);
+			Real y3(y[3]);
+			for (int j = 0; j < 4; ++j)
+				TransformXYPair(x[j],y[j], 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);
 			
 			//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";
 		}
 		else
@@ -660,18 +735,28 @@ void Document::AddText(const string & text, Real scale, Real x, Real y)
 	float font_scale = stbtt_ScaleForPixelHeight(&m_font, scale);
 	Real x0(x);
 	//Real y0(y);
+	int ascent = 0, descent = 0, line_gap = 0;
+	stbtt_GetFontVMetrics(&m_font, &ascent, &descent, &line_gap);
+	Real y_advance = Real(font_scale) * Real(ascent - descent + line_gap);
 	for (unsigned i = 0; i < text.size(); ++i)
 	{
 		if (text[i] == '\n')
 		{
-			y += 0.5*scale;
+			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 += Real(font_scale) * Real(left_side_bearing + kerning);
 		AddFontGlyphAtPoint(&m_font, text[i], font_scale, x, y);
-		x += 0.5*scale;
+		x += Real(font_scale) * Real(advance_width);
 	}
 }