[Reproducible-commits] [docbook-to-man] 02/05: Imported Debian patch 1:2.0.0-33
Mattia Rizzolo
mattia at mapreri.org
Sat Apr 11 15:38:30 UTC 2015
This is an automated email from the git hooks/post-receive script.
mapreri-guest pushed a commit to branch pu/reproducible_builds
in repository docbook-to-man.
commit 45ad8886ce3a4399ec30999343b25eb263a9bf8d
Merge: d76606a f388b77
Author: Maxime Chatelle <xakz at rxsoft.eu>
Date: Thu Nov 13 22:51:53 2014 +0100
Imported Debian patch 1:2.0.0-33
debian/changelog | 15 ++++++
debian/control | 12 +++--
debian/copyright | 20 ++++----
debian/patches/01-conglomeration.patch | 9 +---
debian/patches/02-arg-req-space.patch | 15 ++----
debian/patches/03-userinput-font.patch | 17 ++-----
debian/patches/04-instant-man.patch | 9 +---
debian/patches/05-makefile.patch | 2 +
debian/patches/06-format-security.patch | 2 +
...hecking-of-return-value-of-Split-function.patch | 56 ++++++++++++++++++++++
debian/patches/series | 1 +
debian/watch | 1 +
12 files changed, 107 insertions(+), 52 deletions(-)
diff --cc debian/changelog
index c0aed00,0000000..c5c680f
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,271 -1,0 +1,286 @@@
++docbook-to-man (1:2.0.0-33) experimental; urgency=low
++
++ * New maintainer (Closes: #549475).
++ * Bump up Policy to 3.9.6, no changes needed.
++ * debian/copyright: now follows
++ https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
++ * Adds patch to fix https://bugs.debian.org/716055 (Closes: #716055).
++ * debian/control: Adds paragraph to suggest more up-to-date tools for
++ new projects.
++ * debian/control: Uses canonical VCS URLs.
++ * debian/patches/*: Fixes header of some patches to add description and
++ other fields (converted from dpatch header).
++
++ -- Maxime Chatelle <xakz at rxsoft.eu> Thu, 13 Nov 2014 22:51:53 +0100
++
+docbook-to-man (1:2.0.0-32) unstable; urgency=low
+
+ * Package orphaned.
+
+ -- Philipp Benner <philipp at debian.org> Sat, 27 Sep 2014 18:44:02 +0200
+
+docbook-to-man (1:2.0.0-31) unstable; urgency=low
+
+ * Fixed wrong usage of CFLAGS (Closes: #670557).
+ * Added format security fix for Instant/browse.c.
+
+ -- Philipp Benner <philipp at debian.org> Fri, 27 Apr 2012 09:29:35 +0000
+
+docbook-to-man (1:2.0.0-30) unstable; urgency=low
+
+ [ Jari Aalto ]
+ * Remove quilt dependency and upgrade to packaging format "3.0 quilt"
+ - Includes quilt style patch management built-in.
+ - Patches 02, 03: run "quilt refresh" to make them apply cleanly.
+ * Update to debhelper to 9 and enable all hardened build flags in rules file.
+ * Use dh_prep in rules file. (Closes: #668803)
+
+ -- Philipp Benner <philipp at debian.org> Tue, 24 Apr 2012 20:09:58 +0000
+
+docbook-to-man (1:2.0.0-29) unstable; urgency=low
+
+ * debian/control: added multi-arch foreign, standards version 3.9.3.
+
+ -- Philipp Benner <philipp at debian.org> Fri, 09 Mar 2012 18:48:12 +0000
+
+docbook-to-man (1:2.0.0-28) unstable; urgency=low
+
+ * Removed regexp.3 from package (Closes: #573942).
+ * Added patch to fix instant.1.
+
+ -- Philipp Benner <philipp at debian.org> Tue, 16 Mar 2010 12:01:45 +0000
+
+docbook-to-man (1:2.0.0-27) unstable; urgency=low
+
+ * New maintainer e-mail address.
+ * debian/control: Added DM-Upload-Allowed: yes.
+ * debian/control: Standards version 3.7.3.
+ * debian/copyright: UTF-8 encoding.
+
+ -- Philipp Benner <pbenner at uni-osnabrueck.de> Mon, 14 Jan 2008 18:06:42 +0100
+
+docbook-to-man (1:2.0.0-26) unstable; urgency=low
+
+ * Fixed debian-rules-ignores-make-clean-error.
+ * Added Vcs-Browser and Vcs-Svn fields.
+ * Machine interpretable copyright file.
+
+ -- Philipp Benner <mail at philipp-benner.de> Wed, 28 Nov 2007 22:45:40 +0100
+
+docbook-to-man (1:2.0.0-25) unstable; urgency=low
+
+ * Fixed missing space before required arguments in section synopsis
+ (Closes: #375951).
+ * Replaced `\fP' and `\fB' in usermode environment by `.ft' command
+ (Closes: #211466).
+
+ -- Philipp Benner <mail at philipp-benner.de> Mon, 2 Apr 2007 00:05:14 +0200
+
+docbook-to-man (1:2.0.0-24) unstable; urgency=low
+
+ * Adopting package (Closes: #407712).
+
+ -- Philipp Benner <mail at philipp-benner.de> Sat, 20 Jan 2007 22:30:34 +0100
+
+docbook-to-man (1:2.0.0-23) unstable; urgency=low
+
+ * Orphaning package.
+
+ -- Daniel Baumann <daniel at debian.org> Sat, 20 Jan 2007 19:44:00 +0100
+
+docbook-to-man (1:2.0.0-22) unstable; urgency=low
+
+ * Minor cleanups.
+
+ -- Daniel Baumann <daniel at debian.org> Fri, 19 Jan 2007 12:23:00 +0100
+
+docbook-to-man (1:2.0.0-21) unstable; urgency=low
+
+ * Took over package from Luk.
+ * Redone debian directory based on new debhelper templates, additionally:
+ - including README and README.ans as docs.
+ - removed useless README.Debian.
+ - using dpatch for upstream modifications now.
+
+ -- Daniel Baumann <daniel at debian.org> Sat, 29 Jul 2006 17:26:00 +0200
+
+docbook-to-man (1:2.0.0-20) unstable; urgency=low
+
+ * Make shell independent (Closes: #332437).
+
+ -- Luk Claes <luk at debian.org> Sat, 19 Nov 2005 18:40:30 +0100
+
+docbook-to-man (1:2.0.0-19) unstable; urgency=low
+
+ * Remove docbook-dsssl dependency
+ * Correct support for XML sources.
+
+ -- Luk Claes <luk at debian.org> Wed, 3 Aug 2005 17:09:49 +0200
+
+docbook-to-man (1:2.0.0-18) unstable; urgency=low
+
+ * Add support for XML sources (closes: #319153).
+ * Changed e-mail address to luk at debian.org.
+ * Updated Standards-Version.
+ * Added debian/compat.
+
+ -- Luk Claes <luk at debian.org> Wed, 3 Aug 2005 16:36:39 +0200
+
+docbook-to-man (1:2.0.0-17) unstable; urgency=low
+
+ * cmd/docbook-to-man.sh: UTF minus signs (closes: #284209).
+
+ -- Luk Claes <luk.claes at ugent.be> Tue, 21 Dec 2004 14:54:21 +0100
+
+docbook-to-man (1:2.0.0-16) unstable; urgency=low
+
+ * Transpec/docbook-to-man.ts: removed '\\' for OPTION (closes: #279912).
+ * cmd/docbook-to-man.sh: sed/ -/ \\-/g (UTF minus sign).
+
+ -- Luk Claes <luk.claes at ugent.be> Sat, 6 Nov 2004 11:43:54 +0100
+
+docbook-to-man (1:2.0.0-15) unstable; urgency=low
+
+ * Removed postscript and font stuff (closes: #275568, #286383).
+
+ -- Luk Claes <luk.claes at ugent.be> Tue, 12 Oct 2004 15:35:43 +0200
+
+docbook-to-man (1:2.0.0-14) unstable; urgency=low
+
+ * Removed 'extern char *malloc()' from Instant/tptregexp/regexp.c
+ (closes: #270951).
+ * Added section numbers to manpages for instant and transpec
+ * debian/rules: transpec.1 -> transpec.5
+ * Transpec/docbook-to-man.ts added '//' for OPTION (UTF minus sign)
+
+ -- Luk Claes <luk.claes at ugent.be> Fri, 10 Sep 2004 11:18:11 +0200
+
+docbook-to-man (1:2.0.0-13) unstable; urgency=low
+
+ * Updated manpage and groff comments generated (closes: #208574).
+
+ -- Luk Claes <luk.claes at ugent.be> Fri, 5 Sep 2003 09:12:39 +0200
+
+docbook-to-man (1:2.0.0-12) unstable; urgency=low
+
+ * New maintainer (closes: #154590).
+ * Depends now on sp|opensp instead of sp (closes: #196835).
+ * Updated to standards version 3.6.1.
+ * Removed recommendation to switch to DocBook/XML, xsltproc, and docbook-xsl in debian/control and in manpage.
+ * doElanPSInclude=false (closes: #189222).
+ * Added instructions to use white space in manpage (closes: #111919,#111920,#111921,#112105).
+ * Use fR instead of fP causes minor inconvenience when nested markup is used (closes: #111918).
+
+ -- Luk Claes <luk.claes at ugent.be> Tue, 2 Sep 2003 10:34:12 +0200
+
+docbook-to-man (1:2.0.0-11.1) unstable; urgency=low
+
+ * Depends now on sp|opensp instead of sp (closes: #196835).
+ * New standards version.
+ * Recommendation to switch to DocBook/XML, xsltproc, and docbook-xsl in
+ debian/control and in manual page.
+
+ -- W. Borgert <debacle at debian.org> Sun, 17 Aug 2003 21:20:29 +0200
+
+docbook-to-man (1:2.0.0-11) unstable; urgency=low
+
+ * Add hint to use xsltproc and docbook-xsl to description, and a
+ recommends to control.
+ * Fix dependency on docbook-dsssl (closes: #177981).
+
+ -- W. Borgert <debacle at debian.org> Sun, 26 Jan 2003 16:22:43 +0000
+
+docbook-to-man (1:2.0.0-10) unstable; urgency=low
+
+ * Changed references in manual pages, closes: #131752.
+ * Used all changes by John, so still closes: #115210.
+
+ -- W. Borgert <debacle at debian.org> Sat, 27 Apr 2002 15:25:44 +0000
+
+docbook-to-man (1:2.0.0-9.1) unstable; urgency=medium
+
+ * NMU
+ * transpec/roff.sdata: Significant cleanup.
+ + Swap last two characters on some entities (closes: bug#115210)
+ + Remove extraneous text on a few entities (e.g. lcub)
+ + Escape !, ^ on some entities (e.g. excl)
+ + Improve sub-optimal entities (e.g. yen)
+ + Define entities previously commented out (e.g. atilde)
+ + Add delimiter math symbols previously ignored (e.g. rceil)
+ * cmd/docbook-to-man.sh:
+ + Move $INSTANT_OPT to the end of the instant command-line invocation
+ so that it will override earlier command-line arguments. For
+ example, instant seems to ignore all but the last -s argument.
+ * debian/rules:
+ + Add make clean, make clobber to the clean target
+ + Un-tabify comment lines so they aren't invoked by the rules file
+ * debian/changelog:
+ + Remove emacs variables from end.
+
+ -- John R. Daily <koala at debian.org> Tue, 26 Mar 2002 15:47:23 -0500
+
+docbook-to-man (1:2.0.0-9) unstable; urgency=low
+
+ * Fixed paths to DocBook 4.1 in Debian (closes: bug#98441).
+
+ -- W. Borgert <debacle at debian.org> Sun, 27 May 2001 13:21:40 +0000
+
+docbook-to-man (1:2.0.0-8) unstable; urgency=low
+
+ * INSTANT_OPT is now inherited from the environment. Makes it
+ possible to run instant w/o options.
+ * Better manual page. These two points: closes: bug#76013.
+ * A little update to support DocBook 4.1 partly.
+
+ -- W. Borgert <debacle at debian.org> Fri, 26 Jan 2001 22:41:51 +0000
+
+docbook-to-man (1:2.0.0-7) frozen unstable; urgency=low
+
+ * Fixed some meaningless warnings. Closes: bug#69286.
+ * Added build dependency on debhelper.
+
+ -- W. Borgert <debacle at debian.org> Thu, 17 Aug 2000 03:34:05 +0000
+
+docbook-to-man (1:2.0.0-6) frozen unstable; urgency=low
+
+ * Re-upload to frozen. Still closes: bug#50714.
+
+ -- W. Borgert <debacle at debian.org> Sat, 22 Jan 2000 12:21:14 +0000
+
+docbook-to-man (1:2.0.0-5) frozen unstable; urgency=low
+
+ * Added reference to source in copyright file. Closes: bug#50714.
+ * Renamed from docbook-to-man-ans to docbook-to-man,
+ because there seems to be no other variant around.
+
+ -- W. Borgert <debacle at debian.org> Sun, 28 Nov 1999 12:33:44 +0000
+
+docbook-to-man-ans (1:2.0.0-4) unstable; urgency=low
+
+ * Instead of removing space characters from the SGML source, removing
+ leading spaces from the roff file. Looks even better.
+ * Error messages of the shell script go to stderr.
+ * Docs and man pages according new policy.
+
+ -- W. Borgert <debacle at debian.org> Thu, 14 Oct 1999 22:04:00 +0000
+
+docbook-to-man-ans (1:2.0.0-3) unstable; urgency=low
+
+ * Removing trailing spaces from SGML source. Looks better.
+ * Version name 2.0.0 instead of 2.0.0.ans,
+ because "ans" is already in the package name.
+
+ -- W. Borgert <debacle at debian.org> Mon, 19 Aug 1999 19:47:00 +0000
+
+docbook-to-man-ans (2.0.0.ans-2) unstable; urgency=low
+
+ * Changed platfrom from i386 to any. Closes: bug#42692.
+ * Added SGML source of man page to docs.
+
+ -- W. Borgert <debacle at debian.org> Mon, 9 Aug 1999 20:55:00 +0000
+
+docbook-to-man-ans (2.0.0.ans-1) unstable; urgency=low
+
+ * Initial Release for debian.
+
+ -- W. Borgert <debacle at debian.org> Sat, 3 Jul 1999 13:17:52 +0000
diff --cc debian/control
index c91de63,0000000..a675b7b
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,20 -1,0 +1,24 @@@
+Source: docbook-to-man
+Section: text
+Priority: optional
- Maintainer: Debian QA Group <packages at qa.debian.org>
++Maintainer: Maxime Chatelle <xakz at rxsoft.eu>
+Build-Depends: debhelper (>= 9)
- Standards-Version: 3.9.3
- Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/docbook-to-man/
- Vcs-Svn: svn://svn.debian.org/collab-maint/deb-maint/docbook-to-man/
++Standards-Version: 3.9.6
++Vcs-Browser: http://anonscm.debian.org/viewvc/collab-maint/deb-maint/docbook-to-man/
++Vcs-Svn: svn://anonscm.debian.org/collab-maint/deb-maint/docbook-to-man/
+Homepage: http://www.oasis-open.org/docbook/tools/dtm/
+
+Package: docbook-to-man
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, docbook, sp | opensp
+Multi-Arch: foreign
+Description: converter from DocBook SGML into roff man macros
+ docbook-to-man is a batch converter that transforms UNIX-style manpages from
+ the DocBook SGML format into nroff/troff man macros.
+ .
+ This is not the original version by Fred Dalrymple, but one with the
+ modifications by David Bolen.
++ .
++ docbook-to-man lacks support for internationalization and utf-8. Other
++ tools like docbook2man or docbook-xml with xsltproc are better suited for
++ new projects.
diff --cc debian/copyright
index 6bb5d89,0000000..291923a
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,39 -1,0 +1,41 @@@
- This package was downloaded from http://www.oasis-open.org/docbook/tools/dtm/
++Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
++Source: http://www.oasis-open.org/docbook/tools/dtm/
+
+Files: *
- Copyright: © 1996 X Consortium
- © 1996 Dalrymple Computing
++Copyright: 1996 X Consortium
++ 1996 Dalrymple Computing
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE X CONSORTIUM OR DALRYMPLE CONSULTING BE LIABLE FOR
+ ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ .
+ Except as contained in this notice, the names of the X Consortium and
+ Dalrymple Consulting shall not be used in advertising or otherwise to
+ promote the sale, use or other dealings in this Software without prior
+ written authorization.
+
+Files: debian/*
- Copyright: © 2006-2007 Daniel Baumann <daniel at debian.org>
- © 2007 Philipp Benner <pbenner at uni-osnabrueck.de>
++Copyright: 2006-2007 Daniel Baumann <daniel at debian.org>
++ 2007 Philipp Benner <pbenner at uni-osnabrueck.de>
++ 2014 Maxime Chatelle <xakz at rxsoft.eu>
+License: GPL-2+
+ This package was debianized by Daniel Baumann on Sat, 29 Jul 2006
- and is licensed under the GPL. It is now maintained by Philipp Benner.
-
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-2'.
++ and is licensed under the GPL.
++ .
++ On Debian GNU/Linux systems, the complete text of the GNU General
++ Public License can be found in `/usr/share/common-licenses/GPL-2'.
diff --cc debian/patches/01-conglomeration.patch
index 3e9ebd3,0000000..762e490
mode 100755,000000..100755
--- a/debian/patches/01-conglomeration.patch
+++ b/debian/patches/01-conglomeration.patch
@@@ -1,1496 -1,0 +1,1491 @@@
- #!/bin/sh /usr/share/dpatch/dpatch-run
- ## 01-conglomeration.dpatch
- ##
- ## DP: Needs to be broken out (FIXME).
-
- @DPATCH@
-
++Description: Needs to be broken out (FIXME).
++Author: Philipp Benner <philipp at debian.org>
+diff -Naur docbook-to-man-2.0.0.orig/Doc/Makefile docbook-to-man-2.0.0/Doc/Makefile
+--- docbook-to-man-2.0.0.orig/Doc/Makefile 1970-01-01 00:00:00.000000000 +0000
++++ docbook-to-man-2.0.0/Doc/Makefile 2006-07-29 15:23:05.000000000 +0000
+@@ -0,0 +1,6 @@
++# $Id: Makefile,v 1.1 1999/07/03 15:27:44 debacle Exp $
++
++docbook-to-man.1: docbook-to-man.sgml
++ nsgmls -i roff docbook-to-man.sgml | \
++ instant -t docbook-to-man.ts -c roff.cmap -s roff.sdata > \
++ docbook-to-man.1
+diff -Naur docbook-to-man-2.0.0.orig/Doc/docbook-to-man.1 docbook-to-man-2.0.0/Doc/docbook-to-man.1
+--- docbook-to-man-2.0.0.orig/Doc/docbook-to-man.1 1970-01-01 00:00:00.000000000 +0000
++++ docbook-to-man-2.0.0/Doc/docbook-to-man.1 2006-07-29 15:23:05.000000000 +0000
+@@ -0,0 +1,141 @@
++.\" $Header: /aolnet/dev/src/CVS/sgml/docbook-to-man/cmd/docbook-to-man.sh,v 1.1.1.1 1998/11/13 21:31:59 db3l Exp $
++.\"
++.\" transcript compatibility for postscript use.
++.\"
++.\" synopsis: .P! <file.ps>
++.\"
++.de P!
++.fl
++\!!1 setgray
++.fl
++\\&.\"
++.fl
++\!!0 setgray
++.fl \" force out current output buffer
++\!!save /psv exch def currentpoint translate 0 0 moveto
++\!!/showpage{}def
++.fl \" prolog
++.sy sed \-e 's/^/!/' \\$1\" bring in postscript file
++\!!psv restore
++.
++.de pF
++.ie \\*(f1 .ds f1 \\n(.f
++.el .ie \\*(f2 .ds f2 \\n(.f
++.el .ie \\*(f3 .ds f3 \\n(.f
++.el .ie \\*(f4 .ds f4 \\n(.f
++.el .tm ? font overflow
++.ft \\$1
++..
++.de fP
++.ie !\\*(f4 \{\
++. ft \\*(f4
++. ds f4\"
++' br \}
++.el .ie !\\*(f3 \{\
++. ft \\*(f3
++. ds f3\"
++' br \}
++.el .ie !\\*(f2 \{\
++. ft \\*(f2
++. ds f2\"
++' br \}
++.el .ie !\\*(f1 \{\
++. ft \\*(f1
++. ds f1\"
++' br \}
++.el .tm ? font underflow
++..
++.ds f1\"
++.ds f2\"
++.ds f3\"
++.ds f4\"
++'\" t
++.ta 8n 16n 24n 32n 40n 48n 56n 64n 72n
++.TH "docbook-to-man" "1"
++.SH "NAME"
++docbook-to-man \(em convert \fBDocBook\fP SGML into roff \-man macros
++.SH "SYNOPSIS"
++.PP
++\fBdocbook-to-man\fR [\fIsource.sgml\fR] [>] [\fIdestination.1\fR]
++.SH "DESCRIPTION"
++.PP
++The docbook-to-man tool is a batch converter that transforms
++UNIX-style manpages from the \fBDocBook\fP SGML DTD into nroff/troff \-man macros.
++.PP
++docbook-to-man is the shell command that runs the low-level
++components to translate a single \fBDocBook\fP SGML document
++instance (whose document element is <RefEntry>) into
++pretty-much vanilla \-man macros, with tables rendered in
++tbl.
++.PP
++This is not the original version by Fred Dalrymple, but one
++with the ANS Modifications by David Bolen (db3l at ans.net).
++.PP
++This manual page and some small changes are by W. Borgert
++debacle at debian.org for \fBDebian GNU/Linux\fP. Permission is
++granted to copy, distribute and/or modify this document under
++the terms of the GNU Free Documentation
++License, Version 1.1 or any later version published by the Free
++Software Foundation; with no Invariant Sections, no Front-Cover
++Texts and no Back-Cover Texts.
++.SH "White space and special characters"
++.PP
++If you want to use tabs in your manpage you should use <programlisting>, <literal> or <screen> and invoke docbook-to-man with INSTANT_OPT set to a tab character. Be aware that multiple tabs will be collapsed into one.
++.PP
++When you want to collapse white space into one, you should invoke docbook-to-man with INSTANT_OPT set to a space character.
++.PP
++Special characters like \\, ' or . will not be interpreted if you set INSTANT_OPT to a space or tab character.
++.SH "ENVIRONMENT"
++.PP
++If the variable INSTANT_OPT is not set, the
++\fBinstant(1)\fR is called with the parameter
++\fB\-d\fP by docbook-to-man. If you don't want this,
++e.g. if you want to use some special characters literally in
++your SGML file, you can set INSTANT_OPT to just
++a space character:
++.PP
++\fBINSTANT_OPT="
++" docbook-to-man src.sgml >
++dst.1\fR
++.
++.PP
++Note: The better way to use special characters like ^ or
++> is to write them in the SGML way, i.e. ⁁
++or >.
++.SH "COPYRIGHT"
++.PP
++Copyright (c) 1996 X Consortium
++.PP
++Copyright (c) 1996 Dalrymple Consulting
++.PP
++Permission is hereby granted, free of charge, to any person
++obtaining a copy of this software and associated documentation
++files (the "Software"), to deal in the Software without
++restriction, including without limitation the rights to use,
++copy, modify, merge, publish, distribute, sublicense, and/or
++sell copies of the Software, and to permit persons to whom the
++Software is furnished to do so, subject to the following
++conditions:
++.PP
++The above copyright notice and this permission notice shall
++be included in all copies or substantial portions of the
++Software.
++.PP
++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
++KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
++WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
++AND NONINFRINGEMENT. IN NO EVENT SHALL THE X CONSORTIUM OR
++DALRYMPLE CONSULTING BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
++ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
++USE OR OTHER DEALINGS IN THE SOFTWARE.
++.PP
++Except as contained in this notice, the names of the X
++Consortium and Dalrymple Consulting shall not be used in
++advertising or otherwise to promote the sale, use or other
++dealings in this Software without prior written
++authorization.
++.SH "See also"
++.PP
++instant(1) and transpec(5)
++.\" created by instant / docbook-to-man, Fri 10 Sep 2004, 13:13
+diff -Naur docbook-to-man-2.0.0.orig/Doc/docbook-to-man.sgml docbook-to-man-2.0.0/Doc/docbook-to-man.sgml
+--- docbook-to-man-2.0.0.orig/Doc/docbook-to-man.sgml 1970-01-01 00:00:00.000000000 +0000
++++ docbook-to-man-2.0.0/Doc/docbook-to-man.sgml 2006-07-29 15:23:05.000000000 +0000
+@@ -0,0 +1,125 @@
++<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++ <!ENTITY debian "<productname>Debian GNU/Linux</productname>">
++ <!ENTITY docbook "<productname>DocBook</productname>">
++ <!ENTITY sgml "<abbrev>SGML</abbrev>">
++]>
++
++<!-- Manual page for docbook-to-man, DocBook source file
++ (C) 1999 W. Borgert debacle at debian.org
++
++ $Id: docbook-to-man.sgml,v 1.10 2003/08/17 19:35:54 debacle Exp $ -->
++
++<refentry>
++ <refentryinfo>
++ <address>
++ <email>debacle at debian.org</email>
++ </address>
++ <author>
++ <firstname>W.</firstname>
++ <surname>Borgert</surname>
++ </author>
++ <date>1999-06-03</date>
++ </refentryinfo>
++ <refmeta>
++ <refentrytitle>docbook-to-man</refentrytitle>
++ <manvolnum>1</manvolnum>
++ </refmeta>
++ <refnamediv>
++ <refname>docbook-to-man</refname> <refpurpose>convert &docbook;
++ &sgml; into roff \-man macros</refpurpose>
++ </refnamediv>
++ <refsynopsisdiv>
++ <cmdsynopsis>
++ <command>docbook-to-man</command>
++ <arg><replaceable>source.sgml</replaceable></arg>
++ <arg>></arg>
++ <arg><replaceable>destination.1</replaceable></arg>
++ </cmdsynopsis>
++ </refsynopsisdiv>
++ <refsect1>
++ <title>DESCRIPTION</title>
++
++ <para>The docbook-to-man tool is a batch converter that transforms
++ UNIX-style manpages from the &docbook; &sgml;
++ <abbrev>DTD</abbrev> into nroff/troff \-man macros.</para>
++
++ <para>docbook-to-man is the shell command that runs the low-level
++ components to translate a single &docbook; &sgml; document
++ instance (whose document element is <RefEntry>) into
++ pretty-much vanilla \-man macros, with tables rendered in
++ tbl.</para>
++
++ <para>This is not the original version by Fred Dalrymple, but one
++ with the ANS Modifications by David Bolen (db3l at ans.net).</para>
++
++ <para>This manual page and some small changes are by W. Borgert
++ <email>debacle at debian.org</email> for &debian;. Permission is
++ granted to copy, distribute and/or modify this document under
++ the terms of the <acronym>GNU</acronym> Free Documentation
++ License, Version 1.1 or any later version published by the Free
++ Software Foundation; with no Invariant Sections, no Front-Cover
++ Texts and no Back-Cover Texts.</para>
++ </refsect1>
++ <refsect1>
++ <title>White space and special characters</title>
++ <para>If you want to use tabs in your manpage you should use <programlisting>, <literal> or <screen> and invoke docbook-to-man with <envar>INSTANT_OPT</envar> set to a tab character. Be aware that multiple tabs will be collapsed into one.</para>
++ <para>When you want to collapse white space into one, you should invoke docbook-to-man with <envar>INSTANT_OPT</envar> set to a space character.</para>
++ <para>Special characters like \\, ' or . will not be interpreted if you set <envar>INSTANT_OPT</envar> to a space or tab character.</para>
++ </refsect1>
++ <refsect1>
++ <title>ENVIRONMENT</title>
++ <subtitle>INSTANT_OPT</subtitle>
++ <para>If the variable <envar>INSTANT_OPT</envar> is not set, the
++ <command>instant(1)</command> is called with the parameter
++ <option>-d</option> by docbook-to-man. If you don't want this,
++ e.g. if you want to use some special characters literally in
++ your &sgml; file, you can set <envar>INSTANT_OPT</envar> to just
++ a space character: <cmdsynopsis><command>INSTANT_OPT="
++ " docbook-to-man src.sgml >
++ dst.1</command></cmdsynopsis>.</para>
++
++ <para>Note: The better way to use special characters like ⁁ or
++ > is to write them in the &sgml; way, i.e. ⁁
++ or >.</para>
++ </refsect1>
++ <refsect1>
++ <title>COPYRIGHT</title>
++
++ <para>Copyright (c) 1996 X Consortium</para>
++ <para>Copyright (c) 1996 Dalrymple Consulting</para>
++
++ <para>Permission is hereby granted, free of charge, to any person
++ obtaining a copy of this software and associated documentation
++ files (the "Software"), to deal in the Software without
++ restriction, including without limitation the rights to use,
++ copy, modify, merge, publish, distribute, sublicense, and/or
++ sell copies of the Software, and to permit persons to whom the
++ Software is furnished to do so, subject to the following
++ conditions:</para>
++
++ <para>The above copyright notice and this permission notice shall
++ be included in all copies or substantial portions of the
++ Software.</para>
++
++ <para>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
++ KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
++ WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
++ AND NONINFRINGEMENT. IN NO EVENT SHALL THE X CONSORTIUM OR
++ DALRYMPLE CONSULTING BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
++ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
++ USE OR OTHER DEALINGS IN THE SOFTWARE.</para>
++
++ <para>Except as contained in this notice, the names of the X
++ Consortium and Dalrymple Consulting shall not be used in
++ advertising or otherwise to promote the sale, use or other
++ dealings in this Software without prior written
++ authorization.</para>
++
++ </refsect1>
++ <refsect1>
++ <title>See also</title>
++
++ <para>instant(1) and transpec(5)</para>
++ </refsect1>
++</refentry>
+diff -Naur docbook-to-man-2.0.0.orig/Doc/instant.1 docbook-to-man-2.0.0/Doc/instant.1
+--- docbook-to-man-2.0.0.orig/Doc/instant.1 1999-07-03 12:58:22.000000000 +0000
++++ docbook-to-man-2.0.0/Doc/instant.1 2006-07-29 15:23:05.000000000 +0000
+@@ -1,46 +1,46 @@
+-...\"
+-...\" Copyright (c) 1994
+-...\" Open Software Foundation, Inc.
+-...\"
+-...\" Permission is hereby granted to use, copy, modify and freely distribute
+-...\" the software in this file and its documentation for any purpose without
+-...\" fee, provided that the above copyright notice appears in all copies and
+-...\" that both the copyright notice and this permission notice appear in
+-...\" supporting documentation. Further, provided that the name of Open
+-...\" Software Foundation, Inc. ("OSF") not be used in advertising or
+-...\" publicity pertaining to distribution of the software without prior
+-...\" written permission from OSF. OSF makes no representations about the
+-...\" suitability of this software for any purpose. It is provided "as is"
+-...\" without express or implied warranty.
+-...\"
+-...\" Copyright (c) 1996 X Consortium
+-...\" Copyright (c) 1996 Dalrymple Consulting
+-...\"
+-...\" Permission is hereby granted, free of charge, to any person obtaining a copy
+-...\" of this software and associated documentation files (the "Software"), to deal
+-...\" in the Software without restriction, including without limitation the rights
+-...\" to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+-...\" copies of the Software, and to permit persons to whom the Software is
+-...\" furnished to do so, subject to the following conditions:
+-...\"
+-...\" The above copyright notice and this permission notice shall be included in
+-...\" all copies or substantial portions of the Software.
+-...\"
+-...\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+-...\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+-...\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+-...\" X CONSORTIUM OR DALRYMPLE CONSULTING BE LIABLE FOR ANY CLAIM, DAMAGES OR
+-...\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+-...\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+-...\" OTHER DEALINGS IN THE SOFTWARE.
+-...\"
+-...\" Except as contained in this notice, the names of the X Consortium and
+-...\" Dalrymple Consulting shall not be used in advertising or otherwise to
+-...\" promote the sale, use or other dealings in this Software without prior
+-...\" written authorization.
+-...\"
+-...\" Translated with /usr/local/lib/tpt/ref-man.ts by fld on cord, Wed 07 Feb 1996, 21:59
+-.TH "instant" "user cmd"
++.\" -*- nroff -*-
++.\" Copyright (c) 1994
++.\" Open Software Foundation, Inc.
++.\"
++.\" Permission is hereby granted to use, copy, modify and freely distribute
++.\" the software in this file and its documentation for any purpose without
++.\" fee, provided that the above copyright notice appears in all copies and
++.\" that both the copyright notice and this permission notice appear in
++.\" supporting documentation. Further, provided that the name of Open
++.\" Software Foundation, Inc. ("OSF") not be used in advertising or
++.\" publicity pertaining to distribution of the software without prior
++.\" written permission from OSF. OSF makes no representations about the
++.\" suitability of this software for any purpose. It is provided "as is"
++.\" without express or implied warranty.
++.\"
++.\" Copyright (c) 1996 X Consortium
++.\" Copyright (c) 1996 Dalrymple Consulting
++.\"
++.\" Permission is hereby granted, free of charge, to any person obtaining a copy
++.\" of this software and associated documentation files (the "Software"), to deal
++.\" in the Software without restriction, including without limitation the rights
++.\" to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++.\" copies of the Software, and to permit persons to whom the Software is
++.\" furnished to do so, subject to the following conditions:
++.\"
++.\" The above copyright notice and this permission notice shall be included in
++.\" all copies or substantial portions of the Software.
++.\"
++.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++.\" X CONSORTIUM OR DALRYMPLE CONSULTING BE LIABLE FOR ANY CLAIM, DAMAGES OR
++.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
++.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++.\" OTHER DEALINGS IN THE SOFTWARE.
++.\"
++.\" Except as contained in this notice, the names of the X Consortium and
++.\" Dalrymple Consulting shall not be used in advertising or otherwise to
++.\" promote the sale, use or other dealings in this Software without prior
++.\" written authorization.
++.\"
++.\" Translated with /usr/local/lib/tpt/ref-man.ts by fld on cord, Wed 07 Feb 1996, 21:59
++.TH "instant" "1" "user cmd"
+ .SH "Name"
+ instant - manipulates ESIS from parsed SGML instance
+ .SH "Synopsis"
+@@ -52,14 +52,14 @@
+ .PP
+ The \fBinstant\fP program manipulates an SGML document instance in a variety of ways,
+ including translating into a form suitable for a formatting application and printing information about this instance.
+-Input to \fBinstant\fP is the output of \fBsgmls\fP, whose format is called Element Structure Information Set (ESIS).
++Input to \fBinstant\fP is the output of \fBnsgmls\fP, whose format is called Element Structure Information Set (ESIS).
+ .SH "Flags"
+ .PP
+ The following are the possible command line options to \fBinstant\fP. Output is sent to the standard output, except where otherwise noted.
+ 'br\" labeled list
+ .IP "\fB-t\fP \fIfile\fP"
+ Translate the SGML instance to another form, usually suitable for a formatting application.
+-The \fIfile\fP is called a translation spec, which specifies how the tags are to be translated. See \fBtranspec\fP(4).
++The \fIfile\fP is called a translation spec, which specifies how the tags are to be translated. See \fBtranspec\fP(5).
+ By convention, names for \fIfile\fP use the suffix \fB.ts\fP, for \fItranslation spec\fP.
+ .IP "\fB-s\fP \fIfile\fP "
+ Specifies a file of mappings for SDATA entities in the instance.
+@@ -109,7 +109,7 @@
+ .IP "\fB-I\fP"
+ List the IDs of all elements in the instance that have an ID. The format is more suitable for other programs than humans.
+ Lines show the ID, element GI, filename, and line, separated by colons.
+-(This depends on the \fB-l\fP option to \fBsgmls\fP which provide filenames and line numbers.)
++(This depends on the \fB-l\fP option to \fBnsgmls\fP which provide filenames and line numbers.)
+ .IP "\fB-i\fP \fIid\fP"
+ When translating the instance, begin processing at the element whose ID is \fIid\fP instead of the topmost element.
+ .IP "\fB-D\fP \fIvariable\fP\fB=\fP\fIvalue\fP"
+@@ -120,7 +120,7 @@
+ Print a help message briefly describing the options.
+ .IP "\fIfile\fP"
+ Read the instance from the file \fIfile\fP.
+-This is expected to be the output of the program \fBsgmls\fP.
++This is expected to be the output of the program \fBnsgmls\fP.
+ If not specified, \fBinstant\fP reads the instance from its standard input.
+ 'br\" labeled list end
+ .PP
+@@ -193,4 +193,4 @@
+ 'br\" labeled list end
+ .SH "Related Information"
+ .PP
+-\fBtranspec\fP(4), \fBsgmls\fP(1), Standard Generalized Markup Language (SGML), ISO 8879.
++\fBtranspec\fP(5), \fBnsgmls\fP(1), Standard Generalized Markup Language (SGML), ISO 8879.
+diff -Naur docbook-to-man-2.0.0.orig/Doc/transpec.1 docbook-to-man-2.0.0/Doc/transpec.1
+--- docbook-to-man-2.0.0.orig/Doc/transpec.1 1999-07-03 12:58:22.000000000 +0000
++++ docbook-to-man-2.0.0/Doc/transpec.1 2006-07-29 15:23:05.000000000 +0000
+@@ -1,47 +1,47 @@
+-...\"
+-...\"
+-...\" Copyright (c) 1994
+-...\" Open Software Foundation, Inc.
+-...\"
+-...\" Permission is hereby granted to use, copy, modify and freely distribute
+-...\" the software in this file and its documentation for any purpose without
+-...\" fee, provided that the above copyright notice appears in all copies and
+-...\" that both the copyright notice and this permission notice appear in
+-...\" supporting documentation. Further, provided that the name of Open
+-...\" Software Foundation, Inc. ("OSF") not be used in advertising or
+-...\" publicity pertaining to distribution of the software without prior
+-...\" written permission from OSF. OSF makes no representations about the
+-...\" suitability of this software for any purpose. It is provided "as is"
+-...\" without express or implied warranty.
+-...\"
+-...\" Copyright (c) 1996 X Consortium
+-...\" Copyright (c) 1996 Dalrymple Consulting
+-...\"
+-...\" Permission is hereby granted, free of charge, to any person obtaining a copy
+-...\" of this software and associated documentation files (the "Software"), to deal
+-...\" in the Software without restriction, including without limitation the rights
+-...\" to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+-...\" copies of the Software, and to permit persons to whom the Software is
+-...\" furnished to do so, subject to the following conditions:
+-...\"
+-...\" The above copyright notice and this permission notice shall be included in
+-...\" all copies or substantial portions of the Software.
+-...\"
+-...\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+-...\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+-...\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+-...\" X CONSORTIUM OR DALRYMPLE CONSULTING BE LIABLE FOR ANY CLAIM, DAMAGES OR
+-...\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+-...\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+-...\" OTHER DEALINGS IN THE SOFTWARE.
+-...\"
+-...\" Except as contained in this notice, the names of the X Consortium and
+-...\" Dalrymple Consulting shall not be used in advertising or otherwise to
+-...\" promote the sale, use or other dealings in this Software without prior
+-...\" written authorization.
+-...\"
+-...\" Translated with /usr/local/lib/tpt/ref-man.ts by fld on cord, Wed 07 Feb 1996, 22:00
+-.TH "\fBtranspec\fP" "file format"
++.\" -*- nroff -*-
++.\"
++.\" Copyright (c) 1994
++.\" Open Software Foundation, Inc.
++.\"
++.\" Permission is hereby granted to use, copy, modify and freely distribute
++.\" the software in this file and its documentation for any purpose without
++.\" fee, provided that the above copyright notice appears in all copies and
++.\" that both the copyright notice and this permission notice appear in
++.\" supporting documentation. Further, provided that the name of Open
++.\" Software Foundation, Inc. ("OSF") not be used in advertising or
++.\" publicity pertaining to distribution of the software without prior
++.\" written permission from OSF. OSF makes no representations about the
++.\" suitability of this software for any purpose. It is provided "as is"
++.\" without express or implied warranty.
++.\"
++.\" Copyright (c) 1996 X Consortium
++.\" Copyright (c) 1996 Dalrymple Consulting
++.\"
++.\" Permission is hereby granted, free of charge, to any person obtaining a copy
++.\" of this software and associated documentation files (the "Software"), to deal
++.\" in the Software without restriction, including without limitation the rights
++.\" to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++.\" copies of the Software, and to permit persons to whom the Software is
++.\" furnished to do so, subject to the following conditions:
++.\"
++.\" The above copyright notice and this permission notice shall be included in
++.\" all copies or substantial portions of the Software.
++.\"
++.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++.\" X CONSORTIUM OR DALRYMPLE CONSULTING BE LIABLE FOR ANY CLAIM, DAMAGES OR
++.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
++.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++.\" OTHER DEALINGS IN THE SOFTWARE.
++.\"
++.\" Except as contained in this notice, the names of the X Consortium and
++.\" Dalrymple Consulting shall not be used in advertising or otherwise to
++.\" promote the sale, use or other dealings in this Software without prior
++.\" written authorization.
++.\"
++.\" Translated with /usr/local/lib/tpt/ref-man.ts by fld on cord, Wed 07 Feb 1996, 22:00
++.TH "\fBtranspec\fP" "5" "file format"
+ .SH "Name"
+ \fBtranspec\fP - translation specification for \fBinstant\fP
+ .SH "Synopsis"
+@@ -113,7 +113,7 @@
+ This specifies that the GI is the \fInumber\fPth child element of its parent.
+ Children are numbered starting with \fB1\fP.
+ Negative numbers may be used to indicate order counting backwards.
+-For example, -1 denotes the last child.
++For example, \-1 denotes the last child.
+ .IP "\fBPAttSet:\fP \fIattname\fP"
+ This specifies that the parent has this attribute, \fIattname\fP, set to any value (not IMPLIED). A value to match may optionally
+ be specified after attname.
+@@ -174,7 +174,7 @@
+ .IP "\fBMessage:\fP \fItext\fP"
+ This specifies a string to be printed to the standard error when the matching element is processed.
+ It is intended for informing the user of the progress of the translation.
+-It is also used for validation of instances (see the \fB-v\fP flag of \fBinstant\fP(1));
++It is also used for validation of instances (see the \fB\-v\fP flag of \fBinstant\fP(1));
+ a spec would be written to recognize a construct that is not allowed.
+ This action is done immediately after \fBStartText\fP.
+ Messages are also useful for debugging spec files; one is able to easily tell when a matching spec is processed,
+@@ -262,7 +262,7 @@
+ In fact, if an attribute name is referred to and it is not set for a given element,
+ \fBinstant\fP looks for a variable with the same name. This way global defaults can be set.
+ If you want to be sure that you are accessing a local variable value, not an attribute value, you can use lower or mixed case names.
+-Attribute names, as passed by \fBsgmls\fP, are in upper case.
++Attribute names, as passed by \fBnsgmls\fP, are in upper case.
+ .PP
+ Any number of \fBVar\fP actions may appear in the spec file. These set the values of the variables before any translation takes place.
+ The \fBSet\fP actions within transpecs are performed when that spec is processed when an element matches the given criteria.
+@@ -396,7 +396,7 @@
+ Insert the file \fIfilename\fP into the output stream.
+ .IP "\fB_infile\fP [\fBline\fP]"
+ Print the name of the sgml instance file to the output stream. If \fBline\fP is specified, also print the line number.
+-This depends on \fBsgmls\fP being called with the \fB-l\fP option.
++This depends on \fBnsgmls\fP being called with the \fB\-l\fP option.
+ .IP "\fB_insertnode\fP \fBS\fP|\fBE\fP \fIspec-id\fP"
+ Do \fIspec-id\fP when the current element is traversed at a later pass.
+ This can be considered inserting a node, without content, into the hierarchy.
+@@ -406,7 +406,7 @@
+ \fB_insertnode\fP would be specified as the action of a \fIspec-id\fP pointed to in a \fB_chasetogi\fP or \fB_followlink\fP usage.
+ .IP "\fB_location\fP"
+ The location of the current element is printed to the output stream in several ways: the path to the element (see \fB_path\fP),
+-a position hint, which is the nearest title, the line number, if the ESIS (output from \fBsgmls\fP) contains line numbers,
++a position hint, which is the nearest title, the line number, if the ESIS (output from \fBnsgmls\fP) contains line numbers,
+ and the ID of the element, if it has one.
+ This is especially useful when using the \fBMessage\fP action to validate an instance.
+ .IP "\fB_namelist\fP \fIspec-id\fP [\fIspec-id2\fP]"
+@@ -523,4 +523,4 @@
+ .DE
+ .SH "Related Information"
+ .PP
+-\fBinstant\fP(1), \fBsgmls\fP(1), \fBegrep\fP(1).
++\fBinstant\fP(1), \fBnsgmls\fP(1), \fBegrep\fP(1).
+diff -Naur docbook-to-man-2.0.0.orig/Instant/general.h docbook-to-man-2.0.0/Instant/general.h
+--- docbook-to-man-2.0.0.orig/Instant/general.h 1999-07-03 12:58:23.000000000 +0000
++++ docbook-to-man-2.0.0/Instant/general.h 2006-07-29 15:23:05.000000000 +0000
+@@ -232,6 +232,7 @@
+ def int interactive; /* flag - interactive browsing? */
+ def int slave; /* are we slave to another process? */
+ def int fold_case; /* flag - fold case of GIs? */
++def int xml_mode; /* flag - XML-specific hacks */
+
+ /* ----- some macros for convenience and ease of code reading ----- */
+
+diff -Naur docbook-to-man-2.0.0.orig/Instant/main.c docbook-to-man-2.0.0/Instant/main.c
+--- docbook-to-man-2.0.0.orig/Instant/main.c 1999-07-03 12:58:23.000000000 +0000
++++ docbook-to-man-2.0.0/Instant/main.c 2006-07-29 15:23:05.000000000 +0000
+@@ -199,6 +199,7 @@
+ warnings = 1;
+ fold_case = 1;
+ this_prog = myname;
++ xml_mode = 0;
+
+ /* setup global variable mapping */
+ Variables = NewMap(IMS_variables);
+@@ -258,7 +259,10 @@
+ if (!strcmp(tok[0], "verbose")) verbose = atoi(tok[1]);
+ else if (!strcmp(tok[0], "warnings")) warnings = atoi(tok[1]);
+ else if (!strcmp(tok[0], "foldcase")) fold_case = atoi(tok[1]);
++ else if (!strcmp(tok[0], "xmlmode")) xml_mode = atoi(tok[1]);
+ else SetMappingNV(Variables, tok[0], tok[1]);
++
++ if ( xml_mode ) fold_case = 0; /* set for lowercase if xml flag is ON */
+ }
+ else {
+ fprintf(stderr, "Expected an '=' in variable assignment: %s. Ignored\n",
+@@ -645,19 +649,25 @@
+ *dst = ((*src-'0') << 6) +
+ ((*(src+1)-'0') << 3) +
+ ((*(src+2)-'0'));
++ if ( xml_mode && *dst == 10 && *(dst-1) == '\n') {
++ /* nsgmls outputs \n\012 for XML line endings and we want
++ to ignore the \012 */
++ /* fprintf(stderr, "found newline!: %c\n", *dst); */
++ *dst--;
++ }
+ src += 3;
+ break;
+ case '#': case '%':
+ /* Decimal internal(#)/document(%) char */
+ /* XXX: Handle better */
+- *dst++ = '[';
++ *dst++ = '[';
+ while (*src != ';') {
+ *dst++ = *src++;
+ }
+ *dst++ = ']';
+ src++;
+ /* XXX: Whimp out - no translation */
+- nomap = 1;
++ nomap = 1;
+ break;
+ case '|':
+ /* SDATA reference */
+@@ -725,16 +735,16 @@
+ /* whether or not whitespace is kept in this element */
+ cur_e = e;
+ while (cur_e) {
+- if (pch = FindAttValByName(cur_e,"FORMAT")) {
++ if (pch = FindAttValByName(cur_e,xml_mode ? "format" : "FORMAT")) {
+ #ifdef DEBUG
+- fprintf(stderr," D: Using FORMAT from %s element\n",
++ fprintf(stderr," D: Using format from %s element\n",
+ cur_e->gi);
+ #endif
+ break;
+ }
+ cur_e = cur_e->parent;
+ }
+- if (!(pch && !(strcmp(pch,"LINESPECIFIC")))) {
++ if (!(pch && !(strcmp(pch, xml_mode ? "linespecific" : "LINESPECIFIC")))) {
+ #ifdef DEBUG
+ fprintf(stderr," D: Compressing whitespace\n");
+ #endif
+diff -Naur docbook-to-man-2.0.0.orig/Instant/tptregexp/regexp.c docbook-to-man-2.0.0/Instant/tptregexp/regexp.c
+--- docbook-to-man-2.0.0.orig/Instant/tptregexp/regexp.c 1999-07-03 12:58:24.000000000 +0000
++++ docbook-to-man-2.0.0/Instant/tptregexp/regexp.c 2006-07-29 15:23:05.000000000 +0000
+@@ -196,7 +196,6 @@
+ register char *longest;
+ register int len;
+ int flags;
+- extern char *malloc();
+
+ if (exp == NULL)
+ FAIL("NULL argument");
+@@ -705,7 +704,6 @@
+ register char *string;
+ {
+ register char *s;
+- extern char *strchr();
+
+ /* Be paranoid... */
+ if (prog == NULL || string == NULL) {
+@@ -804,7 +802,6 @@
+ {
+ register char *scan; /* Current node. */
+ char *next; /* Next node. */
+- extern char *strchr();
+
+ scan = prog;
+ #ifdef DEBUG
+diff -Naur docbook-to-man-2.0.0.orig/Makefile docbook-to-man-2.0.0/Makefile
+--- docbook-to-man-2.0.0.orig/Makefile 1999-07-03 12:58:22.000000000 +0000
++++ docbook-to-man-2.0.0/Makefile 2006-07-29 15:23:05.000000000 +0000
+@@ -41,7 +41,7 @@
+ SHELL = /bin/sh
+ MAKE = make
+
+-PIECES = cmd Instant Transpec
++PIECES = cmd Instant Transpec
+
+
+ all:
+diff -Naur docbook-to-man-2.0.0.orig/Transpec/docbook-to-man.prolog docbook-to-man-2.0.0/Transpec/docbook-to-man.prolog
+--- docbook-to-man-2.0.0.orig/Transpec/docbook-to-man.prolog 1999-07-03 12:58:24.000000000 +0000
++++ docbook-to-man-2.0.0/Transpec/docbook-to-man.prolog 2006-07-29 15:23:05.000000000 +0000
+@@ -1,7 +1,7 @@
+-...\"
+-...\" Prolog for docbook-to-man.ts - macros to push/pop fonts.
+-...\" $Id: docbook-to-man.prolog,v 1.1 1999/02/23 21:00:18 db3l Exp $
+-...\"
++.\"
++.\" Prolog for docbook-to-man.ts - macros to push/pop fonts.
++.\" $Id: docbook-to-man.prolog,v 1.1 1999/02/23 21:00:18 db3l Exp $
++.\"
+ .de pF
+ .ie \\*(f1 .ds f1 \\n(.f
+ .el .ie \\*(f2 .ds f2 \\n(.f
+@@ -33,6 +33,6 @@
+ .ds f2\"
+ .ds f3\"
+ .ds f4\"
+-...\"
+-...\" End of prolog
+-...\"
++.\"
++.\" End of prolog
++.\"
+diff -Naur docbook-to-man-2.0.0.orig/Transpec/docbook-to-man.ts docbook-to-man-2.0.0/Transpec/docbook-to-man.ts
+--- docbook-to-man-2.0.0.orig/Transpec/docbook-to-man.ts 1999-07-03 12:58:24.000000000 +0000
++++ docbook-to-man-2.0.0/Transpec/docbook-to-man.ts 2006-07-29 15:23:05.000000000 +0000
+@@ -57,10 +57,10 @@
+ # #### ##### ##### ##### ##### ##### #### #####
+ #
+ GI: REFENTRY
+-StartText: ^'\\" t^${_action 1001}
+- ^.TH "${_followrel descendant REFENTRYTITLE 1000}"
++#StartText: ^'\\" t^${_action 1001}
++StartText: ^${_action 1001}.TH "${_followrel descendant REFENTRYTITLE 1000}"
+ "${_followrel descendant MANVOLNUM 1000}"^
+-EndText: ^...\\" created by instant / docbook-to-man, ${date}^
++EndText: ^.\\" created by instant / docbook-to-man, ${date}^
+ -
+ #
+ GI: DOCINFO
+@@ -71,6 +71,26 @@
+ Context: DOCINFO
+ # inside DocInfo, which we're ignoring
+ -
++GI: COPYRIGHT
++Context: DOCINFO
++# inside DocInfo, which we're ignoring
++-
++GI: HOLDER
++Context: COPYRIGHT
++# inside DocInfo, which we're ignoring
++-
++GI: YEAR
++Context: COPYRIGHT
++# inside DocInfo, which we're ignoring
++-
++#
++GI: REFENTRYINFO
++Ignore: all
++-
++#
++GI: COPYRIGHT
++Context: REFENTRYINFO
++-
+ #
+ GI: REFMETA
+ Ignore: all
+@@ -306,8 +326,10 @@
+ -
+ #
+ GI: PROGRAMLISTING
+-StartText: ^.PP^.nf^${_action 1001}^\\f(CW
+-EndText: \\fR^.fi^.PP^
++#StartText: ^.PP^.nf^${_action 1001}^\\f(CW
++StartText: ^.PP^.nf^${_action 1001}^
++#EndText: \\fR^.fi^.PP^
++EndText: ^.fi^.PP^
+ Verbatim:
+ -
+ #
+@@ -1631,6 +1653,9 @@
+ StartText: \\fI
+ EndText: \\fP
+ -
++GI: ENVAR
++# no special presentation
++-
+ #
+ GI: FIRSTTERM
+ StartText: \\fI
+@@ -1674,7 +1699,8 @@
+ #
+ GI: COMMAND
+ StartText: \\fB
+-EndText: \\fP
++#EndText: \\fP
++EndText: \\fR
+ -
+ #
+ GI: COMPUTEROUTPUT
+@@ -1682,6 +1708,11 @@
+ EndText: \\fP
+ -
+ #
++GI: CONSTANT
++StartText: \\fB
++EndText: \\fP
++-
++#
+ GI: DATABASE
+ # no special presentation
+ -
+@@ -1819,7 +1850,8 @@
+ #
+ GI: REPLACEABLE
+ StartText: \\fI
+-EndText: \\fP
++#EndText: \\fP
++EndText: \\fR
+ -
+ #
+ GI: RETURNVALUE
+@@ -1897,6 +1929,11 @@
+ EndText: \\fP
+ -
+ #
++GI: VARNAME
++StartText: \\fB
++EndText: \\fP
++-
++#
+ GI: AUTHOR
+ # no special presentation - defer to content
+ -
+@@ -2006,7 +2043,7 @@
+ #
+ GI: _tabset
+ SpecID: 1001
+-StartText: .ta 8n 16n 24n 32n 40n 48n 56n 64n 72n
++#StartText: .ta 8n 16n 24n 32n 40n 48n 56n 64n 72n
+ Ignore: all
+ -
+ #
+diff -Naur docbook-to-man-2.0.0.orig/Transpec/docbook-to-man.ts-PUSHPOP docbook-to-man-2.0.0/Transpec/docbook-to-man.ts-PUSHPOP
+--- docbook-to-man-2.0.0.orig/Transpec/docbook-to-man.ts-PUSHPOP 1999-07-03 12:58:24.000000000 +0000
++++ docbook-to-man-2.0.0/Transpec/docbook-to-man.ts-PUSHPOP 2006-07-29 15:23:05.000000000 +0000
+@@ -57,10 +57,11 @@
+ # #### ##### ##### ##### ##### ##### #### #####
+ #
+ GI: REFENTRY
+-StartText: ^'\\" t^.TH "${_followrel descendant REFENTRYTITLE 1000}"
++#StartText: ^'\\" t^.TH "${_followrel descendant REFENTRYTITLE 1000}"
++StartText: ^.TH "${_followrel descendant REFENTRYTITLE 1000}"
+ "${_followrel descendant MANVOLNUM 1000}" "${date}"
+ ^${_action 1002}^${_action 1001}^
+-EndText: ^...\\" created by instant / docbook-to-man, ${date}^
++EndText: ^.\\" created by instant / docbook-to-man, ${date}^
+ -
+ #
+ GI: DOCINFO
+@@ -2161,7 +2162,7 @@
+ #
+ GI: _tabset
+ SpecID: 1001
+-StartText: .ta 8n 16n 24n 32n 40n 48n 56n 64n 72n
++#StartText: .ta 8n 16n 24n 32n 40n 48n 56n 64n 72n
+ Ignore: all
+ -
+ #
+diff -Naur docbook-to-man-2.0.0.orig/Transpec/roff.cmap docbook-to-man-2.0.0/Transpec/roff.cmap
+--- docbook-to-man-2.0.0.orig/Transpec/roff.cmap 1999-07-03 12:58:24.000000000 +0000
++++ docbook-to-man-2.0.0/Transpec/roff.cmap 2006-07-29 15:23:05.000000000 +0000
+@@ -48,6 +48,7 @@
+ #
+ #
+ # From To
++\ \\
+ \\ \\e
+ ^ \^
+ . \\&.
+diff -Naur docbook-to-man-2.0.0.orig/Transpec/roff.sdata docbook-to-man-2.0.0/Transpec/roff.sdata
+--- docbook-to-man-2.0.0.orig/Transpec/roff.sdata 1999-07-03 12:58:24.000000000 +0000
++++ docbook-to-man-2.0.0/Transpec/roff.sdata 2006-07-29 15:23:05.000000000 +0000
+@@ -58,9 +58,9 @@
+ [frac38] 3/8
+ [frac58] 5/8
+ [frac78] 7/8
+-[sup1 ] \\u1\\l
+-[sup2 ] \\u2\\l
+-[sup3 ] \\u3\\l
++[sup1 ] \\(S1
++[sup2 ] \\(S2
++[sup3 ] \\(S3
+ [plus ] \\(pl
+ [plusmn] \\(+-
+ [lt ] <
+@@ -69,10 +69,12 @@
+ [divide] \\(di
+ [times ] \\(ti
+ # [curren] =general currency sign
+-[pound ] #
++[curren] \\(Cs
++[euro ] \\(Cs
++[pound ] \\(Po
+ [dollar] $
+ [cent ] \\(ct
+-[yen ] yen
++[yen ] \\(Ye
+ [num ] #
+ [percnt] %
+ [amp ] &
+@@ -81,7 +83,7 @@
+ [lsqb ] [
+ [bsol ] \\e
+ [rsqb ] ]
+-[lcub ] { /lbrace O: =left curly bracket
++[lcub ] {
+ # [horbar] horizontal bar
+ [horbar] _
+ [verbar] \\(or
+@@ -91,9 +93,13 @@
+ [deg ] \\(de
+ # [ordm ] =ordinal indicator, masculine
+ # [ordf ] =ordinal indicator, feminine
++[ordf ] \\(Of
++[ordm ] \\(Om
+ [sect ] \\(sc
+ # [para ] =pilcrow (paragraph sign)
++[para ] \\(ps
+ # [middot] /centerdot B: =middle dot
++[middot] \\(pc
+ [larr ] \\(<-
+ [rarr ] \\(->
+ [uarr ] \\(ua
+@@ -106,8 +112,9 @@
+ [brvbar] |
+ [not ] \\(no
+ # [sung ] =music note (sung text sign)
+-[excl ] !
++[excl ] \!
+ # [iexcl ] =inverted exclamation mark
++[iexcl ] \\(r!
+ [quot ] "
+ [apos ] \\&'
+ [lpar ] (
+@@ -121,14 +128,15 @@
+ [semi ] ;
+ [quest ] ?
+ # [iquest] =inverted question mark
++[iquest] \\(r?
+ # [laquo ] =angle quotation mark, left
+-[laquo ] <<
++[laquo ] \\(Fo
+ # [raquo ] =angle quotation mark, right
+-[raquo ] >>
++[raquo ] \\(Fc
+ [lsquo ] `
+ [rsquo ] \\&'
+-[ldquo ] "
+-[rdquo ] "
++[ldquo ] \\(lq
++[rdquo ] \\(rq
+ [nbsp ] \\
+ [shy ] \\%
+ #
+@@ -137,8 +145,12 @@
+ # trailing space here
+ [emsp ] \\ \\
+ [ensp ] \\
++# The next two entities are the only ones I can find where the SGML entity
++# doesn't match. From sgml-iso-entities-8879.1986/ISOpub.ent:
++# <!ENTITY emsp13 SDATA "[emsp3 ]"--=1/3-em space-->
+ [emsp3 ] \\
+ [emsp4 ] \\
++#
+ [numsp ] \\0
+ [puncsp] \\|
+ [thinsp] \\!
+@@ -158,6 +170,7 @@
+ [frac16] 1/6
+ [frac56] 5/6
+ # [incare] =in-care-of symbol
++[incare] c/o
+ # [block ] =full block
+ # [uhblk ] =upper half block
+ # [lhblk ] =lower half block
+@@ -170,7 +183,7 @@
+ # [rect ] =rectangle, open
+ # [utri ] /triangle =up triangle, open
+ # [dtri ] /triangledown =down triangle, open
+-[star ] \\(** =star, open
++[star ] \\(**
+ [bull ] \\(bu
+ # [squf ] /blacksquare =sq bullet, filled
+ # [utrif ] /blacktriangle =up tri, filled
+@@ -209,6 +222,7 @@
+ [vellip] \\&...
+ # [hybull] rectangle, filled (hyphen bullet)
+ # [loz ] /lozenge - lozenge or total mark
++[rsquor] \\(lz
+ # [lozf ] /blacklozenge - lozenge, filled
+ # [ltri ] /triangleleft B: l triangle, open
+ # [rtri ] /triangleright B: r triangle, open
+@@ -224,68 +238,100 @@
+ #
+ # Added Latin 1 ________________________________
+ #
+-[aacute] \\(a'
+-[Aacute] \\(A'
+-[acirc ] \\(a^
+-[Acirc ] \\(A^
+-[agrave] \\(a`
+-[Agrave] \\(A`
++[aacute] \\('a
++[Aacute] \\('A
++# It's not clear why, but the ^ must be escaped
++[acirc ] \\(\^a
++[Acirc ] \\(\^A
++[agrave] \\(`a
++[Agrave] \\(`A
++[aring ] \\(oa
++[Aring ] \\(oA
++[atilde] \\(~a
++[Atilde] \\(~A
+ # [aring ] =small a, ring
+ # [Aring ] =capital A, ring
+ # [atilde] =small a, tilde
+ # [Atilde] =capital A, tilde
+-[auml ] \\(a:
++[auml ] \\(:a
++[Auml ] \\(:A
+ # [Auml ] =capital A, dieresis or umlaut mark
+ [aelig ] \\(ae
+ [AElig ] \\(AE
+ # [ccedil] =small c, cedilla
+ # [Ccedil] =capital C, cedilla
++[ccedil] \\(,c
++[Ccedil] \\(,C
+ # [eth ] =small eth, Icelandic
+ # [ETH ] =capital Eth, Icelandic
+-[eacute] \\(e'
+-[Eacute] \\(E'
++[eth ] \\(Sd
++[ETH ] \\(-D
++[eacute] \\('e
++[Eacute] \\('E
+ # [ecirc ] =small e, circumflex accent
+ # [Ecirc ] =capital E, circumflex accent
+-[egrave] \\(e`
+-[Egrave] \\(E`
++[ecirc ] \\(\^e
++[Ecirc ] \\(\^E
++[egrave] \\(`e
++[Egrave] \\(`E
+ # [euml ] =small e, dieresis or umlaut mark
+ # [Euml ] =capital E, dieresis or umlaut mark
+-[iacute] \\(i'
+-[Iacute] \\(I'
++[euml ] \\(:e
++[Euml ] \\(:E
++[iacute] \\('i
++[Iacute] \\('I
+ # [icirc ] =small i, circumflex accent
+ # [Icirc ] =capital I, circumflex accent
+-[igrave] \\(i`
+-[Igrave] \\(I`
++[iuml ] \\(:i
++[Iuml ] \\(:I
++[icirc ] \\(\^i
++[Icirc ] \\(\^I
++[igrave] \\(`i
++[Igrave] \\(`I
+ # [iuml ] =small i, dieresis or umlaut mark
+ # [Iuml ] =capital I, dieresis or umlaut mark
+-[ntilde] \\(n~
+-[Ntilde] \\(N~
+-[oacute] \\(o'
+-[Oacute] \\(O'
++[ntilde] \\(~n
++[Ntilde] \\(~N
++[otilde] \\(~o
++[Otilde] \\(~O
++[oacute] \\('o
++[Oacute] \\('O
+ # [ocirc ] =small o, circumflex accent
+ # [Ocirc ] =capital O, circumflex accent
+-[ograve] \\(o`
+-[Ograve] \\(O`
+-[oslash] \\(o/
+-[Oslash] \\(O/
++[ocirc ] \\(\^o
++[Ocirc ] \\(\^O
++[ograve] \\(`o
++[Ograve] \\(`O
++[oslash] \\(/o
++[Oslash] \\(/O
+ # [otilde] =small o, tilde
+ # [Otilde] =capital O, tilde
+ # [ouml ] =small o, dieresis or umlaut mark
+ # [Ouml ] =capital O, dieresis or umlaut mark
+ [szlig ] \\(ss
+-[thorn ] \\(th
++[thorn ] \\(Tp
+ # [THORN ] =capital THORN, Icelandic
+-[uacute] \\(u'
+-[Uacute] \\(U'
++[uacute] \\('u
++[Uacute] \\('U
+ # [ucirc ] =small u, circumflex accent
+ # [Ucirc ] =capital U, circumflex accent
+-[ugrave] \\(u`
+-[Ugrave] \\(U`
++[ucirc ] \\(\^u
++[Ucirc ] \\(\^U
++[ugrave] \\(`u
++[Ugrave] \\(`U
+ # [uuml ] =small u, dieresis or umlaut mark
+ # [Uuml ] =capital U, dieresis or umlaut mark
++[uuml ] \\(:u
++[Uuml ] \\(:U
+ # [yacute] =small y, acute accent
+ # [Yacute] =capital Y, acute accent
++[yacute] \\('y
++[Yacute] \\('Y
+ # [yuml ] =small y, dieresis or umlaut mark
++[yuml ] \\(:y
++# The character value for Y with diaeresis seems to have been commandeered
++# for 3/4; see iso_8859_15(7) for an example
++[Yuml ] Y
+ #
+ # Added Latin 2 ________________________________
+ #
+@@ -333,6 +379,7 @@
+ # [ijlig ] =small ij ligature
+ # [IJlig ] =capital IJ ligature
+ # [inodot] =small i without dot
++[inodot] \\(.i
+ # [iogon ] =small i, ogonek
+ # [Iogon ] =capital I, ogonek
+ # [itilde] =small i, tilde
+@@ -351,7 +398,9 @@
+ # [lmidot] =small l, middle dot
+ # [Lmidot] =capital L, middle dot
+ # [lstrok] =small l, stroke
++[lstrok] \\(/l
+ # [Lstrok] =capital L, stroke
++[Lstrok] \\(/L
+ # [nacute] =small n, acute accent
+ # [Nacute] =capital N, acute accent
+ # [eng ] =small eng, Lapp
+@@ -366,7 +415,9 @@
+ # [Omacr ] =capital O, macron
+ # [omacr ] =small o, macron
+ # [oelig ] =small oe ligature
++[oelig ] \\(oe
+ # [OElig ] =capital OE ligature
++[OElig ] \\(OE
+ # [racute] =small r, acute accent
+ # [Racute] =capital R, acute accent
+ # [rcaron] =small r, caron
+@@ -512,45 +563,71 @@
+ # General Technical ________________________________
+ #
+ # [aleph ] /aleph =aleph, Hebrew
++[aleph ] \\(Ah
+ # [and ] /wedge /land B: =logical and
++[and ] \\(AN
+ # [ang90 ] =right (90 degree) angle
+ # [angsph] /sphericalangle =angle-spherical
+-[ap ] \\(ap
++[ap ] \\(~~
+ # [becaus] /because R: =because
+ # [bottom] /bot B: =perpendicular
++[bottom] \\(pp
+ # [cap ] /cap B: =intersection
++[cap ] \\(ca
+ # [cong ] /cong R: =congruent with
++[cong ] \\(=~
+ # [conint] /oint L: =contour integral operator
+ # [cup ] /cup B: =union or logical sum
++[cup ] \\(cu
+ [equiv ] \\(==
+ # [exist ] /exists =at least one exists
++[exist ] \\(te
+ # [forall] /forall =for all
++[forall] \\(fa
+ # [fnof ] =function of (italic small f)
++[fnof ] \\(Fn
+ [ge ] \\(>=
+ # [iff ] /iff =if and only if
++[iff ] <=>
+ [infin ] \\(if
+ # [int ] /int L: =integral operator
++[int ] \\(is
+ [isin ] \\(sb
+ # [lang ] /langle O: =left angle bracket
++[lang ] <
+ # [lArr ] /Leftarrow A: =is implied by
++[lArr ] \\(lA
+ [le ] \\(<=
+ [minus ] \\(mi
+ # [mnplus] /mp B: =minus-or-plus sign
+ # [nabla ] /nabla =del, Hamilton operator
++[nabla ] \\(gr
+ [ne ] \\(!=
+ # [ni ] /ni /owns R: =contains
++[ni ] \\(st
+ # [or ] /vee /lor B: =logical or
++[or ] \\(OR
+ # [par ] /parallel R: =parallel
++[par ] ||
+ # [part ] /partial =partial differential
++[part ] \\(pd
+ # [permil] =per thousand
++[permil] \\(%0
+ # [perp ] /perp R: =perpendicular
++[perp ] \\(pp
+ # [prime ] /prime =prime or minute
++[prime ] \\(fm
+ # [Prime ] =double prime or second
++[Prime ] \\(sd
+ [prop ] \\(pt
+ # [radic ] /surd =radical
++[radic ] \\(sr
+ # [rang ] /rangle C: =right angle bracket
++[rang ] >
+ # [rArr ] /Rightarrow A: =implies
++[rArr ] \\(rA
+ # [sim ] /sim R: =similar
++[sim ] \\(ti
+ # [sime ] /simeq R: =similar, equals
+ [square] \\(sq
+ [sub ] \\(sb
+@@ -558,16 +635,24 @@
+ [sup ] \\(sp
+ [supe ] \\(ip
+ # [there4] /therefore R: =therefore
++[there4] \\(tf
+ # [Verbar] /Vert =dbl vertical bar
++[Verbar] ||
+ # [angst ] Angstrom =capital A, ring
++[angst ] \\(\^A
+ # [bernou] Bernoulli function (script capital B)
++# A less than desirable solution
++[angst ] B
+ # [compfn] B: composite function (small circle)
+ # [Dot ] =dieresis or umlaut mark
++[Dot ] \\(ad
+ # [DotDot] four dots above
+ # [hamilt] Hamiltonian (script capital H)
+ # [lagran] Lagrangian (script capital L)
+ # [lowast] low asterisk
++[lowast] \\(**
+ # [notin ] N: negated set membership
++[notin ] \\(nm
+ # [order ] order of (script small o)
+ # [phmmat] physics M-matrix (script capital M)
+ # [tdot ] three dots above
+@@ -576,18 +661,33 @@
+ #
+ # Diacritical Marks ________________________________
+ #
+-[acute ] \\&'
+-[breve ] \\(be
+-[caron ] \\(hc
+-[cedil ] \\(cd
++[acute ] \\aa
++[breve ] \\(ab
++[caron ] \\(ah
++[cedil ] \\(ac
+ # [circ ] =circumflex accent
++[circ ] \\(a\^
+ # [dblac ] =double acute accent
++[dblac ] \\(a"
+ # [die ] =dieresis
+-[dot ] \\(dt
++[die ] \\(ad
++[dot ] \\(a.
+ [grave ] `
+-[macr ] \\(ma
+-[ogon ] \\(og
+-[ring ] \\(ri
++[macr ] \\(a-
++[ogon ] \\(ho
++[ring ] \\(ao
+ [tilde ] ~
+-[uml ] \\(..
++[uml ] \\(ad
++#
++# Added Math Symbols: Delimiters
++#
++[rceil ] \\(rc
++[lceil ] \\(lc
++[rfloor] \\(rf
++[lfloor] \\(lf
++# [rpargt] ??
++# [urcorn] Top right corner
++# [drcorn] Bottom right corner
++# [ulcorn] Top left corner
++# [dlcorn] Bottom left corner
+ #
+diff -Naur docbook-to-man-2.0.0.orig/ans.patch docbook-to-man-2.0.0/ans.patch
+--- docbook-to-man-2.0.0.orig/ans.patch 1999-07-03 12:58:22.000000000 +0000
++++ docbook-to-man-2.0.0/ans.patch 2006-07-29 15:23:05.000000000 +0000
+@@ -1116,7 +1116,7 @@
+ ! StartText: ^.ta 8n 16n 24n 32n 40n 48n 56n 64n 72n
+ ^.TH "${_followrel descendant REFENTRYTITLE 1000}"
+ "${_followrel descendant MANVOLNUM 1000}"^
+- EndText: ^...\\" created by instant / docbook-to-man, ${date}^
++ EndText: ^.\\" created by instant / docbook-to-man, ${date}^
+ --- 57,63 ----
+ # #### ##### ##### ##### ##### ##### #### #####
+ #
+@@ -1124,7 +1124,7 @@
+ ! StartText: ^'\\" t^${_action 1001}
+ ^.TH "${_followrel descendant REFENTRYTITLE 1000}"
+ "${_followrel descendant MANVOLNUM 1000}"^
+- EndText: ^...\\" created by instant / docbook-to-man, ${date}^
++ EndText: ^.\\" created by instant / docbook-to-man, ${date}^
+ ***************
+ *** 133,138 ****
+ --- 137,147 ----
+@@ -1356,7 +1356,7 @@
+ ! StartText: ^.ta 8n 16n 24n 32n 40n 48n 56n 64n 72n
+ ! ^.TH "${_followrel descendant REFENTRYTITLE 1000}"
+ ! "${_followrel descendant MANVOLNUM 1000}"^
+-! EndText: ^...\\" created by instant / docbook-to-man, ${date}
++! EndText: ^.\\" created by instant / docbook-to-man, ${date}
+ -
+ #
+ GI: DOCINFO
+@@ -1367,7 +1367,7 @@
+ ! StartText: ^'\\" t^.TH "${_followrel descendant REFENTRYTITLE 1000}"
+ ! "${_followrel descendant MANVOLNUM 1000}" "${date}"
+ ! ^${_action 1002}^${_action 1001}^
+-! EndText: ^...\\" created by instant / docbook-to-man, ${date}^
++! EndText: ^.\\" created by instant / docbook-to-man, ${date}^
+ -
+ #
+ GI: DOCINFO
+diff -Naur docbook-to-man-2.0.0.orig/cmd/docbook-to-man.sh docbook-to-man-2.0.0/cmd/docbook-to-man.sh
+--- docbook-to-man-2.0.0.orig/cmd/docbook-to-man.sh 1999-07-03 12:58:23.000000000 +0000
++++ docbook-to-man-2.0.0/cmd/docbook-to-man.sh 2006-07-29 15:23:05.000000000 +0000
+@@ -37,33 +37,22 @@
+ #
+ #############################################################################
+
+-# ***** change the following paths if your installation of nsgmls and / or
+-# ***** DocBook isn't into the default places.
+-
+-ROOT=/usr/local
+-SGMLS=$ROOT/lib/sgml
+-DOCBOOK=$SGMLS/Davenport/dtd
+-
+-
+-# ***** modify the following line (to "=false") if you're not using the
+-# ***** Elan Documentor's Workbench
+-
+-doElanPSInclude=true
+-
+-
+-
+-# Everything below this line should be pretty standard and not require
+-# modification.
+-
+-#ulimit -c unlimited
+-
+-PARSER=nsgmls
+-INSTANT=instant
+-INSTANT_OPT=-d
++ROOT=/usr
++SGMLS=$ROOT/share/sgml
++DOCBOOK=$SGMLS/docbook/dtd/4.1
++
++if test -x /usr/bin/nsgmls; then
++ PARSER=/usr/bin/nsgmls
++elif test -x /usr/bin/onsgmls; then
++ PARSER=/usr/bin/onsgmls
++else
++ echo "error: SGML parser not found" 1>&2
++fi
++INSTANT=/usr/bin/instant
++INSTANT_OPT=${INSTANT_OPT:-"-d"}
+
+ CATALOG=$DOCBOOK/docbook.cat
+ DECL=$DOCBOOK/docbook.dcl
+-#PROLOG=$DOCBOOK/docbook.prolog
+
+ error=false
+
+@@ -72,104 +61,13 @@
+ else error=true
+ fi
+
+-if `$error`
+-then echo "usage: docbook-to-man docbook-instance"
+- exit 1
+-fi
++$error && echo "usage: docbook-to-man docbook-instance" 1>&2 && exit 1
+
+-if `$doElanPSInclude`
+-then cat > /tmp/dtm.$$.psinc <<\!
+-...\" $Header: /aolnet/dev/src/CVS/sgml/docbook-to-man/cmd/docbook-to-man.sh,v 1.1.1.1 1998/11/13 21:31:59 db3l Exp $
+-...\"
+-...\" transcript compatibility for postscript use.
+-...\"
+-...\" synopsis: .P! <file.ps>
+-...\"
+-.de P!
+-\\&.
+-.fl \" force out current output buffer
+-\\!%PB
+-\\!/showpage{}def
+-...\" the following is from Ken Flowers -- it prevents dictionary overflows
+-\\!/tempdict 200 dict def tempdict begin
+-.fl \" prolog
+-.sy cat \\$1\" bring in postscript file
+-...\" the following line matches the tempdict above
+-\\!end % tempdict %
+-\\!PE
+-\\!.
+-.sp \\$2u \" move below the image
+-..
+-!
+-else cat > /tmp/dtm.$$.psinc <<\!
+-...\" $Header: /aolnet/dev/src/CVS/sgml/docbook-to-man/cmd/docbook-to-man.sh,v 1.1.1.1 1998/11/13 21:31:59 db3l Exp $
+-...\"
+-...\" transcript compatibility for postscript use.
+-...\"
+-...\" synopsis: .P! <file.ps>
+-...\"
+-.de P!
+-.fl
+-\!!1 setgray
+-.fl
+-\\&.\"
+-.fl
+-\!!0 setgray
+-.fl \" force out current output buffer
+-\!!save /psv exch def currentpoint translate 0 0 moveto
+-\!!/showpage{}def
+-.fl \" prolog
+-.sy sed -e 's/^/!/' \\$1\" bring in postscript file
+-\!!psv restore
+-.
+-!
+-fi
+-
+-cat >> /tmp/dtm.$$.psinc <<\!
+-.de pF
+-.ie \\*(f1 .ds f1 \\n(.f
+-.el .ie \\*(f2 .ds f2 \\n(.f
+-.el .ie \\*(f3 .ds f3 \\n(.f
+-.el .ie \\*(f4 .ds f4 \\n(.f
+-.el .tm ? font overflow
+-.ft \\$1
+-..
+-.de fP
+-.ie !\\*(f4 \{\
+-. ft \\*(f4
+-. ds f4\"
+-' br \}
+-.el .ie !\\*(f3 \{\
+-. ft \\*(f3
+-. ds f3\"
+-' br \}
+-.el .ie !\\*(f2 \{\
+-. ft \\*(f2
+-. ds f2\"
+-' br \}
+-.el .ie !\\*(f1 \{\
+-. ft \\*(f1
+-. ds f1\"
+-' br \}
+-.el .tm ? font underflow
+-..
+-.ds f1\"
+-.ds f2\"
+-.ds f3\"
+-.ds f4\"
+-!
+-
+-
+-#if [ ! -f $PROLOG ]
+-#then cat > $PROLOG <<!
+-#<!DOCTYPE RefEntry PUBLIC "-//Davenport//DTD DocBook V2.4.1//EN" [
+-#<!ENTITY npzwc "">
+-#]>
+-#!
+-#fi
+-
+-(cat /tmp/dtm.$$.psinc;
++(#cat /tmp/dtm.$$.psinc;
+ $PARSER -gl -m$CATALOG $DECL $INSTANCE |
+- $INSTANT $INSTANT_OPT -croff.cmap -sroff.sdata -tdocbook-to-man.ts)
+-
+-rm -f /tmp/dtm.$$.psinc
++ $INSTANT -croff.cmap -sroff.sdata -tdocbook-to-man.ts $INSTANT_OPT |
++ sed 's/^[ ]*//
++ s/$/ /
++ s/--/\\-\\-/g
++ s/^-/\\-/
++ s/\([^A-Za-z0-9\-]\)-/\1\\-/g' )
diff --cc debian/patches/02-arg-req-space.patch
index 439d250,0000000..313648a
mode 100755,000000..100755
--- a/debian/patches/02-arg-req-space.patch
+++ b/debian/patches/02-arg-req-space.patch
@@@ -1,26 -1,0 +1,17 @@@
- #! /bin/sh /usr/share/dpatch/dpatch-run
- ## 02-arg-req-space.dpatch by Philipp Benner <mail at philipp-benner.de>
- ##
- ## DP: Inserts missing space after required arguments in section synopsis.
- ## DP: (Closes: #375951)
-
- @DPATCH@
-
- ---
- Transpec/docbook-to-man.ts | 5 +++++
- 1 file changed, 5 insertions(+)
-
++Description: Inserts missing space after required arguments in section synopsis.
++Author: Philipp Benner <mail at philipp-benner.de>
++Bug-Debian: http://bugs.debian.org/375951
+--- a/Transpec/docbook-to-man.ts
++++ b/Transpec/docbook-to-man.ts
+@@ -1218,6 +1218,11 @@
+ EndText: ${_attval REP REPEAT 505}]\s
+ -
+ #
++GI: ARG
++AttValue: CHOICE REQ
++StartText: \s
++-
++#
+ GI: ARG
+ # no special attrs -- just pass content through
+ EndText: ${_attval REP REPEAT 505}\s
diff --cc debian/patches/03-userinput-font.patch
index 94edce5,0000000..77578ba
mode 100755,000000..100755
--- a/debian/patches/03-userinput-font.patch
+++ b/debian/patches/03-userinput-font.patch
@@@ -1,26 -1,0 +1,17 @@@
- #! /bin/sh /usr/share/dpatch/dpatch-run
- ## 03-userinput-font.dpatch by Philipp Benner <mail at philipp-benner.de>
- ##
- ## DP: `\fB' and `\fP' are not appropriate for the userinput environment.
- ## DP: Instead, `.ft' is used as a replacement. See bug #211466 for
- ## DP: discussion.
-
- @DPATCH@
-
- ---
- Transpec/docbook-to-man.ts | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
++Description: `\fB' and `\fP' are not appropriate for the userinput environment.
++ Instead, `.ft' is used as a replacement.
++Author: Philipp Benner <mail at philipp-benner.de>
++Bug-Debian: http://bugs.debian.org/211466
+--- a/Transpec/docbook-to-man.ts
++++ b/Transpec/docbook-to-man.ts
+@@ -1930,8 +1930,8 @@
+ -
+ #
+ GI: USERINPUT
+-StartText: \\fB
+-EndText: \\fP
++StartText: ^.ft\sB^
++EndText: ^.ft
+ -
+ #
+ GI: VARNAME
diff --cc debian/patches/04-instant-man.patch
index 7e24dbf,0000000..b5a8838
mode 100755,000000..100755
--- a/debian/patches/04-instant-man.patch
+++ b/debian/patches/04-instant-man.patch
@@@ -1,19 -1,0 +1,14 @@@
- #! /bin/sh /usr/share/dpatch/dpatch-run
- ## 04-instant-man.dpatch by Philipp Benner <philipp at debian.org>
- ##
- ## DP: Fixes errors in the instant manpage.
-
- @DPATCH@
-
++Description: Fixes errors in the instant manpage.
++Author: Philipp Benner <philipp at debian.org>
+diff -urNad docbook-to-man-2.0.0~/Doc/instant.1 docbook-to-man-2.0.0/Doc/instant.1
+--- docbook-to-man-2.0.0~/Doc/instant.1 2010-03-16 23:56:17.000000000 +0200
++++ docbook-to-man-2.0.0/Doc/instant.1 2010-03-16 23:57:28.000000000 +0200
+@@ -78,7 +78,7 @@
+ The mappings are specific to the formatting application used.
+ Lines beginning with a \fB#\fP are comments, and are ignored. Empty lines are also ignored.
+ .IP "\fB-d\fP"
+-"Data hack" \*EM strip newline at the beginning of data records
++strip newline at the beginning of data records
+ .IP "\fB-f \fIlength\fR"
+ Set the threshold for the length, in characters,
+ of an <Entry>, over which it is called a block of filled text, to \fIlength\fR.
diff --cc debian/patches/05-makefile.patch
index 53811bf,0000000..b283e5c
mode 100644,000000..100644
--- a/debian/patches/05-makefile.patch
+++ b/debian/patches/05-makefile.patch
@@@ -1,46 -1,0 +1,48 @@@
++Description: Fix bad use of CFLAGS in Makefiles
++Author: Philipp Benner <philipp at debian.org>
+Index: docbook-to-man-2.0.0/Instant/tptregexp/Makefile
+===================================================================
+--- docbook-to-man-2.0.0.orig/Instant/tptregexp/Makefile 1999-07-03 12:58:23.000000000 +0000
++++ docbook-to-man-2.0.0/Instant/tptregexp/Makefile 2012-04-27 09:23:08.000000000 +0000
+@@ -50,7 +50,7 @@
+ # -p profiler
+ PROF=
+
+-CFLAGS=-O $(ENV) $(TEST) $(PROF)
++CFLAGS=-O $(ENV)
+ LINTFLAGS=$(LENV) $(TEST) -ha
+ LDFLAGS=
+
+@@ -67,6 +67,9 @@
+ try: try.o $(OBJ)
+ $(CC) $(LDFLAGS) try.o $(OBJ) -o try
+
++%.o : %.c
++ $(CC) -c $(CFLAGS) $(TEST) $(PROF) $< -o $@
++
+ # Making timer will probably require putting stuff in $(PROF) and then
+ # recompiling everything; the following is just the final stage.
+ timer: timer.o $(OBJ)
+Index: docbook-to-man-2.0.0/Instant/Makefile
+===================================================================
+--- docbook-to-man-2.0.0.orig/Instant/Makefile 1999-07-03 12:58:23.000000000 +0000
++++ docbook-to-man-2.0.0/Instant/Makefile 2012-04-27 09:24:48.000000000 +0000
+@@ -76,8 +76,6 @@
+ CC = gcc
+
+ OPT = -g
+-CFLAGS = $(OPT) $(REGEX_INC) $(DEFINES)
+-LDFLAGS = $(OPT)
+ REGEX = -L$(REGEX_LIB) -ltptregexp
+
+ CFILES = main.c util.c info.c translate.c traninit.c tranvar.c tables.c \
+@@ -89,6 +87,9 @@
+
+ all: dotptregexp $(PROGS)
+
++%.o : %.c
++ $(CC) -c $(CFLAGS) $(OPT) $(REGEX_INC) $(DEFINES) $< -o $@
++
+ dotptregexp:
+ cd tptregexp; $(MAKE) all
+
diff --cc debian/patches/06-format-security.patch
index b10f4df,0000000..9a123d5
mode 100644,000000..100644
--- a/debian/patches/06-format-security.patch
+++ b/debian/patches/06-format-security.patch
@@@ -1,13 -1,0 +1,15 @@@
++Description: Fix format string security flaw.
++Author: Philipp Benner <philipp at debian.org>
+Index: docbook-to-man-2.0.0.obsolete.0.268825520834984/Instant/browse.c
+===================================================================
+--- docbook-to-man-2.0.0.obsolete.0.268825520834984.orig/Instant/browse.c 1999-07-03 12:58:23.000000000 +0000
++++ docbook-to-man-2.0.0.obsolete.0.268825520834984/Instant/browse.c 2012-04-27 09:34:24.000000000 +0000
+@@ -168,7 +168,7 @@
+ if (av[1] && isdigit(*av[1])) {
+ n = atoi(av[1]);
+ if (n < ce->ndcont) {
+- printf(ce->dcont[n]);
++ printf("%s", ce->dcont[n]);
+ fputs("\n", stdout);
+ }
+ else if (ce->ndcont == 0)
diff --cc debian/patches/better-checking-of-return-value-of-Split-function.patch
index 0000000,0000000..afe8049
new file mode 100644
--- /dev/null
+++ b/debian/patches/better-checking-of-return-value-of-Split-function.patch
@@@ -1,0 -1,0 +1,56 @@@
++Description: Better checking of the return value of the Split() function (util.c)
++Author: Maxime Chatelle <xakz at rxsoft.eu>
++Last-Update: 2014-11-13
++Bug-Debian: https://bugs.debian.org/716055
++Forwarded: no
++--- a/Instant/main.c
+++++ b/Instant/main.c
++@@ -255,6 +255,11 @@
++ *cp = ' ';
++ n = 2;
++ tok = Split(buf, &n, 0);
+++ if (!tok) {
+++ fprintf(stderr, "Error: Bad input in variable assignment: %s\n",
+++ var);
+++ return;
+++ }
++ /* see if variable name matches one of our internal ones */
++ if (!strcmp(tok[0], "verbose")) verbose = atoi(tok[1]);
++ else if (!strcmp(tok[0], "warnings")) warnings = atoi(tok[1]);
++@@ -474,6 +479,11 @@
++ case CMD_ATT: /* Aname val */
++ i = 3;
++ tok = Split(buf, &i, 0);
+++ if (!tok) {
+++ fprintf(stderr, "Error: Malformed command, line %d: %c%s\n",
+++ e->lineno, c, buf);
+++ break;
+++ }
++ if (!strcmp(tok[1], "IMPLIED")) break; /* skip IMPLIED atts. */
++ if (!strcmp(tok[1], "CDATA") || !strcmp(tok[1], "TOKEN") ||
++ !strcmp(tok[1], "ENTITY") ||!strcmp(tok[1], "NOTATION"))
++@@ -519,6 +529,11 @@
++ case CMD_EXT_ENT: /* Eename typ nname */
++ i = 3;
++ tok = Split(buf, &i, 0);
+++ if (!tok) {
+++ fprintf(stderr, "Error: Malformed command, line %d: %c%s\n",
+++ e->lineno, c, buf);
+++ break;
+++ }
++ ent.ename = strdup(tok[0]);
++ ent.type = strdup(tok[1]);
++ ent.nname = strdup(tok[2]);
++--- a/Instant/browse.c
+++++ b/Instant/browse.c
++@@ -128,6 +128,10 @@
++ }
++ ac = 20;
++ av = Split(buf, &ac, S_ALVEC);
+++ if (!av) {
+++ printf("Bad input line entered.\n");
+++ break;
+++ }
++ if (ac > 0) cmd = av[0];
++ if (!cmd || !(*cmd)) continue;
++
diff --cc debian/patches/series
index a8e87ff,0000000..699dac6
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,6 -1,0 +1,7 @@@
+01-conglomeration.patch
+02-arg-req-space.patch
+03-userinput-font.patch
+04-instant-man.patch
+05-makefile.patch
+06-format-security.patch
++better-checking-of-return-value-of-Split-function.patch
diff --cc debian/watch
index 0000000,0000000..a8d3280
new file mode 100644
--- /dev/null
+++ b/debian/watch
@@@ -1,0 -1,0 +1,1 @@@
++# Dummy watch file. Upstream is not maintained.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/docbook-to-man.git
More information about the Reproducible-commits
mailing list