X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fdocument.h;h=8f2c0875edec5d0b0eae4cbc7ca030e6f4cc893d;hp=62f624cf2531375e4e9feb5c2c274e9cf13ca095;hb=1ba642be477818ba73be34b5e96484b5e91d8c66;hpb=239870c67910883756cffe6c963c7f7fa44402b9

diff --git a/src/document.h b/src/document.h
index 62f624c..8f2c087 100644
--- a/src/document.h
+++ b/src/document.h
@@ -4,6 +4,9 @@
 #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
@@ -11,10 +14,18 @@ namespace IPDF
 	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 = Rect(0,0,1,1));
 
 			void Load(const std::string & filename = "");
 			void Save(const std::string & filename);
@@ -29,8 +40,22 @@ 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, const Rect & bounds, Real & width, Real & height);
+			/** Parse an SVG path with string **/
+			void ParseSVGPathData(const std::string & d, const Rect & bounds);
+
+			/** 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 +72,9 @@ namespace IPDF
 			void GenBaseQuadtree();
 #endif
 			unsigned m_count;
+			unsigned char * m_font_data;
+			stbtt_fontinfo m_font;
+		
 			
 
 	};