From 1d5486ac8f73ac945850749ff0e3db664702b919 Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Fri, 8 Jul 2011 14:12:21 -0600
Subject: [PATCH] Update documentation building

---
 debian/changelog |   6 ++++++
 debian/control   |   2 +-
 doc/Makefile     |  52 +++++++++++++++++++++++++++++++----------------
 doc/fo.xsl       |   4 +---
 doc/html.tar.gz  | Bin 2654 -> 2725 bytes
 5 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bf94f5e..2a41d57 100644
--- 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 76f6b7d..ea4b450 100644
--- 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 8905b68..6d156c9 100644
--- 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 d04b2de..5cb69da 100644
--- 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
GIT binary patch
literal 2725
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

literal 2654
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
M2UG;>l>krx0Oda{-2eap

-- 
2.34.1