X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fdocument.cpp;h=e0dd70bbff6e707b0c822094db1150c97449d10f;hp=6754faaf208e8af824c1b190f2f04d6509766093;hb=d9c0c3792133f87cd224dc22be428be8ddc016d8;hpb=cd26bd861a5924a8c1b8d801bfc813f12b747179

diff --git a/src/document.cpp b/src/document.cpp
index 6754faa..e0dd70b 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -130,6 +130,8 @@ int Document::ClipObjectToQuadChild(int object_id, QuadTreeNodeChildren type)
 		m_objects.data_indices.push_back(m_objects.data_indices[object_id]);
 		return 1;
 		}
+	case GROUP:
+		break;
 	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));
@@ -287,7 +289,7 @@ unsigned Document::AddGroup(unsigned start_index, unsigned end_index)
 		if (i == start_index || objb.y < ymin)
 			ymin = objb.y;
 		if (i == start_index || (objb.y+objb.h) > ymax)
-			ymax = objb.y;
+			ymax = (objb.y+objb.h);
 	}
 	
 	Rect bounds(xmin,ymin, xmax-xmin, ymax-ymin);
@@ -297,10 +299,15 @@ unsigned Document::AddGroup(unsigned start_index, unsigned end_index)
 	return result;
 }
 
+/**
+ * Add a Bezier using Absolute coords
+ */
 unsigned Document::AddBezier(const Bezier & bezier)
 {
-	unsigned index = AddBezierData(bezier);
-	return Add(BEZIER, bezier.SolveBounds(), index);
+	Rect bounds = bezier.SolveBounds();
+	Bezier data = bezier.ToRelative(bounds); // Relative
+	unsigned index = AddBezierData(data);
+	return Add(BEZIER, bounds, index);
 }
 
 unsigned Document::Add(ObjectType type, const Rect & bounds, unsigned data_index)
@@ -384,7 +391,7 @@ static void TransformXYPair(Real & x, Real & y, const SVGMatrix & transform)
 
 void Document::ParseSVGTransform(const string & s, SVGMatrix & transform)
 {
-	Debug("Parsing transform %s", s.c_str());
+	//Debug("Parsing transform %s", s.c_str());
 	string token;
 	string command;
 	unsigned i = 0;
@@ -399,7 +406,7 @@ void Document::ParseSVGTransform(const string & s, SVGMatrix & transform)
 			else
 				return;
 		}
-		Debug("Token is \"%s\"", command.c_str());
+		//Debug("Token is \"%s\"", command.c_str());
 	
 		SVGMatrix delta = {1,0,0,0,1,0};
 	
@@ -438,8 +445,8 @@ void Document::ParseSVGTransform(const string & s, SVGMatrix & transform)
 			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;
@@ -450,13 +457,13 @@ void Document::ParseSVGTransform(const string & s, SVGMatrix & transform)
 		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)
 {
-	Debug("Parse node <%s>", root.name());
+	//Debug("Parse node <%s>", root.name());
 
 		
 	for (pugi::xml_node child = root.first_child(); child; child = child.next_sibling())
@@ -538,6 +545,24 @@ void Document::ParseSVGNode(pugi::xml_node & root, SVGMatrix & parent_transform)
 	}
 }
 
+/**
+ * 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
  */
@@ -550,7 +575,7 @@ void Document::LoadSVG(const string & filename, const Rect & bounds)
 	xml_parse_result result = doc_xml.load(input);
 	
 	if (!result)
-		Fatal("Couldn't load \"%s\" - %s", filename.c_str(), result.description());
+		Error("Couldn't load \"%s\" - %s", filename.c_str(), result.description());
 		
 	Debug("Loaded XML - %s", result.description());
 	
@@ -608,6 +633,8 @@ pair<unsigned, unsigned> Document::ParseSVGPathData(const string & d, const SVGM
 			x[0] = (relative) ? x[0] + dx : dx;
 			y[0] = (relative) ? y[0] + dy : dy;
 			
+			x0 = x[0];
+			y0 = y[0];
 			//Debug("mmoveto %f,%f", Float(x[0]),Float(y[0]));
 			command = (command == "m") ? "l" : "L";
 		}
@@ -749,7 +776,7 @@ void Document::SetFont(const string & font_filename)
 		free(m_font_data);
 	}
 	
-	FILE *font_file = fopen("DejaVuSansMono.ttf", "rb");
+	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);
@@ -793,7 +820,8 @@ 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(left_side_bearing + kerning);
+		Debug("%c: lsb %d, kern %d, adv_width %d", text[i], left_side_bearing, kerning, advance_width);
+		x += Real(font_scale) * Real(kerning);
 		AddFontGlyphAtPoint(&m_font, text[i], font_scale, x, y);
 		x += Real(font_scale) * Real(advance_width);
 	}
@@ -813,7 +841,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:
@@ -826,7 +855,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
@@ -834,8 +863,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:
@@ -843,11 +871,17 @@ 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 = 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,
+			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));
 			break;
 		}
 	}
+	
+	if (start_index < m_count && end_index < m_count)
+	{
+		AddGroup(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);
 }