Update documentation building

diff --git a/debian/changelog b/debian/changelog
index bf94f5e61ebef4e2aff4f00338d94adc5c9e649e..2a41d57b5e45440792ee2ef694162513e5c46ff0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-hyperobject (2.12.0-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Fri, 08 Jul 2011 14:05:10 -0600
+
 cl-hyperobject (2.11.0-3) unstable; urgency=low
 
   * Build with debhelper extension dh-lisp

diff --git a/debian/control b/debian/control
index 76f6b7dfbd05a786d4d9c1e9f4ce3a21e2966463..ea4b45079c3a827326294c4c5005ced90498a97b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Kevin M. Rosenberg <kmr@debian.org>
 Build-Depends-Indep: dh-lisp
 Build-Depends: debhelper (>= 7.0.0)
-Standards-Version: 3.8.2.0
+Standards-Version: 3.9.2.0
 Homepage: http://hyperobject.b9.com/
 Vcs-Git: git://git.b9.com/hyperobject.git
 Vcs-Browser: http://git.b9.com/?p=hyperobject.git

diff --git a/doc/Makefile b/doc/Makefile
index 8905b68aae89e5c60661e12f50015fdd5dc277a4..6d156c9db4e1fe69ff278671b9d2cd90bff1dd01 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,4 +1,5 @@
-##############################################################################
+#!/usr/bin/make
+###############################################################################
 # FILE IDENTIFICATION
 # 
 #  Name:         Makefile
@@ -6,14 +7,12 @@
 #  Programer:    Kevin M. Rosenberg
 #  Date Started: Mar 2002
 #
-#  CVS Id:   $Id$
-#
-# This file, part of HYPEROBJECT, is Copyright (c) 2002-2003 by Kevin M. Rosenberg
+# This file, part of HYPEROBJECT, is Copyright (c) 2002-2011 by Kevin M. Rosenberg
 #
 # HYPEROBJECT users are granted the rights to distribute and use this software
 # as governed by the terms of the Lisp Lesser GNU Public License
 # (http://opensource.franz.com/preamble.html), also known as the LLGPL.
-##############################################################################
+###############################################################################
 
 DOCFILE_BASE_DEFAULT:=hyperobject
 DOCFILE_EXT_DEFAULT:=xml
@@ -21,24 +20,43 @@ DOCFILE_EXT_DEFAULT:=xml
 
 # Standard docfile processing
 
-DEBIAN=$(shell expr "`cat /etc/issue`" : '.*Debian.*')
-SUSE=$(shell expr "`cat /etc/issue`" : '.*SuSE.*')
-REDHAT=$(shell expr "`cat /etc/issue`" : '.*RedHat.*')
+DEBIAN=$(shell expr "`cat /etc/issue 2> /dev/null`" : '.*Debian.*')
+SUSE=$(shell expr "`cat /etc/issue 2> /dev/null`" : '.*SuSE.*')
+SUSE91=$(shell expr "`cat /etc/issue 2> /dev/null`" : '.*SuSE Linux 9.1.*')
+REDHAT=$(shell expr "`cat /etc/issue 2> /dev/null`" : '.*Red Hat.*')
+MANDRAKE=$(shell expr "`cat /etc/issue 2> /dev/null`" : '.*Mandrake.*')
+DARWIN=$(shell expr "`uname -a`" : '.*Darwin.*')
+UBUNTU=$(shell expr "`cat /etc/issue 2> /dev/null`" : '.*Ubuntu.*')
 
 
 ifneq (${DEBIAN},0)
 OS:=debian
 else
-  ifneq (${SUSE},0)
-    OS=suse
-  else   
-    ifneq (${REDHAT},0)
-      OS=redhat
+  ifneq (${SUSE91},0)
+    OS=suse91
+  else
+    ifneq (${SUSE},0)
+      OS=suse
+    else   
+      ifneq (${REDHAT},0)
+        OS=redhat
+      else   
+        ifneq (${MANDRAKE},0)
+          OS=mandrake
+       else   
+          ifneq (${DARWIN},0)
+            OS=darwin
+         else
+           ifneq (${UBUNTU},0)
+               OS:=debian
+           endif
+         endif 
+        endif
+      endif
     endif
   endif
 endif
 
-
 ifndef DOCFILE_BASE
 DOCFILE_BASE=${DOCFILE_BASE_DEFAULT}
 endif
@@ -75,7 +93,7 @@ doc: html pdf
 
 .PHONY: check
 check:
-       @echo "Operating System Detected: ${OS}"
+       @echo "Operating system detected: ${OS}"
        @$(CHECK)
 
 .PHONY: html
@@ -84,7 +102,7 @@ html: html.tar.gz
 html.tar.gz: $(DOCFILES) Makefile 
        @rm -rf html
        @mkdir html
-       @XML_CATALOG_FILES="$(CATALOG)" $(XSLTPROC) --stringparam chunker.output.encoding ISO-8859-1 \
+       @XML_CATALOG_FILES="$(CATALOG)" $(XSLTPROC) --stringparam chunker.output.encoding UTF-8 \
                 --xinclude --output html/ html_chunk.xsl $(DOCFILE)
        @GZIP='-9' tar czf html.tar.gz html 
 
@@ -92,7 +110,7 @@ html.tar.gz: $(DOCFILES) Makefile
 fo: ${FOFILE}
 
 ${FOFILE}: $(DOCFILES) Makefile 
-       @XML_CATALOG_FILES="$(CATALOG)" xsltproc --xinclude --output $(FOFILE) fo.xsl $(DOCFILE)
+       @XML_CATALOG_FILES="$(CATALOG)" xsltproc --xinclude --stringparam fop1.extensions 1 --output $(FOFILE) fo.xsl $(DOCFILE)
 
 .PHONY: pdf
 pdf: ${PDFFILE}

diff --git a/doc/fo.xsl b/doc/fo.xsl
index d04b2de90eb28e8666ebb1aa7887061aed465866..5cb69da46475c6f2cc0f4de92d22623adf14278e 100644 (file)
--- a/doc/fo.xsl
+++ b/doc/fo.xsl
@@ -1,8 +1,6 @@
 <?xml version='1.0'?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 version="1.0">
-
 <xsl:import href="docbook_fo.xsl"/>
-<xsl:param name="fop.extensions" select="1"/>
+<xsl:param name="fop1.extensions" select="1"/>
 </xsl:stylesheet>
-

diff --git a/doc/html.tar.gz b/doc/html.tar.gz
index 29b60e4a4d2e7bd73283955c27774ac1a797cb1e..a6a383176e0b2821f8764d3a8dee6507e5559ceb 100644 (file)
Binary files a/doc/html.tar.gz and b/doc/html.tar.gz differ