X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fdocument.cpp;h=c4ba2103748ef4007ffd09ef35708509d8336c75;hp=24746dc137ea3cc57c196a3205b65c111e7bb0ce;hb=16f404f3edf222c467639f3e898eeb505075cde8;hpb=63b52d964e75f9224645c6fbb4ba4387ada506f8

diff --git a/src/document.cpp b/src/document.cpp
index 24746dc..c4ba210 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -545,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
  */
@@ -557,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());
 	
@@ -758,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);
@@ -780,11 +798,11 @@ void Document::AddText(const string & text, Real scale, Real x, Real y)
 		return;
 	}
 		
-	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);
+	float font_scale = scale / (float)(ascent - descent);
 	Real y_advance = Real(font_scale) * Real(ascent - descent + line_gap);
 	for (unsigned i = 0; i < text.size(); ++i)
 	{
@@ -798,11 +816,11 @@ void Document::AddText(const string & text, Real scale, Real x, Real y)
 			
 		int advance_width = 0, left_side_bearing = 0, kerning = 0;
 		stbtt_GetCodepointHMetrics(&m_font, text[i], &advance_width, &left_side_bearing);
-		if (i > 1)
+		if (i >= 1)
 		{
 			kerning = stbtt_GetCodepointKernAdvance(&m_font, text[i-1], text[i]);
 		}
-		x += Real(font_scale) * Real(left_side_bearing + kerning);
+		x += Real(font_scale) * Real(kerning);
 		AddFontGlyphAtPoint(&m_font, text[i], font_scale, x, y);
 		x += Real(font_scale) * Real(advance_width);
 	}
@@ -862,6 +880,7 @@ void Document::AddFontGlyphAtPoint(stbtt_fontinfo *font, int character, Real sca
 	{
 		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);
 }