Merge branch 'master' of git.ucc.asn.au:ipdf/code

diff --git a/src/document.cpp b/src/document.cpp
index cb52986..3105629 100644 (file)
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -3,6 +3,8 @@
 #include <cstdio>
 #include <fstream>
 
+#include "../contrib/pugixml-1.4/src/pugixml.cpp"
+
 #include "stb_truetype.h"
 
 using namespace IPDF;
@@ -259,111 +261,219 @@ 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;
+       token.clear();
+       while (i < d.size() && iswspace(d[i]))
+       {
+               ++i;
+       }
        
-       xml_document doc_xml;
-       ifstream input(filename.c_str(), ios_base::in);
-       xml_parse_result result = doc_xml.load(input);
+       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;
+}
+
+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);
+       if (GetToken(d, token, i, delims) != ",")
+       {
+               Fatal("Expected \",\" seperating x,y pair");
+       }
+       y = strtod(GetToken(d, token, i, delims).c_str(),NULL);
+}
+
+static void TransformXYPair(Real & x, Real & y, 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;
+       GetToken(s, command, i);
+       Debug("Token is \"%s\"", command.c_str());
        
-       if (!result)
-               Fatal("Couldn't load \"%s\" - %s", filename.c_str(), result.description());
+       SVGMatrix delta = {1,0,0,1,0,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 != ")")
+               {
+                       delta.b = (strtod(token.c_str(), NULL));
+               }
+               else
+               {
+                       delta.b = delta.a;
+               }
                
-       Debug("Loaded XML - %s", result.description());
+       }
+       else
+       {
+               Warn("Unrecognised transform \"%s\", using identity", command.c_str());
+       }
        
-       input.close();
+       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;
+       
+       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);
+}
+
+void Document::ParseSVGNode(pugi::xml_node & root, SVGMatrix & parent_transform)
+{
+       Debug("Parse node <%s>", root.name());
 
-       // Combine all SVG tags into one thing because lazy
-       for (xml_node svg : doc_xml.children("svg"))
-       {
-               Real width = Real(svg.attribute("width").as_float()) * bounds.w;
-               Real height = Real(svg.attribute("width").as_float()) * bounds.h;
                
+       for (pugi::xml_node child = root.first_child(); child; child = child.next_sibling())
+       {
+               SVGMatrix transform(parent_transform);  
+               pugi::xml_attribute attrib_trans = child.attribute("transform");
+               if (!attrib_trans.empty())
+               {
+                       ParseSVGTransform(attrib_trans.as_string(), transform);
+               }
                
-               // Rectangles
-               Real coords[4];
-               const char * attrib_names[] = {"x", "y", "width", "height"};
-               for (pugi::xml_node rect : svg.children("rect"))
+               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());
+                       ParseSVGPathData(d, transform);
+               }
+               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);
+                       unsigned index = AddBezierData(Bezier(x0,y0,x1,y1,x1,y1,x1,y1));
+                       Add(BEZIER, Rect(0,0,1,1), index);
+               }
+               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] = rect.attribute(attrib_names[i]).as_float();
+                               coords[i] = child.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"))
+                       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 = circle.attribute("cx").as_float();
-                       Real cy = circle.attribute("cy").as_float();
-                       Real r = circle.attribute("r").as_float();
+                       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
                        
-                       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"))
+                       Debug("Added Circle %s", rect.Str().c_str());                   
+               }
+               else if (strcmp(child.name(), "text") == 0)
                {
-                       
-                       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));
-                       
+                       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);
                }
        }
+}
+
+/**
+ * Load an SVG into a rectangle
+ */
+void Document::LoadSVG(const string & filename, const Rect & bounds)
+{
+       using namespace pugi;
        
-       //Fatal("Done");
+       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());
        
+       input.close();
 
+       SVGMatrix transform = {bounds.w, 0,bounds.x, bounds.h,0,bounds.y};
+       ParseSVGNode(doc_xml, transform);
 }
 
