Reorganize XSLT stylesheet support. Put common things into a separate

file (instead of repeating), add XSL-FO stylesheet and appropriate make
rules.

diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile
index 58e9a7d049788837e64559acec866c3f200120d4..c60dcf272abc39fff0e770c0d920eba3028f29a2 100644 (file)
--- a/doc/src/sgml/Makefile
+++ b/doc/src/sgml/Makefile
@@ -2,7 +2,7 @@
 #
 # PostgreSQL documentation makefile
 #
-# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.82 2006/12/10 01:53:15 petere Exp $
+# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.83 2006/12/10 16:01:06 petere Exp $
 #
 #----------------------------------------------------------------------------
 
@@ -207,7 +207,7 @@ regress_README.html: regress.sgml
 
 
 ##
-## Experimental XML stuff
+## XSLT processing
 ##
 
 OSX = osx # (may be called sx or sgml2xml on some systems)
@@ -219,11 +219,16 @@ postgres.xml: postgres.sgml $(GENERATED_SGML)
          -e '1a\' -e '' \
      >$@
 
-testxml: stylesheet.xsl postgres.xml
-   $(XSLTPROC) $(XSLTPROCFLAGS) --stringparam pg.version '$(VERSION)' $^
+override XSLTPROCFLAGS += --stringparam pg.version '$(VERSION)'
+
+xslthtml: stylesheet.xsl postgres.xml
+   $(XSLTPROC) $(XSLTPROCFLAGS) $^
 
 htmlhelp: stylesheet-hh.xsl postgres.xml
-   $(XSLTPROC) $(XSLTPROCFLAGS) --stringparam pg.version '$(VERSION)' $^
+   $(XSLTPROC) $(XSLTPROCFLAGS) $^
+
+%.fo: stylesheet-fo.xsl %.xml
+   $(XSLTPROC) $(XSLTPROCFLAGS) -o $@ $^
 
 
 ##
@@ -271,7 +276,7 @@ clean distclean maintainer-clean:
    rm -f HTML.index $(GENERATED_SGML)
 # text
    rm -f INSTALL HISTORY regress_README
-# XML
-   rm -f postgres.xml htmlhelp.hhp toc.hhc index.hhk
+# XSLT
+   rm -f postgres.xml htmlhelp.hhp toc.hhc index.hhk *.fo
 # Texinfo
    rm -f *.texixml *.texi *.info db2texi.refs

diff --git a/doc/src/sgml/stylesheet-common.xsl b/doc/src/sgml/stylesheet-common.xsl
new file mode 100644 (file)
index 0000000..2ad0a7f
--- /dev/null
+++ b/doc/src/sgml/stylesheet-common.xsl
@@ -0,0 +1,88 @@
+
+
+                version="1.0">
+
+
+
+
+
+
+
+
+
+
+
+  
+    1
+    0
+  
+
+
+
+2
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+
+
+
+  
+
+
+
+  
+
+
+
+  
+
+
+
+  
+
+
+
+  
+
+
+
+  
+
+
+
+  
+
+
+
+  
+
+
+
+
+
+
+  ??
+
+
+


diff --git a/doc/src/sgml/stylesheet-fo.xsl b/doc/src/sgml/stylesheet-fo.xsl

new file mode 100644 (file)
index 0000000..d982a3c

--- /dev/null
+++ b/doc/src/sgml/stylesheet-fo.xsl
@@ -0,0 +1,9 @@
+
+
+                version="1.0"
+                xmlns:fo="http://www.w3.org/1999/XSL/Format">
+
+
+
+
+


diff --git a/doc/src/sgml/stylesheet-hh.xsl b/doc/src/sgml/stylesheet-hh.xsl

index 6b1e7025a0548c5c49520dc2fadb28f30175bb3a..1c50518c706ef15da0675aa34e53dae3d0d19278 100644 (file)

--- a/doc/src/sgml/stylesheet-hh.xsl
+++ b/doc/src/sgml/stylesheet-hh.xsl
@@ -5,94 +5,21 @@
                 exclude-result-prefixes="#default">
 
 
+
 
 
 
-
 
-
-
-
-  
-    1
-    0
-  
-
-
-
-
-2
-
-
-
-
-
 
 
 
 
 
-
 [email protected]
-
-
 
 
 
 
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-
-
-
-  ??
-
-
-
 
-
-
-
-
 
-
-  
-    1
-    0
-  
-
-
-
-
-2
-
-
-
-
-
+
 
 
 
 
 
-
 [email protected]
-
-
 
 
 
 
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-
-
-
-  ??
-
-
-
 

diff --git a/doc/src/sgml/stylesheet-fo.xsl b/doc/src/sgml/stylesheet-fo.xsl
new file mode 100644 (file)
index 0000000..d982a3c
--- /dev/null
+++ b/doc/src/sgml/stylesheet-fo.xsl
@@ -0,0 +1,9 @@
+
+
+                version="1.0"
+                xmlns:fo="http://www.w3.org/1999/XSL/Format">
+
+
+
+
+


diff --git a/doc/src/sgml/stylesheet-hh.xsl b/doc/src/sgml/stylesheet-hh.xsl

index 6b1e7025a0548c5c49520dc2fadb28f30175bb3a..1c50518c706ef15da0675aa34e53dae3d0d19278 100644 (file)

--- a/doc/src/sgml/stylesheet-hh.xsl
+++ b/doc/src/sgml/stylesheet-hh.xsl
@@ -5,94 +5,21 @@
                 exclude-result-prefixes="#default">
 
 
+
 
 
 
-
 
-
-
-
-  
-    1
-    0
-  
-
-
-
-
-2
-
-
-
-
-
 
 
 
 
 
-
 [email protected]
-
-
 
 
 
 
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-
-
-
-  ??
-
-
-
 
-
-
-
-
 
-
-  
-    1
-    0
-  
-
-
-
-
-2
-
-
-
-
-
+
 
 
 
 
 
-
 [email protected]
-
-
 
 
 
 
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-
-
-
-  ??
-
-
-
 

diff --git a/doc/src/sgml/stylesheet-hh.xsl b/doc/src/sgml/stylesheet-hh.xsl
index 6b1e7025a0548c5c49520dc2fadb28f30175bb3a..1c50518c706ef15da0675aa34e53dae3d0d19278 100644 (file)
--- a/doc/src/sgml/stylesheet-hh.xsl
+++ b/doc/src/sgml/stylesheet-hh.xsl
@@ -5,94 +5,21 @@
                 exclude-result-prefixes="#default">
 
 
+
 
 
 
-
 
-
-
-
-  
-    1
-    0
-  
-
-
-
-
-2
-
-
-
-
-
 
 
 
 
 
-
 [email protected]
-
-
 
 
 
 
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-
-
-
-  ??
-
-
-
 
-
-
-
-
 
-
-  
-    1
-    0
-  
-
-
-
-
-2
-
-
-
-
-
+
 
 
 
 
 
-
 [email protected]
-
-
 
 
 
 
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-  
-
-
-
-
-
-
-  ??
-
-
-