15 files changed, 65 insertions, 25 deletions
diff --git a/Makefile.am b/Makefile.am
index bc8702f..a9c1328 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,7 @@ pkgdata_DATA=\
 endif
 
 # doc must go last
-SUBDIRS = data po xslt tools $(build_SUBDIRS) doc
+SUBDIRS = data po rng xslt tools $(build_SUBDIRS) doc
 
 ACLOCAL_AMFLAGS = -I m4
 
diff --git a/configure.in b/configure.in
index 7323fab..76ff019 100644
--- a/configure.in
+++ b/configure.in
@@ -55,8 +55,11 @@ data/templates/Makefile
 data/watermarks/Makefile
 doc/Makefile
 doc/gnome-doc-make/Makefile
+doc/mallard/Makefile
 doc/xslt/Makefile
 po/Makefile.in
+rng/Makefile
+rng/mallard/Makefile
 tools/Makefile
 tools/gnome-doc-tool
 tools/gnome-doc-prepare
@@ -72,6 +75,10 @@ xslt/docbook/common/Makefile
 xslt/docbook/html/Makefile
 xslt/docbook/omf/Makefile
 xslt/docbook/utils/Makefile
+xslt/mallard/Makefile
+xslt/mallard/common/Makefile
+xslt/mallard/html/Makefile
+xslt/mallard/utils/Makefile
 xslt/gettext/Makefile
 ],[
 chmod +x tools/gnome-doc-tool
diff --git a/doc/Makefile.am b/doc/Makefile.am
index b497cb3..bd60514 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1 +1 @@
-SUBDIRS = gnome-doc-make xslt
+SUBDIRS = gnome-doc-make mallard xslt
diff --git a/doc/mallard/Makefile.am b/doc/mallard/Makefile.am
new file mode 100644
index 0000000..cb7c8bd
--- /dev/null
+++ b/doc/mallard/Makefile.am
@@ -0,0 +1,8 @@
+include $(top_srcdir)/tools/gnome-doc-utils.make
+include $(top_srcdir)/bootstrap.make
+dist-hook: doc-dist-hook
+
+DOC_MODULE = mallard
+DOC_INCLUDES =
+DOC_ENTITIES =
+
diff --git a/rng/Makefile.am b/rng/Makefile.am
new file mode 100644
index 0000000..6c94df3
--- /dev/null
+++ b/rng/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS=mallard
diff --git a/rng/mallard/Makefile.am b/rng/mallard/Makefile.am
new file mode 100644
index 0000000..37dc828
--- /dev/null
+++ b/rng/mallard/Makefile.am
@@ -0,0 +1,23 @@
+all: mallard.rnc mallard.rng
+
+specs1=$(top_srcdir)/doc/mallard/C/spec_pages.xml \
+       $(top_srcdir)/doc/mallard/C/mal_page.xml   \
+       $(top_srcdir)/doc/mallard/C/mal_block.xml  $(wildcard $(top_srcdir)/doc/mallard/C/mal_block_*.xml) \
+       $(top_srcdir)/doc/mallard/C/mal_inline.xml $(wildcard $(top_srcdir)/doc/mallard/C/mal_inline_*.xml)
+specs=$(specs1) $(filter-out $(specs1), $(wildcard $(top_srcdir)/doc/mallard/C/*.xml))
+
+mallard.rnc: $(wildcard $(top_srcdir)/doc/mallard/C/*.xml)
+	for file in $(specs); do \
+	  xsltproc $(srcdir)/mal2rnc.xsl $$file; \
+	done > mallard.rnc
+
+mallard.rng: mallard.rnc rnc2rng.awk
+	awk -f $(srcdir)/rnc2rng.awk mallard.rnc > $@.tmp || ( rm -f $@.tmp && exit 1 )
+	xmllint --format $@.tmp | \
+	  sed -e 's/^  //' \
+	      -e 's/ xmlns/\n    xmlns/g' \
+	      -e 's/" ns=/"\n    ns=/' \
+	      -e 's/^<s/\n<s/' \
+	      -e 's/^<d/\n<d/' \
+	  > $@ || ( rm -f $@.tmp && exit 1 )
+
diff --git a/sandbox/mallard/xslt/mal2rnc.xsl b/rng/mallard/mal2rnc.xsl
index baaeb0d..baaeb0d 100644
--- a/sandbox/mallard/xslt/mal2rnc.xsl
+++ b/rng/mallard/mal2rnc.xsl
diff --git a/sandbox/mallard/rng/rnc2rng.awk b/rng/mallard/rnc2rng.awk
index 41546cd..41546cd 100644
--- a/sandbox/mallard/rng/rnc2rng.awk
+++ b/rng/mallard/rnc2rng.awk
diff --git a/sandbox/mallard/rng/Makefile b/sandbox/mallard/rng/Makefile
deleted file mode 100644
index ae68c57..0000000
--- a/sandbox/mallard/rng/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-all: mallard.rnc mallard.rng
-
-specs1=../spec/spec_pages.xml \
-       ../spec/mal_page.xml   \
-       ../spec/mal_block.xml  $(wildcard ../spec/mal_block_*.xml) \
-       ../spec/mal_inline.xml $(wildcard ../spec/mal_inline_*.xml)
-specs=$(specs1) $(filter-out $(specs1), $(wildcard ../spec/*.xml))
-
-mallard.rnc: $(wildcard ../spec/*.xml)
-	for file in $(specs); do \
-	  xsltproc ../xslt/mal2rnc.xsl $$file; \
-	done > mallard.rnc
-
-mallard.rng: mallard.rnc rnc2rng.awk
-	awk -f rnc2rng.awk mallard.rnc > $@.tmp || ( rm -f $@.tmp && exit 1 )
-	xmllint --format $@.tmp | \
-	  sed -e 's/^  //' \
-	      -e 's/ xmlns/\n    xmlns/g' \
-	      -e 's/" ns=/"\n    ns=/' \
-	      -e 's/^<s/\n<s/' \
-	      -e 's/^<d/\n<d/' \
-	  > $@ || ( rm -f $@.tmp && exit 1 )
-
diff --git a/xslt/mallard/Makefile.am b/xslt/mallard/Makefile.am
new file mode 100644
index 0000000..5d6f8e2
--- /dev/null
+++ b/xslt/mallard/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = common html utils
diff --git a/xslt/mallard/common/Makefile.am b/xslt/mallard/common/Makefile.am
new file mode 100644
index 0000000..9c808fc
--- /dev/null
+++ b/xslt/mallard/common/Makefile.am
@@ -0,0 +1,5 @@
+xsldir=$(datadir)/xml/gnome/xslt/mallard/common
+
+xsl_DATA = mal-link.xsl
+
+EXTRA_DIST=$(xsl_DATA)
diff --git a/sandbox/mallard/xslt/mal-link.xsl b/xslt/mallard/common/mal-link.xsl
index c5c563f..c5c563f 100644
--- a/sandbox/mallard/xslt/mal-link.xsl
+++ b/xslt/mallard/common/mal-link.xsl
diff --git a/xslt/mallard/html/Makefile.am b/xslt/mallard/html/Makefile.am
new file mode 100644
index 0000000..23b1346
--- /dev/null
+++ b/xslt/mallard/html/Makefile.am
@@ -0,0 +1,13 @@
+xsldir=$(datadir)/xml/gnome/xslt/mallard/html
+
+xsl_DATA =				\
+	mal2html-block.xsl		\
+	mal2html-css.xsl		\
+	mal2html-inline.xsl		\
+	mal2html-list.xsl		\
+	mal2html-media.xsl		\
+	mal2html-page.xsl		\
+	mal2html-table.xsl		\
+	mal2html.xsl
+
+EXTRA_DIST=$(xsl_DATA)
diff --git a/xslt/mallard/utils/Makefile.am b/xslt/mallard/utils/Makefile.am
new file mode 100644
index 0000000..e25066a
--- /dev/null
+++ b/xslt/mallard/utils/Makefile.am
@@ -0,0 +1,5 @@
+xsldir=$(datadir)/xml/gnome/xslt/mallard/utils
+
+xsl_DATA = mal2cache.xsl
+
+EXTRA_DIST=$(xsl_DATA)
diff --git a/sandbox/mallard/xslt/mal2cache.xsl b/xslt/mallard/utils/mal2cache.xsl
index 0d69a78..0d69a78 100644
--- a/sandbox/mallard/xslt/mal2cache.xsl
+++ b/xslt/mallard/utils/mal2cache.xsl