X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fdocument.h;h=6592f4b9d1257248c41b551a256e6c8449fdf405;hp=8e63f5ba0555555db6b0fe026353a432b812561b;hb=e35bf651e7ebfe4932e877780bb00397c41a7ec2;hpb=208cee1f6967db42329a3e665401ef51b3f6d9ff

diff --git a/src/document.h b/src/document.h
index 8e63f5b..6592f4b 100644
--- a/src/document.h
+++ b/src/document.h
@@ -5,17 +5,38 @@
 #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 c; // skew x by y
+		Real e; // translate x
+		
+		Real b; // skew y by x
+		Real d; // height
+		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);
+			}
 			
 			
 
@@ -29,10 +50,15 @@ namespace IPDF
 			bool operator==(const Document & equ) const;
 			bool operator!=(const Document & equ) const {return !(this->operator==(equ));}
 
-			void Add(ObjectType type, const Rect & bounds, unsigned data_index = 0);
+			unsigned AddGroup(unsigned start_index, unsigned end_index);
+			unsigned AddBezier(const Bezier & bezier);
+			unsigned Add(ObjectType type, const Rect & bounds, unsigned data_index = 0);
 			unsigned AddBezierData(const Bezier & bezier);
 			
+
+
 			
+
 			
 			
 			/** SVG Related functions **/
@@ -41,16 +67,25 @@ namespace IPDF
 			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, const Rect & bounds, Real & width, Real & height);
+			void ParseSVGNode(pugi::xml_node & root, SVGMatrix & transform);
 			/** Parse an SVG path with string **/
-			void ParseSVGPathData(const std::string & d, const Rect & bounds);
+			std::pair<unsigned, unsigned> 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
 			inline const QuadTree& GetQuadTree() { if (m_quadtree.root_id == QUADTREE_EMPTY) { GenBaseQuadtree(); } return m_quadtree; }
 			QuadTreeIndex GenQuadChild(QuadTreeIndex parent, QuadTreeNodeChildren type);
 			QuadTreeIndex GenQuadParent(QuadTreeIndex child, QuadTreeNodeChildren mytype);
+			// Returns the number of objects the current object formed when clipped, the objects in question are added to the end of the document.
+			int ClipObjectToQuadChild(int object_id, QuadTreeNodeChildren type);
 #endif
 
 		private:
@@ -61,6 +96,9 @@ namespace IPDF
 			void GenBaseQuadtree();
 #endif
 			unsigned m_count;
+			unsigned char * m_font_data;
+			stbtt_fontinfo m_font;
+		
 			
 
 	};