-// Behold my amazing tokenizing abilities
-static string & GetToken(const string & d, string & token, unsigned & i)
-{
-       token.clear();
-       while (i < d.size() && iswspace(d[i]))
-       {
-               ++i;
-       }
-       
-       while (i < d.size())
-       {
-               if (d[i] == ',' || (isalpha(d[i]) && d[i] != 'e') || iswspace(d[i]))
-               {
-                       if (token.size() == 0 && !iswspace(d[i]))
-                       {
-                               token += d[i++];
-                       }
-                       break;  
-               }
-               token += d[i++];
-       }
-       Debug("Got token \"%s\"", token.c_str());
-       return token;
-}
 
 
 // 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)
+void Document::ParseSVGPathData(const string & d, const SVGMatrix & transform)
 {
        Real x[4] = {0,0,0,0};
        Real y[4] = {0,0,0,0};
@@ -379,6 +489,8 @@ void Document::AddPathFromString(const string & d, const Rect & bounds)
        
        bool start = false;
        
+       static string delims("()[],{}<>;:=LlmMqQzZcC");
+       
        while (i < d.size() && GetToken(d, token, i).size() > 0)
        {
                if (isalpha(token[0]))
@@ -394,43 +506,43 @@ 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 = 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;
                        
-                       x[0] = (relative) ? x[0] + dx : dx;
-                       y[0] = (relative) ? y[0] + dy : dy;
+                       x[0] = (relative) ? x[0] + dx : dx + transform.e;
+                       y[0] = (relative) ? y[0] + dy : dy + transform.f;
                        
 
                        
-                       Debug("mmoveto %f,%f", Float(x[0]),Float(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 = 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;
                        
-                       x[1] = (relative) ? x[0] + dx : dx;
-                       y[1] = (relative) ? y[0] + dy : dy;
+                       x[1] = (relative) ? x[0] + dx : dx + transform.e;
+                       y[1] = (relative) ? y[0] + dy : dy + transform.f;
                        
-                       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 = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL)) *transform.a;
+                       assert(GetToken(d,token,i,delims) == ",");
+                       dy = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL)) *transform.d;
                        
-                       x[2] = (relative) ? x[0] + dx : dx;
-                       y[2] = (relative) ? y[0] + dy : dy;
+                       x[2] = (relative) ? x[0] + dx : dx + transform.e;
+                       y[2] = (relative) ? y[0] + dy : dy + transform.f;
                        
                        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;
-                               x[3] = (relative) ? x[0] + dx : dx;
-                               y[3] = (relative) ? y[0] + dy : dy;
+                               dx = Real(strtod(GetToken(d,token,i,delims).c_str(),NULL)) *transform.a;
+                               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;
                        }
                        else
                        {
@@ -447,7 +559,7 @@ void Document::AddPathFromString(const string & d, const Rect & bounds)
                        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]));
+                       //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];
@@ -456,14 +568,14 @@ void Document::AddPathFromString(const string & d, const Rect & bounds)
                }
                else if (command == "l" || command == "L")
                {
-                       Debug("Construct lineto command");
+                       //Debug("Construct lineto 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;
+                       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;
                        
-                       x[1] = (relative) ? x[0] + dx : dx;
-                       y[1] = (relative) ? y[0] + dy : dy;
+                       x[1] = (relative) ? x[0] + dx : dx + transform.e;
+                       y[1] = (relative) ? y[0] + dy : dy + transform.f;
                        
                        x[2] = x[1];
                        y[2] = y[1];
@@ -474,7 +586,7 @@ void Document::AddPathFromString(const string & d, const Rect & bounds)
                        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] 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];
