Updated

diff --git a/docbook/svg/spec/Makefile b/docbook/svg/spec/Makefile
index 20cd287d8a5ba7e1ab783874ad0e687403f61ae2..609d45648e17dfc890ef7978f678907c8c5d5d78 100644 (file)
--- a/docbook/svg/spec/Makefile
+++ b/docbook/svg/spec/Makefile
@@ -1,41 +1,26 @@
 include ../../../cvstools/Makefile.incl
 
-XSLT=xsltproc
-
-STATUS=wd
-OASISTC=docbook
-SPECNAME=svg
-SPECVER=1.0-CR1
-
-SPECROOT=$(STATUS)-$(OASISTC)-$(SPECNAME)
-SPECBASE=$(SPECROOT)-$(SPECVER)
+XJPARSE=/home/ndw/bin/xjparse
 
 HTMLSTYLE=/projects/oasis/spectools/stylesheets/oasis-docbook-html.xsl
-HTMLPARAM=
+FOSTYLE=fo.xsl
 
-FOSTYLE=/projects/oasis/spectools/stylesheets/oasis-docbook-fo.xsl
-FOPARAM=oasis.logo=/projects/oasis/spectools/images/oasis.png
+XSLPARAM=""
 
-all: html pdf
+all: svg.html
 
-valid: $(SPECROOT).xml
+svg.html: svg.xml
        $(XJPARSE) $<
+       $(XSLT) $< $(HTMLSTYLE) $@ $(XSLPARAM)
+       tidy -q -utf8 -mn -asxml $@
 
-html: $(SPECBASE).html
-
-fo: $(SPECBASE).fo
-
-pdf: $(SPECBASE).pdf
-
-$(SPECBASE).html: $(SPECROOT).xml valid
-       $(XSLT) $< $(HTMLSTYLE) $(SPECBASE).html $(HTMLPARAM)
-
-$(SPECBASE).fo: $(SPECROOT).xml valid
-       $(XSLT) $< $(FOSTYLE) $(SPECBASE).fo $(FOPARAM)
+svg.fo: svg.xml
+       $(XJPARSE) $<
+       $(XSLT) $< $(FOSTYLE) svg.fo $(XSLPARAM)
 
-$(SPECBASE).pdf: $(SPECBASE).fo
-       xep -2 $(SPECBASE).fo
-       rm -f $(SPECBASE).fo
+svg.pdf: svg.fo
+       xep $<
 
 clean:
-       $(RM) -f *.html *.pdf *.fo
+       $(RM) *.html
+

diff --git a/docbook/svg/spec/fo.xsl b/docbook/svg/spec/fo.xsl
new file mode 100644 (file)
index 0000000..f760162
--- /dev/null
+++ b/docbook/svg/spec/fo.xsl
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version="1.0">
+
+<xsl:import href="/projects/oasis/spectools/stylesheets/oasis-docbook-fo.xsl"/>
+
+<xsl:param name="draft.watermark.image"
+           select="'/sourceforge/docbook/xsl/images/draft.png'"/>
+
+</xsl:stylesheet>