r8171: improved text output, automated OS discovery

diff --git a/doc/Makefile b/doc/Makefile
index 53148807170ca27b354b98698684f38e543f0227..b1dfa5e6f5a019036eec19a21c3b4ffa6b48fb23 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -15,12 +15,29 @@
 # (http://opensource.franz.com/preamble.html), also known as the LLGPL.
 ##############################################################################
 
-OS:=debian
 DOCFILE_BASE_DEFAULT:=clsql
 DOCFILE_EXT_DEFAULT:=xml
 
+
 # Standard docfile processing
 
+DEBIAN=expr "`cat /etc/issue`" : '.*Debian.*'
+SUSE=expr "`cat /etc/issue`" : '.*SuSE.*'
+REDHAT=expr "`cat /etc/issue`" : '.*RedHat.*'
+
+ifneq (${DEBIAN},0)
+OS:=debian
+else
+  ifneq (${SUSE},0)
+    OS=suse
+  else   
+    ifneq (${REDHAT},0)
+      OS=redhat
+    endif
+  endif
+endif
+
+
 ifndef DOCFILE_BASE
 DOCFILE_BASE=${DOCFILE_BASE_DEFAULT}
 endif
@@ -35,6 +52,7 @@ PDFFILE:=${DOCFILE_BASE}.pdf
 PSFILE:=${DOCFILE_BASE}.ps
 DVIFILE:=${DOCFILE_BASE}.dvi
 TXTFILE:=${DOCFILE_BASE}.txt
+HTMLFILE:=${DOCFILE_BASE}.html
 TMPFILES:=${DOCFILE_BASE}.aux ${DOCFILE_BASE}.out ${DOCFILE_BASE}.log
 DOCFILES:=$(shell echo *.xml *.xsl)
 
@@ -60,7 +78,7 @@ html: html.tar.gz
 html.tar.gz: $(DOCFILES) Makefile 
        @rm -rf html
        @mkdir html
-       @XML_CATALOG_FILES="$(CATALOG)" xsltproc --xinclude --output html/ html.xsl $(DOCFILE)
+       @XML_CATALOG_FILES="$(CATALOG)" xsltproc --xinclude --output html/ html_chunk.xsl $(DOCFILE)
        @GZIP='-9' tar czf html.tar.gz html 
 
 .PHONY: fo
@@ -91,12 +109,13 @@ ${PSFILE}: ${DOCFILES} Makefile
 txt: ${TXTFILE}
 
 ${TXTFILE}: ${FOFILE}
-       @fop $(FOFILE) -txt $(TXTFILE) > /dev/null
+       @XML_CATALOG_FILES="$(CATALOG)" xsltproc --xinclude --output ${HTMLFILE} html.xsl $(DOCFILE)
+       lynx -dump ${HTMLFILE} > ${TXTFILE}
 
 .PHONY: clean
 clean: 
        @rm -f *~ *.bak *.orig \#*\# .\#* texput.log
-       @rm -rf html ${PSFILE}
+       @rm -rf html ${PSFILE} ${HTMLFILE}
        @rm -f ${TMPFILES} ${FOFILE}
        @rm -f  ${DVIFILE} ${TXTFILE}
 

diff --git a/doc/catalog-debian.xml b/doc/catalog-debian.xml
index eb1075edd57ef7f0c73c8b88e7eb6633c8e09c58..0188d9bd40823bc5d946713e910ef468cbe4c280 100644 (file)
--- a/doc/catalog-debian.xml
+++ b/doc/catalog-debian.xml
@@ -29,13 +29,13 @@
 
     <!-- To resolve short stylesheet references -->
     <uri
-        name="docbook.xsl"
+        name="docbook_html.xsl"
         uri="stylesheet/xsl/nwalsh/html/docbook.xsl" />
     <uri 
-        name="chunk.xsl"
+        name="docbook_chunk.xsl"
         uri="stylesheet/xsl/nwalsh/html/chunk.xsl" />
     <uri
-        name="fo-docbook.xsl"
+        name="docbook_fo.xsl"
         uri="stylesheet/xsl/nwalsh/fo/docbook.xsl" />
 
   </group>

diff --git a/doc/catalog-suse.xml b/doc/catalog-suse.xml
index ed2c958eeb702e837db8886f11943db0503e98e6..6a03830964708712b330b0febbef426f9ab62b39 100644 (file)
--- a/doc/catalog-suse.xml
+++ b/doc/catalog-suse.xml
@@ -29,13 +29,13 @@
 
     <!-- To resolve short stylesheet references -->
     <uri
-        name="docbook.xsl"
+        name="docbook_html.xsl"
         uri="docbook/docbook-xsl/html/docbook.xsl" />
     <uri 
-        name="chunk.xsl"
+        name="docbook_chunk.xsl"
         uri="docbook/docbook-xsl/html/chunk.xsl" />
     <uri
-        name="fo-docbook.xsl"
+        name="docbook_fo.xsl"
         uri="docbook/docbook-xsl/fo/docbook.xsl" />
 
   </group>

diff --git a/doc/fo.xsl b/doc/fo.xsl
index df29efd91fdedd742ed8cb1b6545391be05a3a7b..50ed48112ce6fc09c2fbc3c0afc1eebff28a8e26 100644 (file)
--- a/doc/fo.xsl
+++ b/doc/fo.xsl
@@ -2,7 +2,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version="1.0">
 
-<xsl:import href="fo-docbook.xsl"/>
+<xsl:import href="docbook_fo.xsl"/>
 
 </xsl:stylesheet>
 

diff --git a/doc/html.tar.gz b/doc/html.tar.gz
index 56ca7aacbf2a3fc448395617cde200e967df77ae..e54bbe55eac4a04f7da46320442ffc0580f8ded8 100644 (file)
Binary files a/doc/html.tar.gz and b/doc/html.tar.gz differ

diff --git a/doc/html.xsl b/doc/html.xsl
index eddc7c113f8b822228cf1404f63cd9bdbdb013f9..aada3f2e42308d8b614810b52b68702e72c4eee5 100644 (file)
--- a/doc/html.xsl
+++ b/doc/html.xsl
@@ -2,7 +2,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version="1.0">
 
-<xsl:import href="chunk.xsl"/>
+<xsl:import href="docbook_html.xsl"/>
 <xsl:param name="use.id.as.filename" select="1"/>
 
 </xsl:stylesheet>

diff --git a/doc/html_chunk.xsl b/doc/html_chunk.xsl
new file mode 100644 (file)
index 0000000..a2bb88f
--- /dev/null
+++ b/doc/html_chunk.xsl
@@ -0,0 +1,9 @@
+<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version="1.0">
+
+<xsl:import href="docbook_chunk.xsl"/>
+<xsl:param name="use.id.as.filename" select="1"/>
+
+</xsl:stylesheet>
+