@@ -482,7 +594,7 @@ void Document::AddPathFromString(const string & d, const Rect & bounds)
                }
                else if (command == "z" || command == "Z")
                {
-                       Debug("Construct returnto command");
+                       //Debug("Construct returnto command");
                        x[1] = x0;
                        y[1] = y0;
                        x[2] = x0;
@@ -493,7 +605,7 @@ void Document::AddPathFromString(const string & d, const Rect & bounds)
                        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]));
+                       //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];
@@ -515,6 +627,53 @@ void Document::AddPathFromString(const string & d, const Rect & bounds)
        }
 }
 
+void Document::SetFont(const string & font_filename)
+{
+       if (m_font_data != NULL)
+       {
+               free(m_font_data);
+       }
+       
+       FILE *font_file = fopen("DejaVuSansMono.ttf", "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;
+       }
+               
+       float font_scale = stbtt_ScaleForPixelHeight(&m_font, scale);
+       Real x0(x);
+       //Real y0(y);
+       for (unsigned i = 0; i < text.size(); ++i)
+       {
+               if (text[i] == '\n')
+               {
+                       y += 0.5*scale;
+                       x = x0;
+               }
+               if (!isprint(text[i]))
+                       continue;
+                       
+               AddFontGlyphAtPoint(&m_font, text[i], font_scale, x, y);
+               x += 0.5*scale;
+       }
+}
+
 void Document::AddFontGlyphAtPoint(stbtt_fontinfo *font, int character, Real scale, Real x, Real y)
 {
        int glyph_index = stbtt_FindGlyphIndex(font, character);

diff --git a/src/document.h b/src/document.h
index c1f026b..52e9295 100644 (file)
--- a/src/document.h
+++ b/src/document.h
@@ -4,17 +4,40 @@
 #include "ipdf.h"
 #include "quadtree.h"
 
+#include "../contrib/pugixml-1.4/src/pugixml.hpp"
+#include "stb_truetype.h"
+
 typedef struct stbtt_fontinfo stbtt_fontinfo;
 
 namespace IPDF
 {
+       struct SVGMatrix
+       {
+               Real a; // width
+               Real b; // skew y by x
+               Real c; // skew x by y
+               Real d; // height
+               Real e; // translate x
+               Real f; // translate y
+       };
+       // SVG matrix transforms (x,y) <- (a x' + c y' + e, b x' + d y' + f)
+       // Equivelant to OpenGL 3d matrix transform ((a, c, e) (b, d, f) (0,0,1))
+       
        class Document
        {
                public:
-                       Document(const std::string & filename = "") : m_objects(), m_count(0) {Load(filename);}
-                       virtual ~Document() {}
+                       Document(const std::string & filename = "", const std::string & font_filename = "DejaVuSansMono.ttf") : m_objects(), m_count(0), m_font_data(NULL), m_font()
+                       {
+                               Load(filename);
+                               if (font_filename != "")
+                                       SetFont(font_filename);
+                       }
+                       virtual ~Document() 
+                       {
+                               free(m_font_data);
+                       }
+                       
                        
-                       void LoadSVG(const std::string & filename, const Rect & bounds = {0,0,1,1});
 
                        void Load(const std::string & filename = "");
                        void Save(const std::string & filename);
@@ -29,8 +52,29 @@ namespace IPDF
                        void Add(ObjectType type, const Rect & bounds, unsigned data_index = 0);
                        unsigned AddBezierData(const Bezier & bezier);
                        
-                       void AddPathFromString(const std::string & d, const Rect & bounds);
 
+
+                       
+
+                       
+                       
+                       /** SVG Related functions **/
+                       
+                       /** Load an SVG text file and add to the document **/
+                       void LoadSVG(const std::string & filename, const Rect & bounds = Rect(0,0,1,1));
+                       
+                       /** Parse an SVG node or SVG-group node, adding children to the document **/
+                       void ParseSVGNode(pugi::xml_node & root, SVGMatrix & transform);
+                       /** Parse an SVG path with string **/
+                       void ParseSVGPathData(const std::string & d, const SVGMatrix & transform);
+                       
+                       /** Modify an SVG transformation matrix **/
+                       static void ParseSVGTransform(const std::string & s, SVGMatrix & transform);
+
+                       /** Font related functions **/
+                       void SetFont(const std::string & font_filename);
+                       void AddText(const std::string & text, Real scale, Real x, Real y);
+                       
                        void AddFontGlyphAtPoint(stbtt_fontinfo *font, int character, Real scale, Real x, Real y);
 
 #ifndef QUADTREE_DISABLED
@@ -47,6 +91,9 @@ namespace IPDF
                        void GenBaseQuadtree();
 #endif
                        unsigned m_count;
+                       unsigned char * m_font_data;
+                       stbtt_fontinfo m_font;
+               
                        
 
        };

diff --git a/src/main.cpp b/src/main.cpp
index d5d4da8..8942a9c 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,6 +1,6 @@
 #include "main.h"
 #include <unistd.h> // Because we can.
-#include "stb_truetype.h"
+
 int main(int argc, char ** argv)
 {      
        #ifndef __STDC_IEC_559__
@@ -78,7 +78,7 @@ int main(int argc, char ** argv)
 
        if (input_filename != NULL)
        {
-               doc.LoadSVG(input_filename);
+               doc.LoadSVG(input_filename, Rect(0,0,Real(1)/Real(800),Real(1)/Real(600)));
        }
        else 
        {
@@ -87,25 +87,10 @@ int main(int argc, char ** argv)
                doc.AddBezierData(Bezier(0,0,1,1,1,0));
                doc.AddBezierData(Bezier(0,1,1,0,0,1));*/
                
-               stbtt_fontinfo font;
-               FILE *font_file = fopen("DejaVuSansMono.ttf", "rb");
-               fseek(font_file, 0, SEEK_END);
-               size_t font_file_size = ftell(font_file);
-               fseek(font_file, 0, SEEK_SET);
-               unsigned char *font_file_data = (unsigned char*)malloc(font_file_size);
-               SDL_assert(fread(font_file_data, 1, font_file_size, font_file) == font_file_size);
-               fclose(font_file);
-               stbtt_InitFont(&font, font_file_data, 0);
-
-               float font_scale = stbtt_ScaleForPixelHeight(&font, 1);
-               doc.AddFontGlyphAtPoint(&font,'a', Real(font_scale), Real(0), Real(1));  
-               doc.AddFontGlyphAtPoint(&font,'b', Real(font_scale), Real(0.5), Real(1));  
-               doc.AddFontGlyphAtPoint(&font,'c', Real(font_scale), Real(1), Real(1));  
-               doc.AddFontGlyphAtPoint(&font,'d', Real(font_scale), Real(1.5), Real(1));  
-
-               free(font_file_data);
-               
+       
                
+               doc.AddText("abcde", 0.5, Real(0), Real(1));
+
                for(int x = 0; x < 8; ++x)
                {
                        

diff --git a/src/svg-tests/koch1.svg b/src/svg-tests/koch1.svg
index 2305547..f1bd3e8 120000 (symlink)
--- a/src/svg-tests/koch1.svg
+++ b/src/svg-tests/koch1.svg
@@ -1 +1 @@
-/home/sam/ipdf/sam/figures/koch1.svg
\ No newline at end of file
+../../../sam/figures/koch1.svg
\ No newline at end of file

diff --git a/src/svg-tests/lines.svg b/src/svg-tests/lines.svg
new file mode 100644 (file)
index 0000000..f15c961
--- /dev/null
+++ b/src/svg-tests/lines.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     width="400" height="400">
+    <line x1="0" y1="0" x2="400" y2="0" stroke="red"/>
+    
+    <line x1="0" y1="0" x2="0" y2="400" stroke="red"/>
+    
+    <line x1="400" y1="0" x2="400" y2="400" stroke="red"/>
+    
+    <line x1="0" y1="400" x2="400" y2="400" stroke="red"/>
+    
+       <line 
+               x1="0" y1="0" x2="400" y2="400" stroke="black"/>
+
+       <line
+               x1="400" y1="0" x2="0" y2="400" stroke="black"/>
+</svg>

diff --git a/src/svg-tests/paths.svg b/src/svg-tests/paths.svg
new file mode 100644 (file)
index 0000000..dd72201
--- /dev/null
+++ b/src/svg-tests/paths.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     width="400" height="400"
+   >
+       <g   transform="translate(-230,-250)">
+    <path
+       style="fill:#ac9d93;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="m 478.78564,339.0153 -16.66751,-1.01016 -36.11296,-47.7297 -12.6269,-33.0825 28.53681,17.17259 23.2335,24.4962 10.35407,21.97082 z"
+       id="path4374"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ac9d93;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="m 451.25899,350.37951 -51.26524,-30.55711 -27.52666,-37.12311 -0.25254,-6.81853 30.30458,4.29315 23.23351,11.11168 24.74873,26.5165 12.62691,21.71828 z"
+       id="path4370"
+       inkscape:connector-curvature="0" />
+       
+           <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 25,158.21333 36.071428,144.28476 l 20,20 Z"
+       id="path4498"
+       inkscape:connector-curvature="0"
+       transform="translate(227.32245,266.11266)" />
+       </g>
+ </svg>

diff --git a/src/svg-tests/rabbit_simple.svg b/src/svg-tests/rabbit_simple.svg
index 30fed1a..83b5f92 120000 (symlink)
--- a/src/svg-tests/rabbit_simple.svg
+++ b/src/svg-tests/rabbit_simple.svg
@@ -1 +1 @@
-/home/sam/ipdf/sam/figures/rabbit_simple.svg
\ No newline at end of file
+../../../sam/figures/rabbit_simple.svg
\ No newline at end of file

diff --git a/src/svg-tests/shape.svg b/src/svg-tests/shape.svg
index 62d71a8..1ee4bea 120000 (symlink)
--- a/src/svg-tests/shape.svg
+++ b/src/svg-tests/shape.svg
@@ -1 +1 @@
-/home/sam/ipdf/sam/figures/shape.svg
\ No newline at end of file
+../../../sam/figures/shape.svg
\ No newline at end of file

diff --git a/src/svg-tests/text.svg b/src/svg-tests/text.svg
new file mode 100644 (file)
index 0000000..7c572c6
--- /dev/null
+++ b/src/svg-tests/text.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     width="400" height="400">
+       <text x="200" y="100">Example SVG text 1</text>
+       <line x1="10" y1="40" x2="200" y2="40" stroke="black"/>
+</svg>

diff --git a/src/svg-tests/transforms.svg b/src/svg-tests/transforms.svg
new file mode 100644 (file)
index 0000000..e840314
--- /dev/null
+++ b/src/svg-tests/transforms.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
+<svg xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     width="400" height="400">
+    <rect x="0" y="0" width="400" height="400" stroke="red" fill="none"/>
+    
+    
+    <rect x="0" y="0" width="100" height="100" stroke="blue" fill="none"
+               transform="translate(100,100)"
+    />
+    
+    <rect x="100" y="50" width="25" height="25" stroke="green" fill="none"
+               transform="scale(2,2)"
+       />
+       
+       <!--<rect x="200" y="150" width="50" height="75" stroke="red" fill="none"
+               
+       />-->
+    
+</svg>

diff --git a/src/tests/realops.cpp b/src/tests/realops.cpp
index b9ce441..61d747c 100644 (file)
--- a/src/tests/realops.cpp
+++ b/src/tests/realops.cpp
@@ -1,3 +1,7 @@
+/**
+ * Test mathematical operations on the Real type and consistency with double
+ */
+
 #include "main.h"
 #include "real.h"