Updated

diff --git a/xmlcharent/spec/.cvsignore b/xmlcharent/spec/.cvsignore
index 6fc21c17e32ea636b7827c3534c2228b2f38cd61..59a9077bf75474948a855e43f6515cf6ec8ebe46 100644 (file)
--- a/xmlcharent/spec/.cvsignore
+++ b/xmlcharent/spec/.cvsignore
@@ -1,3 +1,5 @@
 *.gen
 *.html
 *.css
+*.fo
+*.pdf

diff --git a/xmlcharent/spec/Makefile b/xmlcharent/spec/Makefile
index 956405e7d15959e85841f8092defd306a8d0a8e5..d3d254f037a1f3514aa378c3977bcee7fb6a5398 100644 (file)
--- a/xmlcharent/spec/Makefile
+++ b/xmlcharent/spec/Makefile
@@ -1,26 +1,41 @@
 include ../../cvstools/Makefile.incl
 
-SPECVER=
+XSLT=xsltproc
 
-ifeq ($(SPECVER),)
-SPECSEP=
-else
-SPECSEP=-
-endif
+STATUS=wd
+OASISTC=docbook
+SPECNAME=xmlcharent
+SPECVER=0.3
 
-HTMLSTYLE=/projects/oasis/stylesheets/tr.xsl
-HTML-CSS=spec.css
+SPECROOT=$(STATUS)-$(OASISTC)-$(SPECNAME)
+SPECBASE=$(SPECROOT)-$(SPECVER)
 
-OASIS-LOGO=http://www.oasis-open.org/docbook/oasis.png
-XSLPARAM=html.stylesheet=$(HTML-CSS) oasis.logo=$(OASIS-LOGO)
+HTMLSTYLE=/projects/oasis/spectools/stylesheets/oasis-docbook-html.xsl
+HTMLPARAM=
 
-XSLT=saxon
+FOSTYLE=/projects/oasis/spectools/stylesheets/oasis-docbook-fo.xsl
+FOPARAM=oasis.logo=/projects/oasis/spectools/images/oasis.png
 
-all: entities.html
+all: html pdf
 
-tables:
-       perl gentext.pl
-
-entities.html: entities.xml
+valid: $(SPECROOT).xml
        $(XJPARSE) $<
-       $(XSLT) $< $(HTMLSTYLE) entities$(SPECSEP)$(SPECVER).html $(XSLPARAM)
+
+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)
+
+$(SPECBASE).pdf: $(SPECBASE).fo
+       xep $(SPECBASE).fo
+       rm -f $(SPECBASE).fo
+
+clean:
+       $(RM) -f *.html *.pdf *.fo