X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fdocument.h;h=3ff607bda0b6350be3aa530d4ebf6c46e619efba;hp=52e9295ed55fe47cc3c3903d3f53c4aeb811a283;hb=d9c0c3792133f87cd224dc22be428be8ddc016d8;hpb=255065a607d82846c4a8b730000d547b3f080d0c

diff --git a/src/document.h b/src/document.h
index 52e9295..3ff607b 100644
--- a/src/document.h
+++ b/src/document.h
@@ -14,10 +14,11 @@ 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 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)
@@ -26,7 +27,7 @@ namespace IPDF
 	class Document
 	{
 		public:
-			Document(const std::string & filename = "", const std::string & font_filename = "DejaVuSansMono.ttf") : m_objects(), m_count(0), m_font_data(NULL), m_font()
+			Document(const std::string & filename = "", const std::string & font_filename = "fonts/DejaVuSansMono.ttf") : m_objects(), m_count(0), m_font_data(NULL), m_font()
 			{
 				Load(filename);
 				if (font_filename != "")
@@ -49,7 +50,9 @@ 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);
 			
 
@@ -62,11 +65,12 @@ namespace IPDF
 			
 			/** Load an SVG text file and add to the document **/
 			void LoadSVG(const std::string & filename, const Rect & bounds = Rect(0,0,1,1));
+			void ParseSVG(const std::string & svg, 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);
+			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);
@@ -81,6 +85,8 @@ namespace IPDF
 			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: