From ce79e4e170f3553b85d1cd8273eb62d850bb5e09 Mon Sep 17 00:00:00 2001
From: Sam Varshavchik
Date: Mon, 1 Sep 2014 08:34:16 -0400
Subject: Revert 7b09017ddeabae53d9d361d64bebc44129639c96

Not thread safe. Use URIs, instead.
---
 docbook/.gitignore   |  1 -
 docbook/manpages.in  | 54 ---------------------------------------------------
 docbook/manpages.xsl | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 docbook/sgml2html    | 15 --------------
 docbook/sgml2man     | 16 +--------------
 5 files changed, 56 insertions(+), 85 deletions(-)
 delete mode 100644 docbook/.gitignore
 delete mode 100644 docbook/manpages.in
 create mode 100644 docbook/manpages.xsl

(limited to 'docbook')

diff --git a/docbook/.gitignore b/docbook/.gitignore
deleted file mode 100644
index 1f9341b..0000000
--- a/docbook/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/manpages.xsl
diff --git a/docbook/manpages.in b/docbook/manpages.in
deleted file mode 100644
index e9e9c78..0000000
--- a/docbook/manpages.in
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-<xsl:include href="/usr/share/sgml/docbook/xsl-stylesheets/xhtml/onechunk.xsl"/>
-
-<xsl:param name="html.stylesheet" select="'style.css'"/>
-<xsl:param name="admon.graphics" select="0"/>
-
-<xsl:param name="use.id.as.filename" select="1"/>
-
-<xsl:param name="funcsynopsis.style">ansi</xsl:param>
-
-<xsl:param name="table.borders.with.css" select="1" />
-
-<xsl:param name="default.table.frame" select="'collapse'" />
-<xsl:param name="table.cell.border.style" select="''" />
-<xsl:param name="table.cell.border.thickness" select="''" />
-<xsl:param name="table.cell.border.color" select="''" />
-<xsl:param name="emphasis.propagates.style" select="1" />
-<xsl:param name="para.propagates.style" select="1" />
-<xsl:param name="entry.propagates.style" select="1" />
-
-<xsl:param name="part.autolabel" select="0" />
-<xsl:param name="section.autolabel" select="0" />
-<xsl:param name="chapter.autolabel" select="0" />
-
-<xsl:template name="user.head.content">
-
-   <link rel='stylesheet' type='text/css' href='manpage.css' />
-   <meta name="MSSmartTagsPreventParsing" content="TRUE" />
-   <link rel="icon" href="icon.gif" type="image/gif" />
-    <xsl:comment>
-
-Copyright 1998 - 2009 Double Precision, Inc.  See COPYING for distribution
-information.
-
-</xsl:comment>
-</xsl:template>
-
-<!-- Bug fix 1.76.1 -->
-<xsl:template match="funcdef/function" mode="ansi-tabular">
-  <xsl:choose>
-    <xsl:when test="$funcsynopsis.decoration != 0">
-      <strong xmlns="http://www.w3.org/1999/xhtml"
-              xmlns:xslo="http://www.w3.org/1999/XSL/Transform"><xsl:apply-templates mode="ansi-nontabular"/></strong>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="kr-tabular"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/docbook/manpages.xsl b/docbook/manpages.xsl
new file mode 100644
index 0000000..84e1d75
--- /dev/null
+++ b/docbook/manpages.xsl
@@ -0,0 +1,55 @@
+<?xml version='1.0'?>
+<xsl:stylesheet  
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+<xsl:include href="http://docbook.sourceforge.net/release/xsl/current/xhtml/onechunk.xsl"/>
+
+<xsl:param name="html.stylesheet" select="'style.css'"/>
+<xsl:param name="admon.graphics" select="0"/>
+
+<xsl:param name="use.id.as.filename" select="1"/>
+
+<xsl:param name="funcsynopsis.style">ansi</xsl:param>
+
+<xsl:param name="table.borders.with.css" select="1" />
+
+<xsl:param name="default.table.frame" select="'collapse'" />
+<xsl:param name="table.cell.border.style" select="''" />
+<xsl:param name="table.cell.border.thickness" select="''" />
+<xsl:param name="table.cell.border.color" select="''" />
+<xsl:param name="emphasis.propagates.style" select="1" />
+<xsl:param name="para.propagates.style" select="1" />
+<xsl:param name="entry.propagates.style" select="1" />
+
+<xsl:param name="part.autolabel" select="0" />
+<xsl:param name="section.autolabel" select="0" />
+<xsl:param name="chapter.autolabel" select="0" />
+
+<xsl:template name="user.head.content">
+
+   <link rel='stylesheet' type='text/css' href='manpage.css' />
+   <meta name="MSSmartTagsPreventParsing" content="TRUE" />
+   <link rel="icon" href="icon.gif" type="image/gif" />
+    <xsl:comment>
+
+Copyright 1998 - 2009 Double Precision, Inc.  See COPYING for distribution
+information.
+
+</xsl:comment>
+</xsl:template>
+
+<!-- Bug fix 1.76.1 -->
+<xsl:template match="funcdef/function" mode="ansi-tabular">
+  <xsl:choose>
+    <xsl:when test="$funcsynopsis.decoration != 0">
+      <strong xmlns="http://www.w3.org/1999/xhtml"
+              xmlns:xslo="http://www.w3.org/1999/XSL/Transform"><xsl:apply-templates mode="ansi-nontabular"/></strong>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:apply-templates mode="kr-tabular"/>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+</xsl:stylesheet>
+
diff --git a/docbook/sgml2html b/docbook/sgml2html
index 73da461..6040700 100755
--- a/docbook/sgml2html
+++ b/docbook/sgml2html
@@ -14,21 +14,6 @@ fi
 
 rm -rf $dstfile.tmp
 mkdir $dstfile.tmp
-
-ONECHUNK=""
-# sgml/docbook/xsl-stylesheets used by Fedora, xml/docbook/stylesheet by Debian/Ubuntu
-for xslfile in /usr/share/sgml/docbook/xsl-stylesheets/xhtml/onechunk.xsl /usr/share/xml/docbook/stylesheet/docbook-xsl/xhtml/onechunk.xsl; do
- if [ -f "$xslfile" ]; then
-   ONECHUNK="$xslfile"
-   break
- fi
-done
-if [ -z "$ONECHUNK" ]; then
- echo >&2 onechunk.xsl stylesheet not found. Please edit docbook/sgml2html
- exit 1
-fi
-
-sed 's|^\(<xsl:include href="\)[^"]*/onechunk.xsl\("/>\)|'"\1$ONECHUNK\2|" `dirname $0`/manpages.in > `dirname $0`/manpages.xsl
 xsltproc -o $dstfile.tmp/ `dirname $0`/manpages.xsl $srcfile || exit 1
 xsltproc `dirname $0`/fixhtml.xsl $dstfile.tmp/* >$dstfile.tmp2 || exit 1
 rm -rf $dstfile.tmp
diff --git a/docbook/sgml2man b/docbook/sgml2man
index fef7719..a4bd7bf 100755
--- a/docbook/sgml2man
+++ b/docbook/sgml2man
@@ -14,21 +14,7 @@ fi
 
 rm -rf $dstfile.tmpdir
 mkdir -p $dstfile.tmpdir
-
-DOCBOOK_XSL=""
-# sgml/docbook/xsl-stylesheets used by Fedora, xml/docbook/stylesheet by Debian/Ubuntu
-for xslfile in /usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl; do
- if [ -f "$xslfile" ]; then
-   DOCBOOK_XSL="$xslfile"
-   break
- fi
-done
-if [ -z "$DOCBOOK_XSL" ]; then
- echo >&2 docbook.xsl stylesheet not found. Please edit docbook/sgml2man
- exit 1
-fi
-
-xsltproc --nonet -o $dstfile.tmpdir/ "$DOCBOOK_XSL" $srcfile
+xsltproc --nonet -o $dstfile.tmpdir/ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $srcfile
 
 for f in $dstfile.tmpdir/*
 do
-- 
cgit v1.2.3