Avoid some confusion by not putting to-be-documented macros at the

beginning of a line.

3 files changed, 55 insertions, 1 deletions

diff --git a/textproc/doclifter/distinfo b/textproc/doclifter/distinfo
index 87362e74886..dc789b85a8c 100644
--- a/textproc/doclifter/distinfo
+++ b/textproc/doclifter/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.12 2007/01/15 23:40:46 wiz Exp $
+$NetBSD: distinfo,v 1.13 2012/03/22 21:43:35 wiz Exp $
 
 SHA1 (doclifter-2.3.tar.gz) = 8ca55df65eb16958bc774abb3dc3d5929f5fa444
 RMD160 (doclifter-2.3.tar.gz) = c1e18770260f40e74ad3b842ab09a92ed6f36646
 Size (doclifter-2.3.tar.gz) = 132537 bytes
 SHA1 (patch-aa) = ef13eca669f2b57ca559d631e6067ba290a25bd1
+SHA1 (patch-doclifter.1) = 01c6cc595ccf73fb49e3897008548ad54d17d72f
+SHA1 (patch-manlifter.1) = f6e48940ee0d596f8f915f3d31545963e475e25d
diff --git a/textproc/doclifter/patches/patch-doclifter.1 b/textproc/doclifter/patches/patch-doclifter.1
new file mode 100644
index 00000000000..81ad9b12d52
--- /dev/null
+++ b/textproc/doclifter/patches/patch-doclifter.1
@@ -0,0 +1,36 @@
+$NetBSD: patch-doclifter.1,v 1.1 2012/03/22 21:43:35 wiz Exp $
+
+Avoid confusion with real macro calls.
+
+--- doclifter.1.orig	2006-12-25 07:43:35.000000000 +0000
++++ doclifter.1
+@@ -102,8 +102,7 @@ Troff and macro\-package special charact
+ .PP
+ When
+ \fBdoclifter\fR
+-encounters a
+-.so
++encounters a .so
+ directive, it searches for the file. If it can get read access to the file, and open it, and the file consists entirely of command lines and comments, then it is included. If any of these conditions fails, an entity reference for it is generated.
+ .PP
+ \fBdoclifter\fR
+@@ -637,8 +636,7 @@ The
+ .nf
+ and
+ .fi
+-macros are interpreted as literal\-layout boundaries. Calls to the
+-.so
++macros are interpreted as literal\-layout boundaries. Calls to the .so
+ macro either cause inclusion or are translated into XML entity inclusions (see above). Calls to the
+ .ul
+ and
+@@ -782,8 +780,7 @@ cannot be certain how subsections should
+ If you're translating a page that uses user\-defined macros and you get bad output, the first thing to do is simplify or eliminate the user\-defined macros. Replace them with stock requests where possible.
+ .SH "RETURN VALUES"
+ .PP
+-On successful completion, the program returns status 0. It returns 1 if some file or standard input could not be translated. It returns 2 if one of the input sources was a
+-.so
++On successful completion, the program returns status 0. It returns 1 if some file or standard input could not be translated. It returns 2 if one of the input sources was a .so
+ inclusion. It returns 3 if there is an error in reading or writing files. It returns 4 to indicate an internal error. It returns 5 when aborted by a keyboard interrupt.
+ .PP
+ Note that a zero return does not guarantee that the output is valid DocBook. It will almost always (as in, more than 96% of cases) be syntactically valid XML, but in some rare cases fixups by hand may be necessary to meet the semantics of the DocBook DTD. Validation problems are most likely to occur with complicated list markup.
diff --git a/textproc/doclifter/patches/patch-manlifter.1 b/textproc/doclifter/patches/patch-manlifter.1
new file mode 100644
index 00000000000..6a71dbe1f26
--- /dev/null
+++ b/textproc/doclifter/patches/patch-manlifter.1
@@ -0,0 +1,16 @@
+$NetBSD: patch-manlifter.1,v 1.1 2012/03/22 21:43:35 wiz Exp $
+
+Avoid confusion with real macro calls.
+
+--- manlifter.1.orig	2006-12-25 07:43:35.000000000 +0000
++++ manlifter.1
+@@ -29,8 +29,7 @@ For each source file examined, if the de
+ \fBmanlifter\fR
+ do the least work needed to keep the target XML tree up to date. Likewise, in \-h mode derived HTML files are only made when necessary.
+ .PP
+-Stub pages that are just
+-.so
++Stub pages that are just .so
+ redirections are translated to corresponding symlinks of XML files (and, with \-h, HTML files).
+ .PP
+ \fBmanlifter\fR