Some refinement of XSLT processing: The result now looks just about as good

as the result of the SGML-based tool chain.

diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile
index 64f57814ad85846caa703a9c6d4d7ca2ecccc054..f80cdffa74bbe4d0c09fe495202d2977de4482a8 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.63 2004/01/13 18:45:19 petere Exp $
+# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.64 2004/01/15 23:51:32 petere Exp $
 #
 #----------------------------------------------------------------------------
 
@@ -205,10 +205,13 @@ OSX = osx # (may be called sx or sgml2xml on some systems)
 XSLTPROC = xsltproc
 
 postgres.xml: postgres.sgml $(GENERATED_SGML)
-   $(OSX) -x lower $< >$@
+   $(OSX) -x lower $< | \
+     sed -e 's/\[\(lt\|gt\|amp\|nbsp\|copy\|quot\|ouml\|uuml\|egrave\) *\]/\&\1;/g' \
+         -e '1a\' -e '' \
+     >$@
 
 testxml: stylesheet.xsl postgres.xml
-   $(XSLTPROC) $^
+   $(XSLTPROC) $(XSLTPROCFLAGS) --stringparam pg.version '$(VERSION)' $^
 
 
 ##

diff --git a/doc/src/sgml/stylesheet.xsl b/doc/src/sgml/stylesheet.xsl
index 3301afd617bb5c5803613f5e7a8fb30c26a2029a..0a1af776e56c3413c420cad29fd628b931a2063f 100644 (file)
--- a/doc/src/sgml/stylesheet.xsl
+++ b/doc/src/sgml/stylesheet.xsl
@@ -4,30 +4,48 @@
                 xmlns="http://www.w3.org/TR/xhtml1/transitional"
                 exclude-result-prefixes="#default">
 
-snapshot/html/chunk.xsl"/>
+current/xhtml/chunk.xsl"/>
 
 
 
-
+
+
+
+
+
+  
+    1
+    0
+  
+
+
+
 
-3
+2
 
-
-
-
+
+
+
+
 
 
 
-0"> 
-  
-
-
-
+
+
+
 
 
 
@@ -67,4 +85,24 @@
   
 
 
+
+
+
+
+  ??
+
+
+
+
+
+
+  
+    
+    
+  
+
+