Move headers to make svg_document an internal type.

5 files changed, 43 insertions, 4 deletions

diff --git a/source/svg/svg-color.c b/source/svg/svg-color.c
index 4f6031e7..d1139475 100644
--- a/source/svg/svg-color.c
+++ b/source/svg/svg-color.c
@@ -1,4 +1,5 @@
-#include "mupdf/svg.h"
+#include "mupdf/fitz.h"
+#include "svg-imp.h"
 
 /* Color keywords (white, blue, fuchsia)
  * System color keywords (ActiveBorder, ButtonFace -- need to find reasonable defaults)
diff --git a/source/svg/svg-doc.c b/source/svg/svg-doc.c
index fa2b3d19..5f7f809b 100644
--- a/source/svg/svg-doc.c
+++ b/source/svg/svg-doc.c
@@ -1,4 +1,5 @@
-#include "mupdf/svg.h"
+#include "mupdf/fitz.h"
+#include "svg-imp.h"
 
 typedef struct svg_page_s svg_page;
 
diff --git a/source/svg/svg-imp.h b/source/svg/svg-imp.h
new file mode 100644
index 00000000..419e66b9
--- /dev/null
+++ b/source/svg/svg-imp.h
@@ -0,0 +1,35 @@
+#ifndef MUPDF_SVG_IMP_H
+#define MUPDF_SVG_IMP_H
+
+typedef struct svg_document_s svg_document;
+
+struct svg_document_s
+{
+	fz_document super;
+	fz_xml *root;
+	fz_tree *idmap;
+	float width;
+	float height;
+};
+
+/* Parse basic data type units. */
+
+const char *svg_lex_number(float *fp, const char *str);
+float svg_parse_number(const char *str, float min,float max, float inherit);
+float svg_parse_length(const char *str, float percent, float font_size);
+float svg_parse_angle(const char *str);
+
+void svg_parse_color(fz_context *ctx, svg_document *doc, char *str, float *rgb);
+void svg_parse_transform(fz_context *ctx, svg_document *doc, char *str, fz_matrix *ctm);
+
+int svg_is_whitespace_or_comma(int c);
+int svg_is_whitespace(int c);
+int svg_is_alpha(int c);
+int svg_is_digit(int c);
+
+/* Graphics content parsing. */
+
+void svg_parse_document_bounds(fz_context *ctx, svg_document *doc, fz_xml *root);
+void svg_run_document(fz_context *ctx, svg_document *doc, fz_xml *root, fz_device *dev, const fz_matrix *ctm);
+
+#endif
diff --git a/source/svg/svg-parse.c b/source/svg/svg-parse.c
index defdeb75..0a066ed1 100644
--- a/source/svg/svg-parse.c
+++ b/source/svg/svg-parse.c
@@ -1,4 +1,5 @@
-#include "mupdf/svg.h"
+#include "mupdf/fitz.h"
+#include "svg-imp.h"
 
 int svg_is_whitespace_or_comma(int c)
 {
diff --git a/source/svg/svg-run.c b/source/svg/svg-run.c
index e05096ae..f3860d76 100644
--- a/source/svg/svg-run.c
+++ b/source/svg/svg-run.c
@@ -1,4 +1,5 @@
-#include "mupdf/svg.h"
+#include "mupdf/fitz.h"
+#include "svg-imp.h"
 
 /* default page size */
 #define DEF_WIDTH 12