From MAILER-DAEMON Fri Jan 14 04:36:19 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1CpNpJ-0000AE-Ht
	for mharc-groff-commit@gnu.org; Fri, 14 Jan 2005 04:33:05 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1CpNp5-00006P-Jb
	for groff-commit@gnu.org; Fri, 14 Jan 2005 04:32:52 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1CpNoz-0008WJ-OX
	for groff-commit@gnu.org; Fri, 14 Jan 2005 04:32:46 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1CpNoy-0008LB-TY
	for groff-commit@gnu.org; Fri, 14 Jan 2005 04:32:45 -0500
Received: from [199.232.41.4] (helo=savannah)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1CpNLR-0003Ol-Kf
	for groff-commit@gnu.org; Fri, 14 Jan 2005 04:02:13 -0500
Received: from savannah ([127.0.0.1])
	by savannah with smtp (Exim 3.35 #1 (Debian)) id 1CpNLP-0001rQ-00
	for <groff-commit@gnu.org>; Fri, 14 Jan 2005 04:02:11 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CpNLP-0001rQ-00@savannah>
Date: Fri, 14 Jan 2005 04:02:11 -0500
Subject: [Groff-commit] groff ./ChangeLog tmac/doc.tmac
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: groff-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Jan 2005 09:33:02 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@savannah.gnu.org>	05/01/14 09:02:11

Modified files:
	.              : ChangeLog 
	tmac           : doc.tmac 

Log message:
	* tmac/doc.tmac (Ef): Restore doc-curr-font and doc-curr-size.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.776&tr2=1.777&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/tmac/doc.tmac.diff?tr1=1.34&tr2=1.35&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.776 groff/ChangeLog:1.777
--- groff/ChangeLog:1.776	Tue Dec 21 05:56:52 2004
+++ groff/ChangeLog	Fri Jan 14 09:02:10 2005
@@ -1,3 +1,7 @@
+2005-01-13  Ruslan Ermilov  <ru@FreeBSD.org>
+
+	* tmac/doc.tmac (Ef): Restore doc-curr-font and doc-curr-size.
+
 2004-12-19  Werner LEMBERG  <wl@gnu.org>
 
 	* install-sh: New version; taken from texinfo CVS.
Index: groff/tmac/doc.tmac
diff -u groff/tmac/doc.tmac:1.34 groff/tmac/doc.tmac:1.35
--- groff/tmac/doc.tmac:1.34	Sat Aug 28 08:15:22 2004
+++ groff/tmac/doc.tmac	Fri Jan 14 09:02:11 2005
@@ -2501,7 +2501,9 @@
 .    nop \)\s[\n[doc-fontmode-size-stack\n[doc-fontmode-depth]]u]\c
 .
 .    nr doc-fontmode-font-stack\n[doc-fontmode-depth] 0
+.    nr doc-curr-font \n[.f]
 .    nr doc-fontmode-size-stack\n[doc-fontmode-depth] 0
+.    nr doc-curr-size \n[.ps]
 .    nr doc-fontmode-depth -1
 .  \}
 .  el \



From MAILER-DAEMON Sat Jan 15 21:18:03 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Cpzxu-0006cC-I8
	for mharc-groff-commit@gnu.org; Sat, 15 Jan 2005 21:16:31 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Cpzri-0005sf-IC
	for groff-commit@gnu.org; Sat, 15 Jan 2005 21:10:11 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1CpzrJ-0005if-Ez
	for groff-commit@gnu.org; Sat, 15 Jan 2005 21:09:52 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1CpzrG-0005fz-Nn
	for groff-commit@gnu.org; Sat, 15 Jan 2005 21:09:38 -0500
Received: from [199.232.41.4] (helo=savannah)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1CpzRq-0003AY-3u
	for groff-commit@gnu.org; Sat, 15 Jan 2005 20:43:22 -0500
Received: from savannah ([127.0.0.1])
	by savannah with smtp (Exim 3.35 #1 (Debian)) id 1CpzRp-0007JI-00
	for <groff-commit@gnu.org>; Sat, 15 Jan 2005 20:43:21 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CpzRp-0007JI-00@savannah>
Date: Sat, 15 Jan 2005 20:43:21 -0500
Subject: [Groff-commit] groff/contrib/gdiffmk ChangeLog README gdiffmk....
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: groff-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Jan 2005 02:16:28 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@savannah.gnu.org>	05/01/16 01:43:21

Modified files:
	contrib/gdiffmk: ChangeLog README gdiffmk.man gdiffmk.sh 
	contrib/gdiffmk/tests: runtests.in 
Added files:
	contrib/gdiffmk/tests: test_baseline10 test_baseline8 
	                       test_baseline9 

Log message:
	* gdiffmk.sh: Add the -D, -M, and -B options, which provide actions
	akin to nrchbar.
	Thanks to Larry Kollar (http://home.alltel.net/kollar/groff/).
	
	* gdiffmk.man: Updated.
	
	* tests/runtests.in: Added tests for gdiffmk's -D, -M, and -B
	options.
	
	* tests/baseline8, tests/baseline9, tests/baseline10: New files.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/ChangeLog.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/README.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/gdiffmk.man.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/gdiffmk.sh.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/tests/test_baseline10?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/tests/test_baseline8?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/tests/test_baseline9?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/tests/runtests.in.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: groff/contrib/gdiffmk/ChangeLog
diff -u groff/contrib/gdiffmk/ChangeLog:1.8 groff/contrib/gdiffmk/ChangeLog:1.9
--- groff/contrib/gdiffmk/ChangeLog:1.8	Fri Dec 17 05:56:13 2004
+++ groff/contrib/gdiffmk/ChangeLog	Sun Jan 16 01:43:21 2005
@@ -1,3 +1,16 @@
+2005-01-13  Mike Bianchi  <MBianchi@Foveal.com>
+
+	* gdiffmk.sh: Add the -D, -M, and -B options, which provide actions
+	akin to nrchbar.
+	Thanks to Larry Kollar (http://home.alltel.net/kollar/groff/).
+
+	* gdiffmk.man: Updated.
+
+	* tests/runtests.in: Added tests for gdiffmk's -D, -M, and -B
+	options.
+
+	* tests/baseline8, tests/baseline9, tests/baseline10: New files.
+
 2004-12-16  Mike Bianchi  <MBianchi@Foveal.com>
 
 	* tests/runtests.in: Fix typo (s/$(srcdir)/${srcdir}/).
Index: groff/contrib/gdiffmk/README
diff -u groff/contrib/gdiffmk/README:1.3 groff/contrib/gdiffmk/README:1.4
--- groff/contrib/gdiffmk/README:1.3	Thu Dec 16 22:02:21 2004
+++ groff/contrib/gdiffmk/README	Sun Jan 16 01:43:21 2005
@@ -1,13 +1,16 @@
 gdiffmk is approximately a recreation of the original Bell Labs/AT&T diffmk
 command for troff/nroff documents, with enhancements.
 
-It should not be confused with diffmk commands that operate on XML.
+It should not be confused with `diffmk' commands that operate on XML.
 
 The inspiration for this code was a Perl 2 version written in 1989 by Randal
 L. Schwartz.  See
-	
   landfield.com/software/comp.sources.misc/archive-name/volume06/diffmk.p.gz
 
+The command also attempts to reproduce some of the functionality of the old
+`nrchbar' command.  See
+  open-systems.ufl.edu/mirrors/ftp.isc.org/usenet/comp.sources.unix/volume10/nrchbar.Z
+
 Thanks to Werner Lemberg for help in making the package more portable and
 fit into the GNU groff source structure.
 
@@ -22,7 +25,7 @@
 
 ----------------------------------------------------------------------------
 
-Copyright (C) 2004 Free Software Foundation, Inc.
+Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 Written by Mike Bianchi <MBianchi@Foveal.com <mailto:MBianchi@Foveal.com>>
 
 This file is part of the gdiffmk utility, which is part of groff.
Index: groff/contrib/gdiffmk/gdiffmk.man
diff -u groff/contrib/gdiffmk/gdiffmk.man:1.4 groff/contrib/gdiffmk/gdiffmk.man:1.5
--- groff/contrib/gdiffmk/gdiffmk.man:1.4	Wed Dec 15 06:04:48 2004
+++ groff/contrib/gdiffmk/gdiffmk.man	Sun Jan 16 01:43:21 2005
@@ -1,5 +1,5 @@
 .ig \"-*- nroff -*-
-Copyright (C) 2004 Free Software Foundation, Inc.
+Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of the gdiffmk utility, which is part of groff.
 Written by Mike Bianchi <MBianchi@Foveal.com <mailto:MBianchi@Foveal.com>>
@@ -43,14 +43,19 @@
 .OP \-a \%addmark
 .OP \-c \%changemark
 .OP \-d \%deletemark
+[\ \c
+.B \-D
+.OP \-B
+.OP \-M "\ mark1 mark2"
+]
 .OP \-x \%diffcmd
 .OP \-\-
 .OP \-\-help
-.OP \-\-version
+.OP \%\-\-version
 .I \%file1
 .I \%file2
-[
-.I \%output
+[\ \c
+.IR \%output \ \c
 ]
 .br
 .ad \na
@@ -112,6 +117,20 @@
 .BR + .
 .
 .TP
+.B \-B
+By default, the deleted texts marked by the
+.B \-D
+option end
+with an added troff break command,
+.BR .br ,
+to ensure that the deletions are marked properly.
+This is the only way to guarantee that deletions and small
+changes get flagged.
+This option directs the program not to insert these breaks; it makes no
+sense to use it without
+.BR \-D .
+.
+.TP
 .BI \-c changemark
 Use the
 .I changemark
@@ -128,6 +147,20 @@
 .BR * .
 .
 .TP
+.B \-D
+Show the deleted portions from changed and deleted text.
+Default delimiting marks:
+.BR "[[" " .\&.\&.\&. " "]]" .
+.
+.TP
+.BI \-M " mark1 mark2
+Change the delimiting marks for the
+.B \-D
+option.
+It makes no sense to use this option without
+.BR \-D .
+.
+.TP
 .BI \-x diffcmd
 Use the
 .I diffcmd
@@ -137,7 +170,8 @@
 .IR file2 .
 In particular,
 .I diffcmd
-should accept the
+should accept the GNU
+.B diff
 .BI \-D name
 option.
 Default:
@@ -213,7 +247,7 @@
 .
 .
 .SH COPYRIGHT
-Copyright \(co 2004 Free Software Foundation, Inc.
+Copyright \(co 2004, 2005 Free Software Foundation, Inc.
 .
 .LP
 .B gdiffmk
Index: groff/contrib/gdiffmk/gdiffmk.sh
diff -u groff/contrib/gdiffmk/gdiffmk.sh:1.4 groff/contrib/gdiffmk/gdiffmk.sh:1.5
--- groff/contrib/gdiffmk/gdiffmk.sh:1.4	Wed Dec 15 06:04:48 2004
+++ groff/contrib/gdiffmk/gdiffmk.sh	Sun Jan 16 01:43:21 2005
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2004 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 # Written by Mike Bianchi <MBianchi@Foveal.com <mailto:MBianchi@Foveal.com>>
 
 # This file is part of the gdiffmk utility, which is part of groff.
@@ -36,17 +36,25 @@
 groff \`.mc' requests added to indicate how it is different from FILE1.
 
   FILE1   Previous version of the groff file.  \`-' means standard input.
-  FILE2   Current version of the groff file.  \`-' means standard input.
+  FILE2   Current version of the groff file.   \`-' means standard input.
           Either FILE1 or FILE2 can be standard input, but not both.
   OUTPUT  Copy of FILE2 with \`.mc' commands added.
           \`-' means standard output (the default).
 
 OPTIONS:
-  -a addmark     Mark for added groff source lines.    Default: +.
-  -c changemark  Mark for changed groff source lines.  Default: |.
-  -d deletemark  Mark for deleted groff source lines.  Default: *.
-  -x diffcmd     Use a different diff(1) command;
-  	          one that accepts the \`-Dname' option, such as GNU diff.
+  -a ADDMARK     Mark for added groff source lines.    Default: \`+'.
+  -c CHANGEMARK  Mark for changed groff source lines.  Default: \`|'.
+  -d DELETEMARK  Mark for deleted groff source lines.  Default: \`*'.
+
+  -D             Show the deleted portions from changed and deleted text.
+                  Default delimiting marks:  \`[[' .... \`]]'.
+  -B             By default, the deleted texts marked by the \`-D' option end
+                  with an added troff \`.br\' command.  This option prevents
+                  the added \`.br\'.
+  -M MARK1 MARK2 Change the delimiting marks for the \`-D' option.
+
+  -x DIFFCMD     Use a different diff(1) command;
+                  one that accepts the \`-Dname' option, such as GNU diff.
   --version      Print version information on the standard output and exit.
   --help         Print this message on the standard error.
 "
@@ -124,9 +132,11 @@
 	fi
 }
 
-addmark='+'
-changemark='|'
-deletemark='*'
+ADDMARK='+'
+CHANGEMARK='|'
+DELETEMARK='*'
+MARK1='[['
+MARK2=']]'
 
 function RequiresArgument {
 	#	Process flags that take either concatenated or
@@ -148,24 +158,38 @@
 }
 
 badoption=
-diffcmd=diff
+DIFFCMD=diff
+D_option=
+br=.br
 for OPTION
 do
 	case "${OPTION}" in
 	-a*)
-		addmark=$( RequiresArgument "${OPTION}" $2 )		&&
+		ADDMARK=$( RequiresArgument "${OPTION}" $2 )		&&
 			shift
 		;;
 	-c*)
-		changemark=$( RequiresArgument "${OPTION}" $2 )		&&
+		CHANGEMARK=$( RequiresArgument "${OPTION}" $2 )		&&
 			shift
 		;;
 	-d*)
-		deletemark=$( RequiresArgument "${OPTION}" $2 )		&&
+		DELETEMARK=$( RequiresArgument "${OPTION}" $2 )		&&
 			shift
 		;;
+	-D )
+		D_option=D_option
+		;;
+	-M )
+		shift
+		MARK1=$1
+		shift
+		MARK2=$1
+		;;
+	-B )
+		br=.
+		;;
 	-x* )
-		diffcmd=$( RequiresArgument "${OPTION}" $2 )		&&
+		DIFFCMD=$( RequiresArgument "${OPTION}" $2 )		&&
 			shift
 		;;
 	--version)
@@ -193,10 +217,10 @@
 	shift
 done
 
-${diffcmd} -Dx /dev/null /dev/null >/dev/null 2>&1  ||
-	Usage "The \`${diffcmd}' program does not accept"	\
+${DIFFCMD} -Dx /dev/null /dev/null >/dev/null 2>&1  ||
+	Usage "The \`${DIFFCMD}' program does not accept"	\
 		"the required \`-Dname' option.
-Use GNU diff instead.  See the \`-x diffcmd' option."
+Use GNU diff instead.  See the \`-x DIFFCMD' option."
 
 if test -n "${badoption}"
 then
@@ -239,23 +263,22 @@
 #	To make a very unlikely label even more unlikely ...
 label=__diffmk_$$__
 
-diff -D"${label}" -- ${FILE1} ${FILE2}  |
-	sed -n '
+sed_script='
 		/^#ifdef '"${label}"'/,/^#endif \/\* '"${label}"'/ {
-		  /^#ifdef '"${label}"'/          s/.*/.mc '"${addmark}"'/
+		  /^#ifdef '"${label}"'/          s/.*/.mc '"${ADDMARK}"'/
 		  /^#endif \/\* '"${label}"'/     s/.*/.mc/
 		  p
 		  d
 		}
 		/^#ifndef '"${label}"'/,/^#endif \/\* [!not ]*'"${label}"'/ {
 		  /^#else \/\* '"${label}"'/,/^#endif \/\* '"${label}"'/ {
-		    /^#else \/\* '"${label}"'/    s/.*/.mc '"${changemark}"'/
+		    /^#else \/\* '"${label}"'/    s/.*/.mc '"${CHANGEMARK}"'/
 		    /^#endif \/\* '"${label}"'/   s/.*/.mc/
 		    p
 		    d
 		  }
 		  /^#endif \/\* \(not\|!\) '"${label}"'/ {
-		   s/.*/.mc '"${deletemark}"'/p
+		   s/.*/.mc '"${DELETEMARK}"'/p
 		   a\
 .mc
 		  }
@@ -264,4 +287,56 @@
 		p
 	'
 
+if [ ${D_option} ]
+then
+	sed_script='
+		/^#ifdef '"${label}"'/,/^#endif \/\* '"${label}"'/ {
+		  /^#ifdef '"${label}"'/          s/.*/.mc '"${ADDMARK}"'/
+		  /^#endif \/\* '"${label}"'/     s/.*/.mc/
+		  p
+		  d
+		}
+		/^#ifndef '"${label}"'/,/^#endif \/\* [!not ]*'"${label}"'/ {
+		  /^#ifndef '"${label}"'/ {
+		   i\
+'"${MARK1}"'
+		   d
+		  }
+		  /^#else \/\* '"${label}"'/ ! {
+		   /^#endif \/\* [!not ]*'"${label}"'/ ! {
+		    p
+		    d
+		   }
+		  }
+		  /^#else \/\* '"${label}"'/,/^#endif \/\* '"${label}"'/ {
+		    /^#else \/\* '"${label}"'/ {
+		     i\
+'"${MARK2}"'\
+'"${br}"'
+		     s/.*/.mc '"${CHANGEMARK}"'/
+		     a\
+.mc '"${CHANGEMARK}"'
+		     d
+		    }
+		    /^#endif \/\* '"${label}"'/   s/.*/.mc/
+		    p
+		    d
+		  }
+		  /^#endif \/\* \(not\|!\) '"${label}"'/ {
+		   i\
+'"${MARK2}"'\
+'"${br}"'
+		   s/.*/.mc '"${DELETEMARK}"'/p
+		   a\
+.mc
+		  }
+		  d
+		}
+		p
+	'
+fi
+
+diff -D"${label}" -- ${FILE1} ${FILE2}  |
+	sed -n "${sed_script}"
+
 # EOF
Index: groff/contrib/gdiffmk/tests/runtests.in
diff -u groff/contrib/gdiffmk/tests/runtests.in:1.3 groff/contrib/gdiffmk/tests/runtests.in:1.4
--- groff/contrib/gdiffmk/tests/runtests.in:1.3	Fri Dec 17 05:56:13 2004
+++ groff/contrib/gdiffmk/tests/runtests.in	Sun Jan 16 01:43:21 2005
@@ -8,7 +8,7 @@
 #	Test the number of arguments and the first argument.
 case $#-$1 in
 1-clean )
-	rm -fv test_result? tmp_file?
+	rm -fv test_result* tmp_file*
 	exit 0
 	;;
 1-run )
@@ -25,11 +25,14 @@
 esac
 
 function TestResult {
-	if diff $1 $2
+	if cmp -s $1 $2
 	then
 		echo $2 PASSED
 	else
-		echo $2 TEST FAILED '\a'
+		echo ''
+		echo $2 TEST FAILED
+		diff $1 $2
+		echo ''
 	fi
 }
 
@@ -72,7 +75,24 @@
 #	Test for accidental file overwrite.
 ResultFile=test_result7
 cp ${srcdir}/file2 tmp_file7
-${command}  -aA -dD -cC  ${srcdir}/file1 tmp_file7  tmp_file7  >${ResultFile} 2>&1
+${command}  -aA -dD -cC  ${srcdir}/file1 tmp_file7  tmp_file7	\
+							>${ResultFile} 2>&1
 TestResult ${srcdir}/test_baseline7 ${ResultFile}
 
+#	Test -D option
+ResultFile=test_result8
+${command}  -D  ${srcdir}/file1 ${srcdir}/file2 >${ResultFile} 2>&1
+TestResult ${srcdir}/test_baseline8 ${ResultFile}
+
+#	Test -D  and  -M  options
+ResultFile=test_result9
+${command}  -D  -M '<<<<' '>>>>'				\
+			${srcdir}/file1 ${srcdir}/file2 >${ResultFile} 2>&1
+TestResult ${srcdir}/test_baseline9 ${ResultFile}
+
+#	Test -D  and  -B  options
+ResultFile=test_result10
+${command}  -D  -B  ${srcdir}/file1 ${srcdir}/file2 >${ResultFile} 2>&1
+TestResult ${srcdir}/test_baseline10 ${ResultFile}
+
 #	EOF



From MAILER-DAEMON Sun Jan 16 18:30:50 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1CqJr7-0004m0-RW
	for mharc-groff-commit@gnu.org; Sun, 16 Jan 2005 18:30:50 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1CqJqx-0004iS-Di
	for groff-commit@gnu.org; Sun, 16 Jan 2005 18:30:40 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1CqJql-0004bk-PW
	for groff-commit@gnu.org; Sun, 16 Jan 2005 18:30:28 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1CqJqi-0004Vw-AS
	for groff-commit@gnu.org; Sun, 16 Jan 2005 18:30:24 -0500
Received: from [199.232.41.4] (helo=savannah)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1CqJVT-0000LP-7F
	for groff-commit@gnu.org; Sun, 16 Jan 2005 18:08:27 -0500
Received: from savannah ([127.0.0.1])
	by savannah with smtp (Exim 3.35 #1 (Debian)) id 1CqJVS-00081O-00
	for <groff-commit@gnu.org>; Sun, 16 Jan 2005 18:08:26 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CqJVS-00081O-00@savannah>
Date: Sun, 16 Jan 2005 18:08:26 -0500
Subject: [Groff-commit] groff/contrib/gdiffmk ChangeLog gdiffmk.man gdi...
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: groff-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Jan 2005 23:30:42 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@savannah.gnu.org>	05/01/16 23:08:26

Modified files:
	contrib/gdiffmk: ChangeLog gdiffmk.man gdiffmk.sh 

Log message:
	* gdiffmk.sh (Usage): Fix typos.
	<top>: Allow `-M<arg1> <arg2>' also.
	
	* gdiffmk.man: Updated.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/ChangeLog.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/gdiffmk.man.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/gdiffmk/gdiffmk.sh.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: groff/contrib/gdiffmk/ChangeLog
diff -u groff/contrib/gdiffmk/ChangeLog:1.9 groff/contrib/gdiffmk/ChangeLog:1.10
--- groff/contrib/gdiffmk/ChangeLog:1.9	Sun Jan 16 01:43:21 2005
+++ groff/contrib/gdiffmk/ChangeLog	Sun Jan 16 23:08:26 2005
@@ -1,3 +1,10 @@
+2005-01-16  Mike Bianchi  <MBianchi@Foveal.com>
+
+	* gdiffmk.sh (Usage): Fix typos.
+	<top>: Allow `-M<arg1> <arg2>' also.
+
+	* gdiffmk.man: Updated.
+
 2005-01-13  Mike Bianchi  <MBianchi@Foveal.com>
 
 	* gdiffmk.sh: Add the -D, -M, and -B options, which provide actions
Index: groff/contrib/gdiffmk/gdiffmk.man
diff -u groff/contrib/gdiffmk/gdiffmk.man:1.5 groff/contrib/gdiffmk/gdiffmk.man:1.6
--- groff/contrib/gdiffmk/gdiffmk.man:1.5	Sun Jan 16 01:43:21 2005
+++ groff/contrib/gdiffmk/gdiffmk.man	Sun Jan 16 23:08:26 2005
@@ -46,7 +46,7 @@
 [\ \c
 .B \-D
 .OP \-B
-.OP \-M "\ mark1 mark2"
+.OP \-M "mark1 mark2"
 ]
 .OP \-x \%diffcmd
 .OP \-\-
@@ -153,7 +153,7 @@
 .BR "[[" " .\&.\&.\&. " "]]" .
 .
 .TP
-.BI \-M " mark1 mark2
+.BI \-M "mark1 mark2"
 Change the delimiting marks for the
 .B \-D
 option.
Index: groff/contrib/gdiffmk/gdiffmk.sh
diff -u groff/contrib/gdiffmk/gdiffmk.sh:1.5 groff/contrib/gdiffmk/gdiffmk.sh:1.6
--- groff/contrib/gdiffmk/gdiffmk.sh:1.5	Sun Jan 16 01:43:21 2005
+++ groff/contrib/gdiffmk/gdiffmk.sh	Sun Jan 16 23:08:26 2005
@@ -49,8 +49,8 @@
   -D             Show the deleted portions from changed and deleted text.
                   Default delimiting marks:  \`[[' .... \`]]'.
   -B             By default, the deleted texts marked by the \`-D' option end
-                  with an added troff \`.br\' command.  This option prevents
-                  the added \`.br\'.
+                  with an added troff \`.br' command.  This option prevents
+                  the added \`.br'.
   -M MARK1 MARK2 Change the delimiting marks for the \`-D' option.
 
   -x DIFFCMD     Use a different diff(1) command;
@@ -179,11 +179,15 @@
 	-D )
 		D_option=D_option
 		;;
-	-M )
-		shift
-		MARK1=$1
+	-M* )
+		MARK1=$( RequiresArgument "${OPTION}" $2 )		&&
+			shift
+		if [ $# -lt 2 ]
+		then
+			Usage "Option \`-M' is missing the MARK2 value."
+		fi
+		MARK2=$2
 		shift
-		MARK2=$1
 		;;
 	-B )
 		br=.



From MAILER-DAEMON Wed Jan 19 02:30:29 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1CrAIO-00056A-OK
	for mharc-groff-commit@gnu.org; Wed, 19 Jan 2005 02:30:28 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1CrAIM-00055k-PG
	for groff-commit@gnu.org; Wed, 19 Jan 2005 02:30:26 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1CrAHI-0004iO-Cn
	for groff-commit@gnu.org; Wed, 19 Jan 2005 02:29:26 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1CrAHF-0004VY-MD
	for groff-commit@gnu.org; Wed, 19 Jan 2005 02:29:19 -0500
Received: from [199.232.41.4] (helo=savannah)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Cr9fk-00016K-0I
	for groff-commit@gnu.org; Wed, 19 Jan 2005 01:50:32 -0500
Received: from savannah ([127.0.0.1])
	by savannah with smtp (Exim 3.35 #1 (Debian)) id 1Cr9fj-00051T-00
	for <groff-commit@gnu.org>; Wed, 19 Jan 2005 01:50:31 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1Cr9fj-00051T-00@savannah>
Date: Wed, 19 Jan 2005 01:50:31 -0500
Subject: [Groff-commit] groff ./ChangeLog src/roff/troff/div.cpp tmac/d...
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: groff-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Jan 2005 07:30:27 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@savannah.gnu.org>	05/01/19 06:50:30

Modified files:
	.              : ChangeLog 
	src/roff/troff : div.cpp 
	tmac           : doc-common doc-ditroff 

Log message:
	* tmac/doc-common (Dd), tmac/doc-ditroff (gX, doc-setup-header):
	Remove dead code.
	
	* src/roff/troff/div.cpp (top_level_diversion::space): Protect
	against division by zero.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.777&tr2=1.778&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/roff/troff/div.cpp.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/tmac/doc-common.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/tmac/doc-ditroff.diff?tr1=1.9&tr2=1.10&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.777 groff/ChangeLog:1.778
--- groff/ChangeLog:1.777	Fri Jan 14 09:02:10 2005
+++ groff/ChangeLog	Wed Jan 19 06:50:30 2005
@@ -1,3 +1,13 @@
+2005-01-17  Ruslan Ermilov  <ru@FreeBSD.org>
+
+	* tmac/doc-common (Dd), tmac/doc-ditroff (gX, doc-setup-header):
+	Remove dead code.
+
+2004-01-17  Werner LEMBERG  <wl@gnu.org>
+
+	* src/roff/troff/div.cpp (top_level_diversion::space): Protect
+	against division by zero.
+
 2005-01-13  Ruslan Ermilov  <ru@FreeBSD.org>
 
 	* tmac/doc.tmac (Ef): Restore doc-curr-font and doc-curr-size.
Index: groff/src/roff/troff/div.cpp
diff -u groff/src/roff/troff/div.cpp:1.8 groff/src/roff/troff/div.cpp:1.9
--- groff/src/roff/troff/div.cpp:1.8	Fri Oct 15 05:08:35 2004
+++ groff/src/roff/troff/div.cpp	Wed Jan 19 06:50:30 2005
@@ -459,8 +459,9 @@
   vunits next_trap_pos;
   trap *next_trap = find_next_trap(&next_trap_pos);
   vunits y = vertical_position + n;
-  curenv->seen_space += n.to_units()
-			/ curenv->get_vertical_spacing().to_units();
+  if (curenv->get_vertical_spacing().to_units())
+    curenv->seen_space += n.to_units()
+			  / curenv->get_vertical_spacing().to_units();
   if (vertical_position_traps_flag && next_trap != 0 && y >= next_trap_pos) {
     vertical_position = next_trap_pos;
     nl_reg_contents = vertical_position.to_units();
Index: groff/tmac/doc-common
diff -u groff/tmac/doc-common:1.26 groff/tmac/doc-common:1.27
--- groff/tmac/doc-common:1.26	Thu Apr 15 16:09:07 2004
+++ groff/tmac/doc-common	Wed Jan 19 06:50:30 2005
@@ -551,10 +551,6 @@
 .ds doc-date-12 December
 .
 .de Dd
-.  \" XXX: why do we need gX?
-.  if "\*[doc-date-string]"" \
-.    nr gX 1
-.
 .  ie \n[.$] \{\
 .    ie (\n[.$] == 3) \
 .      ds doc-date-string \$1\~\$2 \$3
Index: groff/tmac/doc-ditroff
diff -u groff/tmac/doc-ditroff:1.9 groff/tmac/doc-ditroff:1.10
--- groff/tmac/doc-ditroff:1.9	Fri May  2 18:40:20 2003
+++ groff/tmac/doc-ditroff	Wed Jan 19 06:50:30 2005
@@ -180,8 +180,6 @@
 .ds Ba \f[R]|\f[]
 .ds Am &
 .
-.nr gX 0
-.
 .
 .\" NS doc-header-string global string
 .\" NS   the final string used for the manual page header
@@ -203,12 +201,8 @@
 .  wh 0 doc-header
 .  wh -1.25i doc-footer
 .
-.  if \n[gX] \
-.    ds doc-command-name
-.
 .  br
 .
-.  nr gX 0
 .  e@ doc-end-macro
 ..
 .



From MAILER-DAEMON Sat Jan 22 01:28:18 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1CsEkr-0003KX-E8
	for mharc-groff-commit@gnu.org; Sat, 22 Jan 2005 01:28:17 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1CsEkl-0003HG-80
	for groff-commit@gnu.org; Sat, 22 Jan 2005 01:28:11 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1CsEkf-0003CI-QL
	for groff-commit@gnu.org; Sat, 22 Jan 2005 01:28:06 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1CsEkf-0003Bo-Jl
	for groff-commit@gnu.org; Sat, 22 Jan 2005 01:28:05 -0500
Received: from [199.232.41.4] (helo=savannah)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1CsEWC-0008F4-CL
	for groff-commit@gnu.org; Sat, 22 Jan 2005 01:13:08 -0500
Received: from savannah ([127.0.0.1])
	by savannah with smtp (Exim 3.35 #1 (Debian)) id 1CsEWB-00010z-00
	for <groff-commit@gnu.org>; Sat, 22 Jan 2005 01:13:07 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CsEWB-00010z-00@savannah>
Date: Sat, 22 Jan 2005 01:13:07 -0500
Subject: [Groff-commit] groff ./ChangeLog src/devices/grops/grops.man s...
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: groff-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Jan 2005 06:28:15 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@savannah.gnu.org>	05/01/22 06:13:07

Modified files:
	.              : ChangeLog 
	src/devices/grops: grops.man 
	src/libs/libdriver: input.cpp 

Log message:
	* src/libs/libdriver/input.cpp (delete_current_env, do_file):
	Reset pointers to zero after deallocation.  This fixes a crash
	if a driver is called with multiple output files.  Reported by
	Ken Chilton <ken@chiltonfamily.org>.
	
	* src/devices/grops/grops.man: Add more info on DSC.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.778&tr2=1.779&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/devices/grops/grops.man.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/libs/libdriver/input.cpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.778 groff/ChangeLog:1.779
--- groff/ChangeLog:1.778	Wed Jan 19 06:50:30 2005
+++ groff/ChangeLog	Sat Jan 22 06:13:07 2005
@@ -1,3 +1,12 @@
+2005-01-21  Werner LEMBERG  <wl@gnu.org>
+
+	* src/libs/libdriver/input.cpp (delete_current_env, do_file):
+	Reset pointers to zero after deallocation.  This fixes a crash
+	if a driver is called with multiple output files.  Reported by
+	Ken Chilton <ken@chiltonfamily.org>.
+
+	* src/devices/grops/grops.man: Add more info on DSC.
+
 2005-01-17  Ruslan Ermilov  <ru@FreeBSD.org>
 
 	* tmac/doc-common (Dd), tmac/doc-ditroff (gX, doc-setup-header):
Index: groff/src/devices/grops/grops.man
diff -u groff/src/devices/grops/grops.man:1.26 groff/src/devices/grops/grops.man:1.27
--- groff/src/devices/grops/grops.man:1.26	Sat Jun 19 20:49:30 2004
+++ groff/src/devices/grops/grops.man	Sat Jan 22 06:13:07 2005
@@ -1,5 +1,6 @@
 .ig
-Copyright (C) 1989-2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+Copyright (C) 1989-2000, 2001, 2002, 2003, 2004, 2005
+  Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -116,6 +117,15 @@
 .B \-P
 option.
 .
+.PP
+Note that
+.B grops
+doesn't produce a valid document structure (conforming to the Document
+Structuring Convention) if called with multiple file arguments.
+.
+To print such concatenated output it is necessary to deactivate DSC
+handling in the printing program or previewer.
+.
 .
 .SH OPTIONS
 .TP
@@ -1149,6 +1159,10 @@
 .BR groff_char (@MAN7EXT@),
 .BR groff_tmac (@MAN5EXT@)
 .
+.PP
+.URL "http://\:partners.adobe.com/\:public/\:developer/\:en/\:ps/\:5001.DSC_Spec.pdf" \
+     "PostScript Language Document Structuring Conventions Specification"
+.
 .cp \n[grops_C]
 .
 .\" Local Variables:
Index: groff/src/libs/libdriver/input.cpp
diff -u groff/src/libs/libdriver/input.cpp:1.3 groff/src/libs/libdriver/input.cpp:1.4
--- groff/src/libs/libdriver/input.cpp:1.3	Thu Dec 16 13:09:54 2004
+++ groff/src/libs/libdriver/input.cpp	Sat Jan 22 06:13:07 2005
@@ -2,13 +2,13 @@
 
 // <groff_src_dir>/src/libs/libdriver/input.cpp
 
-/* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2003, 2004
+/* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2003, 2004, 2005
    Free Software Foundation, Inc.
 
    Written by James Clark (jjc@jclark.com)
    Major rewrite 2001 by Bernd Warken (bwarken@mayn.de)
 
-   Last update: 15 Dec 2004
+   Last update: 21 Jan 2005
 
    This file is part of groff, the GNU roff text processing system.
 
@@ -608,6 +608,7 @@
   delete current_env->col;
   delete current_env->fill;
   delete current_env;
+  current_env = 0;
 }
 
 //////////////////////////////////////////////////////////////////////
@@ -1520,8 +1521,8 @@
       char *str_arg = get_extended_arg(); // includes line skip
       if (npages <= 0)
 	error("`x X' command invalid before first `p' command");
-      else if (str_arg != NULL && (strncmp(str_arg, "devtag:",
-					   strlen("devtag:")) == 0))
+      else if (str_arg && (strncmp(str_arg, "devtag:",
+				   strlen("devtag:")) == 0))
 	pr->devtag(str_arg, current_env);
       else
 	pr->special(str_arg, current_env);
@@ -1826,6 +1827,7 @@
   if (npages > 0)
     pr->end_page(current_env->vpos);
   delete pr;
+  pr = 0;
   fclose(current_file);
   // If `stopped' is not `true' here then there wasn't any `x stop'.
   if (!stopped)



From MAILER-DAEMON Mon Jan 24 04:00:46 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Ct05V-0004Az-Ti
	for mharc-groff-commit@gnu.org; Mon, 24 Jan 2005 04:00:46 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ct05U-0004Ad-Ni
	for groff-commit@gnu.org; Mon, 24 Jan 2005 04:00:44 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Ct05T-0004AE-NK
	for groff-commit@gnu.org; Mon, 24 Jan 2005 04:00:44 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ct04f-0003Ya-EI
	for groff-commit@gnu.org; Mon, 24 Jan 2005 03:59:53 -0500
Received: from [199.232.41.4] (helo=savannah)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1CszYC-0000w6-FJ
	for groff-commit@gnu.org; Mon, 24 Jan 2005 03:26:20 -0500
Received: from savannah ([127.0.0.1])
	by savannah with smtp (Exim 3.35 #1 (Debian)) id 1CszYC-0005cV-00
	for <groff-commit@gnu.org>; Mon, 24 Jan 2005 03:26:20 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CszYC-0005cV-00@savannah>
Date: Mon, 24 Jan 2005 03:26:20 -0500
Subject: [Groff-commit] groff ./ChangeLog tmac/doc.tmac
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: groff-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Jan 2005 09:00:45 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@savannah.gnu.org>	05/01/24 08:26:19

Modified files:
	.              : ChangeLog 
	tmac           : doc.tmac 

Log message:
	* tmac/doc.tmac (Sm): Improved.  It didn't work properly in many
	cases.
	(Re): Emit a warning if called without `.Rs'.
	(doc-finish-reference): Use parameter for decreasing
	`doc-reference-count'.
	(doc-print-reference): Pass specific count parameters to
	`doc-finish-reference'.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.779&tr2=1.780&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/tmac/doc.tmac.diff?tr1=1.35&tr2=1.36&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.779 groff/ChangeLog:1.780
--- groff/ChangeLog:1.779	Sat Jan 22 06:13:07 2005
+++ groff/ChangeLog	Mon Jan 24 08:26:19 2005
@@ -1,3 +1,13 @@
+2005-01-22  Ruslan Ermilov  <ru@FreeBSD.org>
+
+	* tmac/doc.tmac (Sm): Improved.  It didn't work properly in many
+	cases.
+	(Re): Emit a warning if called without `.Rs'.
+	(doc-finish-reference): Use parameter for decreasing
+	`doc-reference-count'.
+	(doc-print-reference): Pass specific count parameters to
+	`doc-finish-reference'.
+
 2005-01-21  Werner LEMBERG  <wl@gnu.org>
 
 	* src/libs/libdriver/input.cpp (delete_current_env, do_file):
Index: groff/tmac/doc.tmac
diff -u groff/tmac/doc.tmac:1.35 groff/tmac/doc.tmac:1.36
--- groff/tmac/doc.tmac:1.35	Fri Jan 14 09:02:11 2005
+++ groff/tmac/doc.tmac	Mon Jan 24 08:26:19 2005
@@ -2179,10 +2179,21 @@
 .      doc-parse-args \$@
 .    \}
 .    el \{\
-.      ie \n[doc-space-mode] \
+.      ie \n[doc-space-mode] \{\
+.        ds doc-saved-space "\*[doc-space]
+.        ds doc-space
 .        nr doc-space-mode 0
-.      el \
+.      \}
+.      el \{\
+.        ds doc-space "\*[doc-saved-space]
 .        nr doc-space-mode 1
+.
+.        \" finish line only if it is interrupted and `doc-have-space'
+.        \" isn't set
+.        if \n[doc-reg-Sm] \
+.          if \n[.int] \
+.            nop \)
+.      \}
 .  \}\}
 .
 .  if !\n[doc-arg-limit] \
@@ -2207,10 +2218,15 @@
 .    el \{\
 .      \" no argument for Sm
 .      nr doc-arg-ptr -1
-.      ie \n[doc-space-mode] \
+.      ie \n[doc-space-mode] \{\
+.        ds doc-saved-space "\*[doc-space]
+.        ds doc-space
 .        nr doc-space-mode 0
-.      el \
+.      \}
+.      el \{\
+.        ds doc-space "\*[doc-saved-space]
 .        nr doc-space-mode 1
+.      \}
 .  \}\}
 .
 .  ie \n[doc-space-mode] \{\
@@ -2237,18 +2253,13 @@
 .  \}
 .
 .  \" do we have parameters to print?
-.  ie (\n[doc-arg-limit] <= \n[doc-arg-ptr]) \{\
-.    \" ignore `.Sm on' and `.Sm off' without additional parameters
-.    ie (\n[doc-arg-ptr] > 1) \
-.      doc-print-and-reset
-.    el \
-.      doc-reset-args
-.  \}
-.  el \{\
+.  ie (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\
 .    \" skip `Sm' argument
 .    nr doc-arg-ptr +1
 .    doc-print-recursive
 .  \}
+.  el \
+.    doc-reset-args
 ..
 .
 .
@@ -5146,6 +5157,10 @@
 .  ie \n[.$] \
 .    tm Usage: .Re (does not take arguments) (#\n[.c])
 .  el \{\
+.    if !\n[doc-is-reference] \{\
+.      tm mdoc warning: Extraneous .Re (#\n[.c])
+.      return
+.    \}
 .    doc-print-reference
 .    doc-reset-reference
 .    nr doc-is-reference 0
@@ -5224,7 +5239,7 @@
 .\" NS   doc-reference-count
 .
 .de doc-finish-reference
-.  nr doc-reference-count -1
+.  nr doc-reference-count -\$1
 .  ie \n[doc-reference-count] \
 .    nop \),
 .  el \
@@ -5254,81 +5269,81 @@
 .    chop doc-reference-title-name-for-book
 .    ie ((\n[doc-journal-count] == 1) : (\n[doc-book-count] == 1)) \{\
 .      nop \)\*[q]\)\*[doc-reference-title-name-for-book]\)\*[q]\c
-.      doc-finish-reference
+.      doc-finish-reference \n[doc-reference-title-count]
 .    \}
 .    el \{\
 .      nop \*[doc-reference-title-name]\c
-.      doc-finish-reference
+.      doc-finish-reference \n[doc-reference-title-count]
 .  \}\}
 .
 .  if \n[doc-book-count] \{\
 .    unformat doc-book-name
 .    chop doc-book-name
 .    nop \*[doc-book-name]\c
-.    doc-finish-reference
+.    doc-finish-reference \n[doc-book-count]
 .  \}
 .
 .  if \n[doc-publisher-count] \{\
 .    unformat doc-publisher-name
 .    chop doc-publisher-name
 .    nop \*[doc-publisher-name]\c
-.    doc-finish-reference
+.    doc-finish-reference \n[doc-publisher-count]
 .  \}
 .
 .  if \n[doc-journal-count] \{\
 .    unformat doc-journal-name
 .    chop doc-journal-name
 .    nop \*[doc-journal-name]\c
-.    doc-finish-reference
+.    doc-finish-reference \n[doc-journal-count]
 .  \}
 .
 .  if \n[doc-report-count] \{\
 .    unformat doc-report-name
 .    chop doc-report-name
 .    nop \*[doc-report-name]\c
-.    doc-finish-reference
+.    doc-finish-reference \n[doc-report-count]
 .  \}
 .
 .  if \n[doc-issue-count] \{\
 .    unformat doc-issue-name
 .    chop doc-issue-name
 .    nop \*[doc-issue-name]\c
-.    doc-finish-reference
+.    doc-finish-reference \n[doc-issue-count]
 .  \}
 .
 .  if \n[doc-volume-count] \{\
 .    unformat doc-volume-name
 .    chop doc-volume-name
 .    nop \*[doc-volume-name]\c
-.    doc-finish-reference
+.    doc-finish-reference \n[doc-volume-count]
 .  \}
 .
 .  if \n[doc-page-number-count] \{\
 .    unformat doc-page-number-string
 .    chop doc-page-number-string
 .    nop \*[doc-page-number-string]\c
-.    doc-finish-reference
+.    doc-finish-reference \n[doc-page-number-count]
 .  \}
 .
 .  if \n[doc-corporate-count] \{\
 .    unformat doc-corporate-name
 .    chop doc-corporate-name
 .    nop \*[doc-corporate-name]\c
-.    doc-finish-reference
+.    doc-finish-reference \n[doc-corporate-count]
 .  \}
 .
 .  if \n[doc-date-count] \{\
 .    unformat doc-date
 .    chop doc-date
 .    nop \*[doc-date]\c
-.    doc-finish-reference
+.    doc-finish-reference \n[doc-date-count]
 .  \}
 .
 .  if \n[doc-optional-count] \{\
 .    unformat doc-optional-string
 .    chop doc-optional-string
 .    nop \*[doc-optional-string]\c
-.    doc-finish-reference
+.    doc-finish-reference \n[doc-optional-count]
 .  \}
 .
 .  if \n[doc-reference-count] \



From MAILER-DAEMON Tue Jan 25 03:45:25 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1CtMKD-0001VY-L4
	for mharc-groff-commit@gnu.org; Tue, 25 Jan 2005 03:45:25 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ct07a-0004j3-Lw
	for groff-commit@gnu.org; Mon, 24 Jan 2005 04:02:54 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Ct07T-0004iN-R8
	for groff-commit@gnu.org; Mon, 24 Jan 2005 04:02:53 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ct04h-0003Ya-G6
	for groff-commit@gnu.org; Mon, 24 Jan 2005 03:59:55 -0500
Received: from [199.232.41.4] (helo=savannah)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1CszVK-0000ZQ-6C
	for groff-commit@gnu.org; Mon, 24 Jan 2005 03:23:23 -0500
Received: from savannah ([127.0.0.1])
	by savannah with smtp (Exim 3.35 #1 (Debian)) id 1CszVJ-0005Wt-00
	for <groff-commit@gnu.org>; Mon, 24 Jan 2005 03:23:21 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CszVJ-0005Wt-00@savannah>
Date: Mon, 24 Jan 2005 03:23:21 -0500
X-Mailman-Approved-At: Tue, 25 Jan 2005 03:45:24 -0500
Subject: [Groff-commit] groff/contrib/mom BUGS ChangeLog NEWS om.tmac m...
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: groff-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Jan 2005 09:02:55 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@savannah.gnu.org>	05/01/24 08:23:21

Modified files:
	contrib/mom    : BUGS ChangeLog NEWS om.tmac 
	contrib/mom/momdoc: docelement.html docprocessing.html 
	                    goodies.html inlines.html macrolist.html 
	                    reserved.html toc.html typemacdoc.html 
	                    typesetting.html 

Log message:
	o Added \*[TB+] and \*[B] to give inline functionality of .TN and
	.EL, respectively.
	
	o Added SECTION and SECTION_CHAR as aliases of LINEBREAK and
	LINEBREAK_CHAR
	
	o Added a NOBREAK option to PAD, so when PAD is called, it's possible
	to instruct mom not to advance on the page.
	
	*Wed Jan 19 2005
	
	o Reworked handling of ALD/SPACE/SP and LS when they're used at
	the tops of pages during pure (i.e. non-docprocessing)
	typesetting.  First lines were still wandering.  Should also be
	more intuitive: ALD after LS advances the specified distance from
	the top baseline; LS after ALD doesn't change the position of the
	first baseline (i.e. merely sets the lead for the text that
	follows).

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/mom/BUGS.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/mom/ChangeLog.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/mom/NEWS.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/mom/om.tmac.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/mom/momdoc/docelement.html.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/mom/momdoc/docprocessing.html.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/mom/momdoc/goodies.html.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/mom/momdoc/inlines.html.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/mom/momdoc/macrolist.html.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/mom/momdoc/reserved.html.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/mom/momdoc/toc.html.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/mom/momdoc/typemacdoc.html.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/contrib/mom/momdoc/typesetting.html.diff?tr1=1.13&tr2=1.14&r1=text&r2=text

Patches:
Index: groff/contrib/mom/BUGS
diff -u groff/contrib/mom/BUGS:1.17 groff/contrib/mom/BUGS:1.18
--- groff/contrib/mom/BUGS:1.17	Wed Dec  8 07:57:46 2004
+++ groff/contrib/mom/BUGS	Mon Jan 24 08:23:21 2005
@@ -15,6 +15,21 @@
 
 ========================================================================
 
+Version 1.2-e
+=============
+
+Some string definitions in om.tmac had superfluous spaces after
+them (e.g. $COVERTITLE).
+---Fixed---
+
+Spacing under quotes not correct when paragraph spacing is turned
+on.
+---Fixed---
+
+
+First word of last line before footnotes is getting chopped.
+---Fixed---
+
 Version 1.2-d
 =============
 
Index: groff/contrib/mom/ChangeLog
diff -u groff/contrib/mom/ChangeLog:1.29 groff/contrib/mom/ChangeLog:1.30
--- groff/contrib/mom/ChangeLog:1.29	Wed Dec  8 07:57:46 2004
+++ groff/contrib/mom/ChangeLog	Mon Jan 24 08:23:21 2005
@@ -1,3 +1,36 @@
+*Thu Jan 20 2005
+
+o Added \*[TB+] and \*[B] to give inline functionality of .TN and
+  .EL, respectively.
+
+o Added SECTION and SECTION_CHAR as aliases of LINEBREAK and
+  LINEBREAK_CHAR
+
+o Added a NOBREAK option to PAD, so when PAD is called, it's possible
+  to instruct mom not to advance on the page.
+
+*Wed Jan 19 2005
+
+o Reworked handling of ALD/SPACE/SP and LS when they're used at
+  the tops of pages during pure (i.e. non-docprocessing)
+  typesetting.  First lines were still wandering.  Should also be
+  more intuitive: ALD after LS advances the specified distance from
+  the top baseline; LS after ALD doesn't change the position of the
+  first baseline (i.e. merely sets the lead for the text that
+  follows).
+
+
+*Tue Dec 14 2004
+
+o Fixed a small problem with spacing under quotes when paragraph
+  spacing is turned on.
+
+*Fri Dec 10 2004
+
+o Put all calls in VFP_CHECK inside their own environment.  Without
+  the .ev call, the trap invoked VFP_CHECK was chopping off the
+  first word of the last line before footnotes.
+
 *Dec 6 2004
 
 o Small fixes to elvis_syntax.new (dealing with strings, \{\ and \}
Index: groff/contrib/mom/NEWS
diff -u groff/contrib/mom/NEWS:1.16 groff/contrib/mom/NEWS:1.17
--- groff/contrib/mom/NEWS:1.16	Mon Sep 13 15:57:39 2004
+++ groff/contrib/mom/NEWS	Mon Jan 24 08:23:21 2005
@@ -1,3 +1,10 @@
+Release 1.2-f
+-------------
+
+Added ADD_SPACE, to permit users to insert space at the top of
+running text (after the first page) when using the docprocessing
+macros.
+
 Releases 1.2-a and 1.2-b
 ------------------------
 
Index: groff/contrib/mom/momdoc/docelement.html
diff -u groff/contrib/mom/momdoc/docelement.html:1.13 groff/contrib/mom/momdoc/docelement.html:1.14
--- groff/contrib/mom/momdoc/docelement.html:1.13	Mon Aug  9 09:07:48 2004
+++ groff/contrib/mom/momdoc/docelement.html	Mon Jan 24 08:23:21 2005
@@ -1227,6 +1227,8 @@
 <a name="LINEBREAK">
 	Macro: <strong>LINEBREAK</strong>
 </a>
+<br>
+Alias: <strong>SECTION</strong>
 
 <p>
 <strong>LINEBREAK</strong> takes no arguments.  Simply invoke it
@@ -1242,9 +1244,10 @@
 	Macro: <strong>LINEBREAK_CHAR</strong> <var>[ &lt;character&gt; ] [ &lt;iterations&gt; [ &lt;vertical adjustment&gt; ] ]</var>
 </a>
 <br>
+Alias: <strong>SECTION_CHAR</strong>
+<br>
 <em>*The third optional argument requires a
 <a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a></em>.
-
 <p>
 <strong>LINEBREAK_CHAR</strong> determines what <strong>mom</strong>
 prints when <strong>LINEBREAK</strong> is invoked.  It takes 3
Index: groff/contrib/mom/momdoc/docprocessing.html
diff -u groff/contrib/mom/momdoc/docprocessing.html:1.19 groff/contrib/mom/momdoc/docprocessing.html:1.20
--- groff/contrib/mom/momdoc/docprocessing.html:1.19	Wed Dec  8 07:57:47 2004
+++ groff/contrib/mom/momdoc/docprocessing.html	Mon Jan 24 08:23:21 2005
@@ -125,7 +125,7 @@
 				<li><a href="docelement.html#PARAHEAD">PARAHEAD</a>
 				<li><a href="docelement.html#PARAHEAD_CONTROL">Parahead control</a>
 			</ul>
-			<li><a href="docelement.html#LINEBREAK_INTRO"><strong>Linebreaks (author linebreaks)</strong></a>
+			<li><a href="docelement.html#LINEBREAK_INTRO"><strong>Linebreaks (author linebreaks, also called section breaks)</strong></a>
 			<ul>
 				<li><a href="docelement.html#LINEBREAK">LINEBREAK</a>
 				<li><a href="docelement.html#LINEBREAK_CONTROL">Linebreak control</a>
Index: groff/contrib/mom/momdoc/goodies.html
diff -u groff/contrib/mom/momdoc/goodies.html:1.12 groff/contrib/mom/momdoc/goodies.html:1.13
--- groff/contrib/mom/momdoc/goodies.html:1.12	Wed Sep 29 09:29:38 2004
+++ groff/contrib/mom/momdoc/goodies.html	Mon Jan 24 08:23:21 2005
@@ -632,11 +632,13 @@
 <hr width="66%" align="left">
 <a name="PAD"><h3><u>Insert space into lines</u></h3></a>
 <br>
-Macro: <strong>PAD</strong> <var>&quot;&lt;string with pad markers inserted&gt;&quot;</var>
+Macro: <strong>PAD</strong> <var>&quot;&lt;string with pad markers inserted&gt;&quot; [NOBREAK]</var>
 
 <p>
 With <strong>PAD</strong>, you can insert unspecified amounts of
-whitespace into a line.
+whitespace into a line.  The optional <strong>NOBREAK</strong>
+argument tells <strong>mom</strong> not to advance on the page
+after the <strong>PAD</strong> macro has been invoked.
 <p>
 <strong>PAD</strong> calculates the difference between the length of
 text on the line and the distance remaining to its end, then inserts
@@ -688,21 +690,9 @@
 <a href="inlines.html#INLINE_LINEDRAWING_GROFF">\l</a>
 could be used.)
 <p>
-Please note that the use of <kbd>.EL</kbd> after <kbd>.PAD</kbd>
-in this example assumes that either
-<a href="typesetting.html#QUAD">QUAD L | R | C | J</a>
-or
-<a href="typesetting.html#JUSTIFY">JUSTIFY</a>
-are in effect.  <strong>EL</strong> does not work after
-<strong>PAD</strong> in
-<a href="definitions.html#TERMS_NOFILL">nofill</a>
-modes (i.e.
-<a href="typesetting.html#LRC">.LEFT, .RIGHT or .CENTER</a>).
-<p>
 <pre>
 	.LL 30P
-	.PAD "Date \*[ST1]#\*[ST1X] Signature \*[ST2]###\*[ST2X]"
-	.EL
+	.PAD "Date \*[ST1]#\*[ST1X] Signature \*[ST2]###\*[ST2X]" NOBREAK
 	.ST 1 J
 	.ST 2 J
 	.TAB 1
Index: groff/contrib/mom/momdoc/inlines.html
diff -u groff/contrib/mom/momdoc/inlines.html:1.12 groff/contrib/mom/momdoc/inlines.html:1.13
--- groff/contrib/mom/momdoc/inlines.html:1.12	Mon Sep 13 15:57:39 2004
+++ groff/contrib/mom/momdoc/inlines.html	Mon Jan 24 08:23:21 2005
@@ -89,6 +89,8 @@
 		<li><a href="#INLINE_KERNING_MOM">Pairwise kerning</a>
 		<li><a href="#INLINE_HORIZONTAL_MOM">Horizontal movement</a>
 		<li><a href="#INLINE_VERTICAL_MOM">Vertical movement</a>
+		<li><a href="#B">Terminate a line without advancing on the page</a>
+		<li><a href="#TB+">Call the next sequential tab without advancing on the page</a>
 		<li><a href="#INLINE_RULE_MOM">Full measure rules</a>
 	</ul>
 	<li><a name="INLINES_GROFF"><strong>Groff inline escapes</strong></a>
@@ -389,6 +391,70 @@
 points, hence you mustn't use a unit of measure.
 <p>
 
+<!---INLINE_B_MOM--->
+
+<hr width="66%" align="left">
+<a name="B"><h3><u>Terminate a line without advancing on the page</u></h3></a>
+
+<p>
+Sometimes, you want <strong>mom</strong> to break a line but not
+advance on the page.  See
+<a href="typesetting.html#EL_EXAMPLE">here</a>
+for an example of when you might want to do this.
+<p>
+In versions of <strong>mom</strong> prior to 1.2-f, this was
+accomplished through the use of
+<a href="typesetting.html#EL">EL</a>.
+As of 1.2-f, you can, if you prefer, accomplish the same thing
+by using the inline escape, <strong>\*[B]</strong>.  Simply
+attach the escape to the end of any line.  Using the example
+given in the document entry for <strong>EL</strong>, you'd use
+<strong>\*[B}</strong> like this:
+
+<p>
+<pre>
+	.LEFT
+	.LS 12.5
+	A line of text.\*[B]
+	.ALD 24p
+	The next line of text.
+</pre>
+
+<strong>\*[B]</strong> works reliably regardless of the current
+<a href="definitions.html#TERMS_FILLED">fill mode</a>.
+<p>
+
+<!---INLINE_TB+_MOM--->
+
+<hr width="66%" align="left">
+<a name="TB+"><h3><u>Call the next sequential tab without advancing on the page</u></h3></a>
+
+<p>
+Sometimes, you want <strong>mom</strong> to move to the next tab in
+sequence (e.g. from TAB 1 to TAB 2, or TAB 8 to TAB 9) without
+<strong>mom</strong> advancing on the page.  (See the example in
+<a href="typesetting.html#NOTE_TN">here</a>
+if you're not clear how <strong>mom</strong> manages tabs and
+linebreaks.)
+<p>
+In versions of <strong>mom</strong> prior to 1.2-f, this was
+accomplished through the use of
+<a href="typesetting.html#TN">TN</a>.
+As of 1.2-f, you can, if you prefer, accomplish the same thing
+by using the inline escape, <strong>\*[TB+]</strong>.  Simply
+attach the escape to the end of any line in a tab, like this:
+
+<p>
+<pre>
+	.TAB 1
+	Some text\*[TB+]    \" This line is in tab 1
+	Some more text      \" This line is in tab 2, on the same baseline as tab 1
+</pre>
+
+<strong>\*[TB+]</strong> works reliably regardless of the current
+<a href="definitions.html#TERMS_FILLED">fill mode</a>.
+<p>
+
 <!---INLINE_RULE_MOM--->
 
 <hr width="66%" align="left">
@@ -418,7 +484,8 @@
 <a href="typesetting.html#JUSTIFY">JUSTIFY</a>),
 it requires a
 <a href="typesetting.html#BR">.BR</a>
-on the line immediately before it; in
+on the line immediately before it; otherwise, the rule will be drawn
+on the same baseline occupied by any type preceding it.  In
 <a href="definitions.html#TERMS_NOFILL">nofill modes</a>
 (i.e
 <a href="typesetting.html#LRC">LEFT</a>,
@@ -665,14 +732,15 @@
 typographically precise drawing is a bit like hammering in a nail
 with a screwdriver -- doable, but not recommended.
 <p>
-Groff comes with a number of &quot;preprocessors&quot; designed to ease
-creating rules, boxes, splines, and so on (tbl, pic, and friends), but
-I tend not to use them.  A firm believer in the &quot;right tool for
-the job,&quot; I prefer a vector drawing program (in my case, tgif)
-when I need to combine type with graphic elements (say, a complex
-ruled form).  Inserting the results into a document is easy enough
-with <strong>.PSPIC</strong> (consult the <strong>groff_tmac</strong>
-man page for information on this indispensable and easy-to-use macro).
+Groff comes with a number of &quot;preprocessors&quot; designed
+to ease creating rules, boxes, splines, and so on (tbl, pic,
+and friends), but I tend not to use them.  A firm believer
+in the &quot;right tool for the job,&quot; I prefer a vector
+drawing program when I need to combine type with graphic elements
+(say, a complex ruled form).  Inserting the results into a
+document is easy enough with <strong>.PSPIC</strong> (consult
+the <strong>groff_tmac</strong> man page for information on this
+indispensable and easy-to-use macro).
 <p>
 
 <!---INLINE_CHARACTERS_GROFF--->
Index: groff/contrib/mom/momdoc/macrolist.html
diff -u groff/contrib/mom/momdoc/macrolist.html:1.2 groff/contrib/mom/momdoc/macrolist.html:1.3
--- groff/contrib/mom/momdoc/macrolist.html:1.2	Mon Aug  9 09:07:48 2004
+++ groff/contrib/mom/momdoc/macrolist.html	Mon Jan 24 08:23:21 2005
@@ -25,9 +25,9 @@
 <strong>NOTE:</strong> This guide uses tables extensively.  Better
 make sure you're reading it in a browser that renders them
 sensibly. 
-<br>
+<p>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr>
 	<th>Typesetting</th>
 	<th>Document processing</th>
@@ -113,46 +113,46 @@
 	<td><a href="#40">Designing endnotes pages</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="#41">Table of contents</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="#42">Designing a table of contents</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="#43">Finis</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="#44">Headers and footers</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="#45">Part-by-part control
 	<br>of headers</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="#46">Footers</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="#47">Covers and doc covers</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="#48">Customizing covers
 	<br>and doc covers</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="#49">Part-by-part control of
 	<br>covers and doc covers</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="#50">Miscellaneous</a></td>
 </tr>
 </table>
@@ -163,7 +163,7 @@
 
 <a name="1"><h3 align="center">Page/paper size; margins; line length</h3></a>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr align="center">
 	<th>Page/paper size</th>
 	<th>Margins</th>
@@ -177,22 +177,22 @@
 <tr>
 	<td><a href="typesetting.html#PAGELENGTH">PAGELENGTH</a></td>
 	<td><a href="typesetting.html#B_MARGIN">B_MARGIN</a></td>
-	<td></td>
+	<td>&nbsp;</td>
 </tr>
 <tr>
 	<td><a href="typesetting.html#PAPER">PAPER</a></td>
 	<td><a href="typesetting.html#L_MARGIN">L_MARGIN</a></td>
-	<td></td>
+	<td>&nbsp;</td>
 </tr>
 <tr>
 	<td><a href="typesetting.html#PAGE">PAGE</a></td>
 	<td><a href="typesetting.html#R_MARGIN">R_MARGIN</a></td>
-	<td></td>
+	<td>&nbsp;</td>
 </table>
 
 <a name="2"><h3 align="center">Family/font; pointsize; leading</h3>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr>
 	<th>Family/font</th>
 	<th>Point size</th>
@@ -210,14 +210,14 @@
 </tr>
 <tr>
 	<td><a href="typesetting.html#FALLBACK_FONT">FALLBACK_FONT</a></td>
-	<td></td>
-	<td></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
 </tr>
 </table>
 
 <a name="3"><h3 align="center">Font modifications (pseudo-italic, -bold, -condensed, -extended)</h3>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr align="center">
 	<th>Italicize</th>
 	<th>Embolden</th>
@@ -246,7 +246,7 @@
 
 <a name="4"><h3 align="center">Underscoring and underlining</h3>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr align="center">
 	<th>Underscore</th>
 	<th>Underline</th>
@@ -263,7 +263,7 @@
 
 <a name="5"><h3 align="center">Colour</h3>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr align="center">
 	<th>Define colours</th>
 	<th>Invoke colours</th>
@@ -279,7 +279,7 @@
 
 <a name="6"><h3 align="center">Quad, justification and fill</h3>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr>
 	<th>Fill modes</th>
 	<th>No-fill modes</th>
@@ -293,14 +293,14 @@
 	<td><a href="typesetting.html#LRC">CENTER</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="typesetting.html#LRC">RIGHT</a></td>
 </tr>
 </table>
 
 <a name="7"><h3 align="center">Line termination</h3>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr align="center">
 	<th>Break</th>
 	<th>Break (no space)</th>
@@ -317,7 +317,7 @@
 
 <a name="8"><h3 align="center">Hyphenation</h3>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr align="center">
 	<th>Enable</th>
 	<th>Set parameters</th>
@@ -330,7 +330,7 @@
 
 <a name="9"><h3 align="center">Word and sentence spacing</h3>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr align="center">
 	<th>Word space</th>
 	<th>Sentence space</th>
@@ -343,7 +343,7 @@
 
 <a name="10"><h3 align="center">Character pair and full line kerning; ligatures</h3>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr align="center">
 	<th>Kern character pairs</th>
 	<th>Kern full lines</th>
@@ -357,18 +357,18 @@
 <tr>
 	<td><a href="inlines.html#INLINE_KERNING_MOM">\*[BU n]</a>
 	<td><a href="typesetting.html#EW">EW</a></td>
-	<td></td>
+	<td>&nbsp;</td>
 </tr>
 <tr>
 	<td><a href="inlines.html#INLINE_KERNING_MOM">\*[FU n]</a>
 	<td><a href="typesetting.html#BR_AT_LINE_KERN">BR_AT_LINE_KERN</a></td>
-	<td></td>
+	<td>&nbsp;</td>
 </tr>
 </table>
 
 <a name="11"><h3 align="center">Vertical movements</h3>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr align="center">
 	<th>Down</th>
 	<th>Up</th>
@@ -385,7 +385,7 @@
 
 <a name="12"><h3 align="center">Horizontal movements</h3>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr align="center">
 	<th>Forward</th>
 	<th>Back</th>
@@ -398,7 +398,7 @@
 
 <a name="13"><h3 align="center">Indents</h3>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr align="center">
 	<th>Left</th>
 	<th>Right</th>
@@ -419,15 +419,15 @@
 	<td><a href="typesetting.html#IQ">ILX</a></td>
 	<td><a href="typesetting.html#IQ">IRX</a></td>
 	<td><a href="typesetting.html#IQ">IBX</a></td>
-	<td></td>
-	<td></td>
-	<td></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
 </tr>
 </table>
 
 <a name="14"><h3 align="center">Tabs</h3>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr align="center">
 	<th>Setup</th>
 	<th>Invoking</th>
@@ -441,18 +441,18 @@
 <tr>
    <td><a href="typesetting.html#INLINE_ST">\*[STn]...\*[STnX]</a></td>
    <td align="center"><a href="typesetting.html#TN">TN</a></td>
-   <td></td>
+   <td>&nbsp;</td>
 </tr>
 <tr>
 	<td><a href="typesetting.html#ST">ST</a></td>
-	<td></td>
-	<td></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
 </tr>
 </table>
 
 <a name="15"><h3 align="center">Manual columns</h3>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr align="center">
 	<th>Initializing</th>
 	<th>Returning to top</th>
@@ -467,7 +467,7 @@
 
 <a name="16"><h3 align="center">Superscripts</h3>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr align="center">
 	<th>Superscript</th>
 	<th>Condensed superscript</th>
@@ -482,7 +482,7 @@
 
 <a name="17"><h3 align="center">Dropcaps</h3>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr align="center">
 	<th>Invoking</th>
 	<th>Dropcap control</th>
@@ -492,26 +492,26 @@
 	<td><a href="goodies.html#DROPCAP_FAMILY">DROPCAP_FAMILY</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="goodies.html#DROPCAP_FONT">DROPCAP_FONT</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="goodies.html#DROPCAP_COLOR">DROPCAP_COLOR</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="goodies.html#DROPCAP_ADJUST">DROPCAP_ADJUST</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="goodies.html#DROPCAP_GUTTER">DROPCAP_GUTTER</a></td>
 </tr>
 </table>
 
 <a name="18"><h3 align="center">Lists</h3>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr align="center">
 	<th>Initializing</th>
 	<th>Setting items</th>
@@ -523,20 +523,20 @@
 	<td><a href="docelement.html#SHIFT_LIST">SHIFT_LIST</a></td>
 </tr>
 <tr>
-	<td></td>
-	<td></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
 	<td><a href="docelement.html##RESET_LIST">RESET_LIST</a></td>
 </tr>
 <tr>
-	<td></td>
-	<td></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
 	<td><a href="#PAD_LIST_DIGITS">PAD_LIST_DIGITS</a></td>
 </tr>
 </table>
 
 <a name="19"><h3 align="center">Padding lines</h3>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr align="center">
 	<th>Pad a line</th>
 	<th>Change the pad marker</th>
@@ -549,7 +549,7 @@
 
 <a name="20"><h3 align="center">Miscellaneous</h3>
 
-<table align="center" valign="center" border=2 cellpadding="6">
+<table align="center" valign="center" border=1 cellpadding="6">
 <tr align="center">
 	<th>Newpage</th>
 	<th>All caps</th>
@@ -563,20 +563,20 @@
 	<td align="left"><a href="inlines.html#INLINE_RULE_MOM">\*[RULE]</a></td>
 </tr>
 <tr align="left">
-	<td></td>
-	<td></td>
-	<td></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
 	<td><a href="goodies.html#LEADER">\*[LEADER]</a></td>
 </tr>
 <tr align="left">
-	<td></td>
-	<td></td>
-	<td></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
 	<td><a href="goodies.html#LEADER_CHARACTER">LEADER_CHARACTER</a></td>
 </tr>
 </table>
 <br>
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr>
 	<th>Change the escape character</th>
 	<th>Suppress input</th>
@@ -588,9 +588,9 @@
 	<td><a href="goodies.html#TRAP">TRAP</a></td>
 </tr>
 <tr align="center">
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="goodies.html#SILENT">SILENT</a></td>
-	<td></td>
+	<td>&nbsp;</td>
 </tr>
 </tr>
 </table>
@@ -602,7 +602,7 @@
 
 <a name="21"><h3 align="center">Reference macros</h3></a>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr>
 	<th>Titles</th>
 	<th>Authors</th>
@@ -615,24 +615,24 @@
 </tr>
 <tr>
 	<td><a href="docprocessing.html#SUBTITLE">SUBTITLE</a></td>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="docprocessing.html#REVISION">REVISION</a></td>
 </tr>
 <tr>
 	<td><a href="docprocessing.html#DOCTITLE">DOCTITLE</a></td>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="docprocessing.html#DRAFT_STRING">DRAFT_STRING</a></td>
 </tr>
 <tr>
 	<td><a href="docprocessing.html#CHAPTER">CHAPTER</a></td>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="docprocessing.html#REVISION_STRING">REVISION_STRING</a></td>
 </tr>
 </table>
 
 <a name="22"><h3 align="center">Letters</h3></a>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr>
 	<th>Headers</th>
 	<th>Closing</th>
@@ -645,24 +645,24 @@
 </tr>
 <tr>
 	<td><a href="letters.html#FROM">FROM</a></td>
-	<td></td>
-	<td></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
 </tr>
 <tr>
 	<td><a href="letters.html#TO">TO</a></td>
-	<td></td>
-	<td></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
 </tr>
 <tr>
 	<td><a href="letters.html#GREETING">GREETING</a></td>
-	<td></td>
-	<td></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
 </tr>
 </table>
 
 <a name="23"><h3 align="center">Document style</h3></a>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr>
 	<th>Basic style</th>
 	<th>Style control*</th>
@@ -680,23 +680,23 @@
 	<td><a href="docprocessing.html#DOC_LINE_LENGTH">DOC_LINE_LENGTH</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="docprocessing.html#DOC_FAMILY">DOC_FAMILY</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="docprocessing.html#DOC_PT_SIZE">DOC_PT_SIZE</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="docprocessing.html#DOC_LEAD">DOC_LEAD</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="docprocessing.html#DOC_LEAD_ADJUST">DOC_LEAD_ADJUST</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="docprocessing.html#DOC_QUAD">DOC_QUAD</a></td>
 </tr>
 </table>
@@ -708,7 +708,7 @@
 
 <a name="24"><h3 align="center">Special to PRINTSTYLE TYPEWRITE</h3></a>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr>
 	<th>Italic/underlining</th>
 	<th>Quotes</th>
@@ -719,20 +719,20 @@
 </tr>
 <tr>
 	<td><a href="docprocessing.html#TYPEWRITE_CONTROL">ITALIC_MEANS_ITALIC</a></td>
-	<td></td>
+	<td>&nbsp;</td>
 </tr>
 <tr>
 	<td><a href="docprocessing.html#TYPEWRITE_CONTROL">UNDERLINE_SLANT</a></td>
-	<td></td>
+	<td>&nbsp;</td>
 </tr>
 <tr>
 	<td><a href="docprocessing.html#TYPEWRITE_CONTROL">SLANT_MEANS_SLANT</a></td>
-	<td></td>
+	<td>&nbsp;</td>
 </tr>
 </table>
 
 <a name="25"><h3 align="center">Begin document processing</h3></a>
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr>
 	<th>Absolutely required in order to initialize document processing</th>
 </tr>
@@ -743,7 +743,7 @@
 
 <a name="26"><h3 align="center">Customizing the document header</h3></a>
 
-<table align="center" valign="center" border=2 cellpadding="8">
+<table align="center" valign="center" border=1 cellpadding="8">
 <tr>
 	<th>Global</th>
 	<th>Title</th>
@@ -775,15 +775,15 @@
 	<td><a href="docprocessing.html#CHANGE_SIZE">CHAPTER_TITLE_SIZE</a></td>
 </tr>
 <tr>
-	<td></td>
-	<td></td>
-	<td></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
 	<td><a href="docprocessing.html#CHANGE_COLOR">CHAPTER_TITLE_COLOR</a></td>
 </tr>
 </table>
 <br>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr>
 	<th>Attribution</th>
 	<th>Author</th>
@@ -800,12 +800,12 @@
 	<td><a href="docprocessing.html#CHANGE_FONT">DOCTYPE_FONT</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="docprocessing.html#CHANGE_SIZE">AUTHOR_SIZE</a></td>
 	<td><a href="docprocessing.html#CHANGE_SIZE">DOCTYPE_SIZE</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="docprocessing.html#CHANGE_COLOR">AUTHOR_COLOR</a></td>
 	<td><a href="docprocessing.html#CHANGE_COLOR">DOCTYPE_COLOR</a></td>
 </tr>
@@ -813,7 +813,7 @@
 
 <a name="27"><h3 align="center">Pagination</h3></a>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr>
 	<th>Paginate</th>
 	<th>Style control</th>
@@ -844,7 +844,7 @@
 </tr>
 <tr>
 	<td><a href="docelement.html#SUSPEND_PAGINATION">RESTORE_PAGINATION</a></td>
-	<td></td>
+	<td>&nbsp;</td>
 </tr>
 </table>
 <p align="center">
@@ -852,7 +852,7 @@
 
 <a name="28"><h3 align="center">Recto/verso</h3></a>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr>
 	<th>Enabling</th>
 	<th>Controling</th>
@@ -867,18 +867,18 @@
 	<td align="center"><a href="headfootpage.html#HDRFTR_RECTOVERSO">HEADER_RECTO</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="rectoverso.html#SWITCH_HDRFTR">SWITCH_FOOTERS</a>*</td>
 	<td align="center"><a href="headfootpage.html#HDRFTR_RECTOVERSO">HEADER_VERSO</a></td>
 </tr>
 <tr>
-	<td></td>
-	<td></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
 	<td align="center"><a href="headfootpage.html#HDRFTR_RECTOVERSO">FOOTER_RECTO</a>*</td>
 </tr>
 <tr>
-	<td></td>
-	<td></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
 	<td align="center"><a href="headfootpage.html#HDRFTR_RECTOVERSO">FOOTER_VERSO</a>*</td>
 </tr>
 </table>
@@ -894,7 +894,7 @@
 
 <a name="29"><h3 align="center">Automatic columns</h3></a>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr>
 	<th>Enabling</th>
 	<th>Controling</th>
@@ -904,14 +904,14 @@
 	<td><a href="docprocessing.html#COL_NEXT">COL_NEXT</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="docprocessing.html#COL_BREAK">COL_BREAK</a></td>
 </tr>
 </table>
 
 <a name="30"><h3 align="center">Epigraphs</h3></a>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr>
 	<th>Macro</th>
 	<th>Type-style control</th>
@@ -923,25 +923,25 @@
 	<td><a href="docelement.html#EPIGRAPH_CONTROL">EPIGRAPH_AUTOLEAD</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="docelement.html#EPIGRAPH_CONTROL">EPIGRAPH_FONT</a></td>
 	<td><a href="docelement.html#EPIGRAPH_CONTROL">EPIGRAPH_QUAD</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="docelement.html#EPIGRAPH_CONTROL">EPIGRAPH_SIZE</a></td>
 	<td><a href="docelement.html#EPIGRAPH_CONTROL">EPIGRAPH_INDENT</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="docelement.html#EPIGRAPH_CONTROL">EPIGRAPH_COLOR</a></td>
-	<td></td>
+	<td>&nbsp;</td>
 </tr>
 </table>
 
 <a name="31"><h3 align="center">Heads</h3></a>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr>
 	<th>Macro</th>
 	<th>Type-style control</th>
@@ -953,35 +953,35 @@
 	<td><a href="docelement.html#HEAD_GENERAL">HEAD_QUAD</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="docelement.html#HEAD_GENERAL">HEAD_FONT</a></td>
 	<td><a href="docelement.html#HEAD_CAPS">HEAD_CAPS</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="docelement.html#HEAD_GENERAL">HEAD_SIZE</a></td>
 	<td><a href="docelement.html#HEAD_UNDERLINE">HEAD_UNDERLINE</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="docelement.html#HEAD_GENERAL">HEAD_COLOR</a></td>
 	<td><a href="docelement.html#HEAD_SPACE">HEAD_SPACE</a></td>
 </tr>
 <tr>
-	<td></td>
-	<td></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
 	<td><a href="docelement.html#NUMBER_HEADS">NUMBER_HEADS</a></td>
 </tr>
 <tr>
-	<td></td>
-	<td></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
 	<td><a href="docelement.html#RESET_HEAD_NUMBER">RESET_HEAD_NUMBER</a></td>
 </tr>
 </table>
 
 <a name="32"><h3 align="center">Subheads</h3></a>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr>
 	<th>Macro</th>
 	<th>Type-style control</th>
@@ -993,25 +993,25 @@
 	<td><a href="docelement.html#SUBHEAD_GENERAL">SUBHEAD_QUAD</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="docelement.html#SUBHEAD_GENERAL">SUBHEAD_FONT</a></td>
 	<td><a href="docelement.html#NUMBER_SUBHEADS">NUMBER_SUBHEADS</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="docelement.html#SUBHEAD_GENERAL">SUBHEAD_SIZE</a></td>
 	<td><a href="docelement.html#RESET_SUBHEAD_NUMBER">RESET_SUBHEAD_NUMBER</a></td>
 </tr>
 <tr>
-	<td></td>
-	<td></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
 	<td><a href="docelement.html#SUBHEAD_CONTROL">SUBHEAD_COLOR</a></td>
 </tr>
 </table>
 
 <a name="33"><h3 align="center">Paragraph heads</h3></a>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr>
 	<th>Macro</th>
 	<th>Type-style control</th>
@@ -1023,25 +1023,25 @@
 	<td><a href="docelement.html#PARAHEAD_INDENT">PARAHEAD_INDENT</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="docelement.html#PARAHEAD_GENERAL">PARAHEAD_FONT</a></td>
 	<td><a href="docelement.html#NUMBER_PARAHEADS">NUMBER_PARAHEADS</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="docelement.html#PARAHEAD_GENERAL">PARAHEAD_SIZE</a></td>
 	<td><a href="docelement.html#RESET_PARAHEAD_NUMBER">RESET_PARAHEAD_NUMBER</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="docelement.html#PARAHEAD_GENERAL">PARAHEAD_COLOR</a></td>
-	<td></td>
+	<td>&nbsp;</td>
 </tr>
 </table>
 
 <a name="34"><h3 align="center">Paragraphs</h3></a>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr>
 	<th>Macro</th>
 	<th>Type-style control*</th>
@@ -1053,13 +1053,13 @@
 	<td><a href="docelement.html#PARA_INDENT">PARA_INDENT</a></td>
 </tr>
 <tr>
-	<td></td>
-	<td></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
 	<td><a href="docelement.html#INDENT_FIRST_PARAS">INDENT_FIRST_PARAS</a></td>
 </tr>
 <tr>
-	<td></td>
-	<td></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
 	<td><a href="docelement.html#PP_SPACE">PARA_SPACE</a></td>
 </tr>
 </table>
@@ -1076,7 +1076,7 @@
 (line-for-line cited text, e.g. poetry or code snippets)
 </h3>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr>
 	<th>Macro</th>
 	<th>Type-style control</th>
@@ -1088,17 +1088,17 @@
 	<td><a href="docelement.html#QUOTE_GENERAL">QUOTE_INDENT</a>*</td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="docelement.html#QUOTE_GENERAL">QUOTE_FONT</a></td>
 	<td><a href="docelement.html#ALWAYS_FULLSPACE_QUOTES">ALWAYS_FULLSPACE_QUOTES</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="docelement.html#QUOTE_GENERAL">QUOTE_SIZE</a></td>
 	<td><a href="docelement.html#BREAK_QUOTE">BREAK_QUOTE</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="docelement.html#QUOTE_GENERAL">QUOTE_COLOR</a></td>
 	<td><a href="docprocessing.html#UNDERLINE_QUOTES">UNDERLINE_QUOTES</a></td>
 </tr>
@@ -1112,7 +1112,7 @@
 (formatted citations)
 </h3>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr>
 	<th>Macro</th>
 	<th>Type-style control</th>
@@ -1124,19 +1124,19 @@
 	<td><a href="docelement.html#QUOTE_GENERAL">BLOCKQUOTE_INDENT</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="docelement.html#BLOCKQUOTE_GENERAL">BLOCKQUOTE_FONT</a></td>
 	<td><a href="docelement.html#BLOCKQUOTE_GENERAL">BLOCKQUOTE_QUAD</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="docelement.html#BLOCKQUOTE_GENERAL">BLOCKQUOTE_SIZE</a></td>
 	<td><a href="docelement.html#BREAK_QUOTE">BREAK_BLOCKQUOTE</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="docelement.html#BLOCKQUOTE_GENERAL">BLOCKQUOTE_COLOR</a></td>
-	<td></td>
+	<td>&nbsp;</td>
 </tr>
 </tr>
 </table>
@@ -1149,7 +1149,7 @@
 (also called "scene breaks")
 </h3>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr>
 	<th>Macro</th>
 	<th>Type-style control</th>
@@ -1164,7 +1164,7 @@
 
 <a name="38"><h3 align="center">Footnotes</h3></a>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr>
 	<th>Macro</th>
 	<th>Type-style control</th>
@@ -1176,38 +1176,38 @@
 	<td><a href="docelement.html#FOOTNOTE_GENERAL">FOOTNOTE_AUTOLEAD</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="docelement.html#FOOTNOTE_GENERAL">FOOTNOTE_FONT</a></td>
 	<td><a href="docelement.html#FOOTNOTE_GENERAL">FOOTNOTE_QUAD</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="docelement.html#FOOTNOTE_GENERAL">FOOTNOTE_SIZE</a></td>
 	<td><a href="docelement.html#FOOTNOTE_MARKERS">FOOTNOTE_MARKERS</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="docelement.html#FOOTNOTE_GENERAL">FOOTNOTE_COLOR</a></td>
 	<td><a href="docelement.html#FOOTNOTE_MARKER_STYLE">FOOTNOTE_MARKER_STYLE</a></td>
 </tr>
 <tr>
-	<td></td>
-	<td></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
 	<td><a href="docelement.html#RESET_FOOTNOTE_NUMBER">RESET_FOOTNOTE_NUMBER</a></td>
 </tr>
 <tr>
-	<td></td>
-	<td></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
 	<td><a href="docelement.html#FOOTNOTE_RULE">FOOTNOTE_RULE</a></td>
 </tr>
 <tr>
-	<td></td>
-	<td></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
 	<td><a href="docelement.html#FOOTNOTE_RULE_ADJ">FOOTNOTE_RULE_ADJ</a></td>
 </tr>
 <tr>
-	<td></td>
-	<td></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
 	<td><a href="docelement.html#FOOTNOTE_RULE_LENGTH">FOOTNOTE_RULE_LENGTH</a></td>
 </tr>
 </table>
@@ -1216,7 +1216,7 @@
 
 <a name="39"><h3 align="center">Endnotes</h3></a>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr>
 	<th>Input endnotes</th>
     <th>Output endnotes pages</th>
@@ -1232,7 +1232,7 @@
 (if you want to change the defaults)
 </h3>
 
-<table align="center" valign="center" border=2 cellpadding="6">
+<table align="center" valign="center" border=1 cellpadding="6">
 <tr>
 	<th>Type-style control</th>
 	<th>Endnotes page
@@ -1266,7 +1266,7 @@
 	<td><a href="docelement.html#ENDNOTE_TITLE_CONTROL">ENDNOTE_TITLE_QUAD</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="docelement.html#ENDNOTE_STRING_UNDERSCORE">ENDNOTE_STRING_UNDERSCORE</a></td>
 	<td><a href="docelement.html#ENDNOTE_TITLE_UNDERSCORE">ENDNOTE_TITLE_UNDERSCORE</a></td>
 </tr>
@@ -1278,9 +1278,9 @@
 **I.e. how each document in the endnotes for a collated document is
 identified (by default, the strings passed to the reference
 macro, .TITLE
-<br>
+<p>
 
-<table align="center" valign="center" border=2 cellpadding="6">
+<table align="center" valign="center" border=1 cellpadding="6">
 <tr>
 	<th>Endnotes numbering</th>
 	<th>Paragraph control</th>
@@ -1298,23 +1298,23 @@
 </tr>
 <tr>
 	<td><a href="docelement.html#ENDNOTE_NUMBER_CONTROL">ENDNOTE_NUMBER_SIZE</a></td>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="docelement.html#ENDNOTES_HDRFTR_CENTER">ENDNOTES_FOOTER_CENTER</a></td>
 </tr>
 <tr>
 	<td><a href="docelement.html#ENDNOTE_NUMBERS_ALIGN_LEFT">ENDNOTE_NUMBERS_ALIGN_LEFT</a></td>
-	<td></td>
-	<td></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
 </tr>
 <tr>
 	<td><a href="docelement.html#ENDNOTE_NUMBERS_ALIGN_RIGHT">ENDNOTE_NUMBERS_ALIGN_RIGHT</a></td>
-	<td></td>
-	<td></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
 </tr>
 </table>
 <br>
 
-<table align="center" valign="center" border=2 cellpadding="6">
+<table align="center" valign="center" border=1 cellpadding="6">
 <tr>
 	<th>Endnotes page numbering</th>
 	<th>Misc</th>
@@ -1329,7 +1329,7 @@
 </tr>
 <tr>
 	<td><a href="docelement.html#ENDNOTES_NO_FIRST_PAGENUM">ENDNOTES_NO_FIRST_PAGENUM</a></td>
-	<td></td>
+	<td>&nbsp;</td>
 </tr>
 </table>
 <p align="center">
@@ -1339,7 +1339,7 @@
 
 <a name="41"><h3 align="center">Table of contents</h3></a>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr>
 	<th>Generate</th>
 	<th>General
@@ -1357,23 +1357,23 @@
 	<td><a href="docelement.html#TOC_HEADER_STRING">TOC_HEADER_STRING</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td align="center"><a href="docelement.html#TOC_PT_SIZE">TOC_PT_SIZE</a></td>
 	<td><a href="docelement.html#TOC_HEADER_FAMILY">TOC_HEADER_FAMILY</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td align="center"><a href="docelement.html#TOC_LEAD">TOC_LEAD</a></td>
 	<td><a href="docelement.html#TOC_HEADER_FONT">TOC_HEADER_FONT</a></td>
 </tr>
 <tr>
-	<td></td>
-	<td></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
 	<td><a href="docelement.html#TOC_HEADER_SIZE">TOC_HEADER_SIZE</a></td>
 </tr>
 <tr>
-	<td></td>
-	<td></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
 	<td><a href="docelement.html#TOC_HEADER_QUAD">TOC_HEADER_QUAD</a></td>
 </tr>
 </table>
@@ -1385,7 +1385,7 @@
 (if you want to change the defaults)
 </h3>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr>
 	<th>Title entries</th>
 	<th>Head entries</th>
@@ -1413,18 +1413,18 @@
 </tr>
 <tr>
 	<td><a href="docelement.html#TOC_TITLE">TOC_TITLE_SIZE</a></td>
-	<td></td>
-	<td></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
 </tr>
 <tr>
 	<td><a href="docelement.html#TOC_TITLE">TOC_TITLE_INDENT</a></td>
-	<td></td>
-	<td></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
 </tr>
 </table>
 <br>
 
-<table align="center" valign="center" border=2 cellpadding="6">
+<table align="center" valign="center" border=1 cellpadding="6">
 <tr>
 	<th>Parahead entries</th>
 	<th>Page number entries</th>
@@ -1441,19 +1441,19 @@
 	<td><a href="docelement.html#TOC_PARAHEAD">TOC_PARAHEAD_FONT</a></td>
 	<td><a href="docelement.html#TOC_PN">TOC_PN_FONT</a></td>
 	<td align="center"><a href="docelement.html#TOC_PAGENUM_STYLE">TOC_PAGENUM_STYLE</a>*</td>
-	<td></td>
+	<td>&nbsp;</td>
 </tr>
 <tr>
 	<td><a href="docelement.html#TOC_PARAHEAD">TOC_PARAHEAD_SIZE</a></td>
 	<td><a href="docelement.html#TOC_PN">TOC_PN_SIZE</a></td>
-	<td></td>
-	<td></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
 </tr>
 <tr>
 	<td><a href="docelement.html#TOC_PARAHEAD">TOC_PARAHEAD_INDENT</a></td>
 	<td><a href="docelement.html#TOC_PADDING">TOC_PADDING</a></td>
-	<td></td>
-	<td></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
 </tr>
 </table>
 <p align="center">
@@ -1461,7 +1461,7 @@
 
 <a name="43"><h3 align="center">Finis</h3></a>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr>
 	<th>Macro</th>
 	<th>Type style control</th>
@@ -1472,7 +1472,7 @@
 </tr>
 <tr>
 	<td><a href="docelement.html#FINIS_STRING">FINIS_STRING</a></td>
-	<td></td>
+	<td>&nbsp;</td>
 </tr>
 </table>
 
@@ -1484,8 +1484,9 @@
 bottom.  Consequently, in the following, substitute FOOTERS
 for HEADERS, and FOOTER_ for HEADER_ if you're hunting down how to
 do something with footers.
+<p>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr>
 	<th>Macro</th>
 	<th>Placement</th>
@@ -1502,28 +1503,28 @@
 	<td><a href="headfootpage.html#HDRFTR_GLOBAL_FAMILY">HEADER_FAMILY</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="headfootpage.html#HDRFTR_GAP">HEADER_GAP</a></td>
 	<td><a href="headfootpage.html#HDRFTR_RECTOVERSO">HEADER_VERSO</a></td>
 	<td><a href="headfootpage.html#HDRFTR_GLOBAL_SIZE">HEADER_SIZE</a></td>
 </tr>
 <tr>
-	<td></td>
-	<td></td>
-	<td></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
 	<td><a href="headfootpage.html#HDRFTR_COLOR">HEADER_COLOR</a></td>
 </tr>
 <tr>
-	<td></td>
-	<td></td>
-	<td></td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
+	<td>&nbsp;</td>
 	<td><a href="headfootpage.html#HDRFTR_PLAIN">HEADER_PLAIN</a></td>
 </tr>
 </table>
 
 <a name="45"><h3 align="center">Part-by-part control of headers</h3></a>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr>
 	<th>Left</th>
 	<th>Center</th>
@@ -1560,14 +1561,14 @@
 	<td><a href="headfootpage.html#_CAPS">HEADER_RIGHT_CAPS</a></td>
 </tr>
 <tr>
-	<td></td>
+	<td>&nbsp;</td>
 	<td><a href="headfootpage.html#HDRFTR_CENTER_PAD">HEADER_CENTER_PAD</a></td>
-	<td></td>
+	<td>&nbsp;</td>
 </tr>
 </table>
 <br>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr>
 	<th>Separator rule</th>
     <th>Misc</th>
@@ -1582,7 +1583,7 @@
 </tr>
 <tr>
 	<td><a href="headfootpage.html#HDRFTR_RULE_COLOR">HEADER_RULE_COLOR</a></td>
-	<td></td>
+	<td>&nbsp;</td>
 </tr>
 </table>
 
@@ -1591,7 +1592,7 @@
 This is the one exception to the &quot;HEADER also means FOOTER&quot;
 convention used throughout the documentation.
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr>
 	<td><a href="headfootpage.html#FOOTER_ON_FIRST_PAGE">FOOTER_ON_FIRST_PAGE</a></td>
 </tr>
@@ -1599,7 +1600,7 @@
 
 <a name="47"><h3 align="center">Covers and doc covers</h3></a>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr>
 	<th>Covers</th>
 	<th>Doc covers</th>
@@ -1617,7 +1618,7 @@
 
 <a name="48"><h3 align="center">Customizing covers and doc covers</h3></a>
 
-<table align="center" valign="center" border=2 cellpadding="8">
+<table align="center" valign="center" border=1 cellpadding="8">
 <tr>
 	<th>Covers</th>
 	<th>Doc covers</th>
@@ -1646,7 +1647,7 @@
 For part-by-part control of the family, font, size and color, please
 see
 
-<table align="center" valign="center" border=2 cellpadding="8">
+<table align="center" valign="center" border=1 cellpadding="8">
 	<tr>
 		<td align="center"><a href="cover.html#COVER_CONTROL">Control macros--changing the defaults for covers and document covers</a></td>
 	</tr>
@@ -1657,7 +1658,7 @@
 
 <a name="50"><h3 align="center">Miscellaneous</h3></a>
 
-<table align="center" valign="center" border=2 cellpadding="10">
+<table align="center" valign="center" border=1 cellpadding="10">
 <tr>
 	<th>Output a blank page</th>
 	<th>Collate multiple documents</th>
Index: groff/contrib/mom/momdoc/reserved.html
diff -u groff/contrib/mom/momdoc/reserved.html:1.17 groff/contrib/mom/momdoc/reserved.html:1.18
--- groff/contrib/mom/momdoc/reserved.html:1.17	Wed Sep 29 09:29:38 2004
+++ groff/contrib/mom/momdoc/reserved.html	Mon Jan 24 08:23:21 2005
@@ -167,8 +167,6 @@
 PADMARKER        Sets character to use instead of # in PAD
 PRINT            Simply prints args passed to it; keeps my code
                  indented nicely
-RESET_LEAD       Trap invoked macro which resets the lead to the
-                 value passed to LS when LS is called at Top Of Page
 RW               Reduce white -- tighten overall line kern
                  (character spacing)
 SILENT           Don't print lines till SILENT OFF
@@ -305,22 +303,18 @@
                         of LIST
 #STORED_T_INDENT        Current temporary indent at first invocation
                         of LIST
-t                       "mark" register set in T_MARGIN; recalled
-                        in LS and AUTOLEAD if #T_MARGIN_SET is 1
 #T_INDENT               Value of temporary indent
 #T_MARGIN               Top margin
-#T_MARGIN_SET           Did we set the top margin with T_MARGIN?
-                        (toggle)
 #TAB_ACTIVE             Are we in a tab? (toggle)
 #TAB_NUMBER             Tab number
 #TAB_OFFSET             Tab indent
-#TOP_ALD                Was ALD called at Top Of Page before text input?
-                        (toggle)
+#TOP                    Set to 1 in T_MARGIN, DO_T_MARGIN and ALD; tells
+                        the first LS or AUTOLEAD on a page to maintain
+                        the baseline position prior to the LS call
 #TOP_BASELINE_ADJ       Amount by which to adjust the baseline position
-                        of the first line on the page if an LS request
-                        is greater than the current lead
-#TOP_LEAD               Was LS called at Top Of Page before text input?
-                        (toggle)
+                        of the first line on the page if an LS or AUTOLEAD
+                        request differs from the lead current at the end of
+                        the previous page
 #TOTAL_LISTS            Total number of lists in a nest
 #USER_SET_L_LENGTH      Did user invoke LL? (toggle)
 #USER_SET_TITLE_ITEM    Did user invoke TOC_TITLE_ENTRY?
@@ -506,6 +500,8 @@
 
 Document tags
 -------------
+ADD_SPACE       Special macro to add space to the top of a pages after
+                page 1; must be preceded by NEWPAGE
 BLOCKQUOTE      Block-indented, quoted text
 COL_BREAK       Breaks and spreads line before invocation; moves to
                 next column on page or 1st col of next page.  An alias
@@ -889,6 +885,10 @@
                            AUTHOR_&lt;#&gt; in AUTHOR
 #AUTHORS                   Equals final value of AUTHOR_NUM;
                            used for authors in doc header
+#BASELINE_MARK             In PP, the vertical position on the page
+                           (when paragraph spacing is on) after a
+                           quote or blockquote has been output and
+                           the post-quote space has been added.
 #BMARG                     Position of unvarying bottom margin
                            during doc processing; required for
                            collecting footnotes inside diversions
@@ -1151,7 +1151,7 @@
 #HEAD_NUM                  Head number
 #HEAD_SPACE                2 line spaces before heads?
                            (toggle; 1=yes, 0=no)
-#HEAD_UNDERLINE            Underline section titles? (toggle)
+#HORIZ_MARK                Horizontal 
 #HOW_MANY                  Number of blank pages to output
 #IGNORE                    Should we ignore this macro? Set to 1 in
                            TYPEWRITE.
@@ -1187,6 +1187,8 @@
                            subtract 1 line of footnote lead from
                            FN_OVERFLOW in a PREV_FN_DEFERRED
                            situation.
+#NO_SPACE                  When para spacing is active, instructs
+                           PP not to add space after a quote or blockquote.
 #NO_TRAP_RESET             Should we reset page traps? (toggle)
 #NUM_AUTHORS               # of authors mod 2 to test if odd or even
                            # of authors
Index: groff/contrib/mom/momdoc/toc.html
diff -u groff/contrib/mom/momdoc/toc.html:1.14 groff/contrib/mom/momdoc/toc.html:1.15
--- groff/contrib/mom/momdoc/toc.html:1.14	Fri Oct 15 06:10:25 2004
+++ groff/contrib/mom/momdoc/toc.html	Mon Jan 24 08:23:21 2005
@@ -2,13 +2,13 @@
 <html>
 <head>
 <meta http-equiv="content-type" content="text/html;charset=iso-8859-1">
-<title>Mom, version 1.2-d -- Table of Contents</title>
+<title>Mom, version 1.2-f -- Table of Contents</title>
 </head>
 <body bgcolor="#dfdfdf">
 
 <!====================================================================>
 
-<h1 align="center"><u>Table of Contents for mom, version 1.2-d</u></h1>
+<h1 align="center"><u>Table of Contents for mom, version 1.2-f</u></h1>
 
 The table of contents has grown quite large.  If you've been using
 <strong>mom</strong> for a while, you might prefer the
Index: groff/contrib/mom/momdoc/typemacdoc.html
diff -u groff/contrib/mom/momdoc/typemacdoc.html:1.7 groff/contrib/mom/momdoc/typemacdoc.html:1.8
--- groff/contrib/mom/momdoc/typemacdoc.html:1.7	Fri Jun  4 06:43:08 2004
+++ groff/contrib/mom/momdoc/typemacdoc.html	Mon Jan 24 08:23:21 2005
@@ -52,14 +52,6 @@
 <a href="definitions.html#TERMS_LEADING">leading</a>,
 and
 <a href="definitions.html#TERMS_QUAD">quad</a>.
-<p>
-<strong>NOTE:</strong> See the section on
-<a href="#TB_MARGINS">Top and bottom margins in document processing</a>
-for information on how <strong>mom</strong> interprets
-<a href="typesetting.html#T_MARGIN">T_MARGIN</a>
-and
-<a href="typesetting.html#B_MARGIN">B_MARGIN</a>
-in document processing.
 
 <p>
 <strong>Mom</strong> assumes that any changes to these parameters
@@ -71,6 +63,18 @@
 <p>
 The following lists those typesetting macros whose behaviour during
 document processing requires some explanation.
+(Please refer to
+<a href="#TB_MARGINS">Top and bottom margins in document processing</a>
+for information on how <strong>mom</strong> interprets
+<a href="typesetting.html#T_MARGIN">T_MARGIN</a>
+and
+<a href="typesetting.html#B_MARGIN">B_MARGIN</a>
+in document processing.  Additionally, see
+<a href="#ADD_SPACE">ADD_SPACE</a>
+if you encounter the problem of trying to get <strong>mom</strong>
+to put space at the tops of pages after the first.)
+
+
 <p>
 <pre>
 MACRO           EFFECT DURING DOCUMENT PROCESSING
@@ -177,6 +181,52 @@
 <a href="definitions.html#TERMS_FOOTER">footers</a>,
 or page numbers.
 
+<a name="ADD_SPACE">
+	<h2><u>ADD_SPACE</u></h2>
+</a>
+
+<p>
+Occasionally, you may want to insert space before the start of
+<a href="definitions.html#TERMS_RUNNING">running text</a>
+on pages after the first.
+<p>
+You might have tried using
+<a href="typesetting.html#ALD">ALD</a>
+or
+<a href="typesetting.html#SPACE">SPACE</a>
+and found it did nothing.  This is because <strong>mom</strong>
+normally inhibits any extra space before the start of running text
+on pages after the first.
+<p>
+If you need the space, you must use the macro,
+<strong>ADD_SPACE</strong>, in conjuction with
+<a href="typesetting.html#NEWPAGE">NEWPAGE</a>.
+<strong>ADD_SPACE</strong> takes as its single argument the
+distance you want <strong>mom</strong> to advance from the normal
+baseline position at the top of the page.  A
+<a href="definitions.html#TERMS_UNITOFMEASURE">unit of measure</a>
+is required.
+
+<p>
+For example, say you wanted to insert 2 inches of space before the
+start of running text on a page other than the first.  You'd
+accomplish it with
+
+<p>
+<pre>
+	.NEWPAGE
+	.ADD_SPACE 2i
+</pre>
+
+which would terminate your current page, break to a new page,
+print the header (assuming headers are on) and insert 2 inches of
+space before the start of running text.
+<p>
+Since adding space in this way is almost sure to disrupt
+<strong>mom</strong>'s ability to guarantee perfectly flush bottom
+margins, I highly recommend using the
+<a href="docprocessing.html#SHIM">SHIM</a>
+macro immediately after <strong>ADD_SPACE</strong>.
 <p>
 <hr>
 <a href="macrolist.html#TOP">Next</a>&nbsp;&nbsp;
Index: groff/contrib/mom/momdoc/typesetting.html
diff -u groff/contrib/mom/momdoc/typesetting.html:1.13 groff/contrib/mom/momdoc/typesetting.html:1.14
--- groff/contrib/mom/momdoc/typesetting.html:1.13	Fri Oct 15 06:10:25 2004
+++ groff/contrib/mom/momdoc/typesetting.html	Mon Jan 24 08:23:21 2005
@@ -903,6 +903,19 @@
 The size of type can also be changed inline.  See
 <a href="inlines.html#INLINE_SIZE_MOM">Inline Escapes, changing point size</a>.
 <p>
+<strong>NOTE:</strong> It is unfortunate that the <kbd>pic</kbd>
+pre-processor uses <strong>PS</strong>, and thus
+<strong>mom</strong>'s macro for setting point sizes can't use it.
+However, if you aren't using <kbd>pic</kbd>, you might want to
+alias <strong>PT_SIZE</strong> as <strong>PS</strong>, since
+there'd be no conflict.
+<p>
+<pre>
+	.ALIAS PS PT_SIZE
+</pre>
+
+would allow you to set point sizes with <kbd>.PS</kbd>.
+<p>
 
 <!---LS--->
 
@@ -1304,10 +1317,18 @@
 <a href="#EL_NOTES">NOTES</a>,
 below.
 <br>
-Furthermore, in nofill modes, EL does not work after the PAD macro.
+*If you find remembering whether to put in the <kbd>\c</kbd>
+bothersome, you may prefer to use the
+<a href="definitions.html#TERMS_INLINES">inline escape</a>
+alternative to 
+<kbd>.EL</kbd>,
+<a href="inlines.html#B">\*[B]</a>,
+which works consistently regardless of the fill mode.
+<br>
+*EL does not work after the PAD macro.
 See
-<a href="#EL_EXCEPTION">Exception</a>
-for a workaround</em>.
+<a href="goodies.html#PAD">PAD</a>
+for the way around this</em>.
 <p>
 The mnemonic "EL" is borrowed from old Compugraphic typesetting
 systems, where it stood for "End Line."  Conceptually,
@@ -1323,7 +1344,9 @@
 
 <p>
 <strong>EL</strong>'s function is simple: it breaks a line without
-advancing on the page.  As an example of where you might use it,
+advancing on the page.
+<a name="EL_EXAMPLE">As</a>
+an example of where you might use it,
 imagine that you're working from marked-up copy.  The markup
 indicates 24 points of space between two given lines, but the
 prevailing line spacing is 12.5 points.  You may find it more
@@ -1403,31 +1426,7 @@
 <a href="definitions.html#TERMS_PRIMITIVES">primitives</a>
 (see the exception, below), you don't have to worry about this,
 regardless of the fill mode.  Just type <kbd>.EL</kbd>
-<p>
-<a name="EL_EXCEPTION"></a>
-<strong>Exception: EL</strong> does not work after the
-<a href="goodies.html#PAD">PAD</a>
-macro when you're in a nofill mode.  If you require
-<strong>EL</strong> functionality after <strong>PAD</strong> while
-in a nofill mode, you have to perform its function
-&quot;manually&quot;, e.g.
-<p>
-<pre>
-	.CENTER    \" CENTER is a nofill mode
-	.PAD "#\*[ST1]A line of text\*[ST1X]#"
-	\#
-	.TRAP OFF  \" -+
-	.SP -1v    \"  |--> this is a "manual" EL
-	.TRAP      \" -+
-	\#
-	.ST 1 L
-	.TAB 1
-	.ALD 2p
-	\*[RULE]
-	.RLD 2p
-	.TQ
-</pre>
-<p>
+<br>
 
 <!---SP--->
 
@@ -3371,10 +3370,20 @@
 Macro: <strong>TN</strong>
 <br>
 <em>*In tabs that aren't given the QUAD argument when they're set up
-with TAB_SET or ST, you must terminate the line preceding TN with
-the \c inline escape.  See the
+with
+<a href="#TAB_SET">TAB_SET</a>
+or
+<a href="#ST">ST</a>, you must terminate the line preceding
+<kbd>TN</kbd> with the \c inline escape.  See the
 <a href="#TN_NOTE">ADDITIONAL NOTE</a>,
-below.</em>
+<br>
+*If you find remembering whether to put in the <kbd>\c</kbd>
+bothersome, you may prefer to use the
+<a href="definitions.html#TERMS_INLINES">inline escape</a>
+alternative to 
+<kbd>.TN</kbd>,
+<a href="inlines.html#TB+">\*[TB+]</a>,
+which works consistently regardless of the fill mode.</em>
 
 <p>
 <strong>TN</strong> moves over to the next tab in numeric
Index: groff/contrib/mom/om.tmac
diff -u groff/contrib/mom/om.tmac:1.25 groff/contrib/mom/om.tmac:1.26
--- groff/contrib/mom/om.tmac:1.25	Fri Dec 10 07:15:16 2004
+++ groff/contrib/mom/om.tmac	Mon Jan 24 08:23:21 2005
@@ -23,7 +23,7 @@
 .\"
 .\"
 .\"
-\# Version 1.2-e
+\# Version 1.2-f
 \# -------------
 \#
 \# Antoine de St-Exupéry asserted that elegance in engineering is
@@ -229,11 +229,9 @@
 \#   Requires unit of measure.
 \#
 .MAC T_MARGIN END
-.    br
 .    nr #T_MARGIN (\\$1)
-.    nr #T_MARGIN_SET 1
+.    nr #TOP 1
 .    if !\\n[#DOCS] \{\
-.       PRINT \&
 .       sp |\\n[#T_MARGIN]u-1v
 .    \}
 .    wh 0i DO_T_MARGIN
@@ -301,7 +299,7 @@
 \#
 .MAC DO_T_MARGIN END
 .    ev T_MARGIN
-.    nr #T_MARGIN_SET 1
+.    nr #TOP 1
 .    sp |\\n[#T_MARGIN]u-1v
 .    ev
 .    sp -\\n[#T_MARGIN_LEAD_ADJ]u
@@ -555,40 +553,19 @@
 \#   Does not require unit of measure.  LS automatically turns off AUTOLEAD.
 \#
 .MAC LS END
-.    br
+.    nr #OLD_LEAD \\n(.v
 .    if \\n[#PRINT_STYLE]=1 \{ .return \}
 .    if \\n[#IGNORE]        \{ .return \}
-.    if \\n(nl=0 \{ .nr #TOP_LEAD 1 \}
 .    if \\n[#AUTO_LEAD] \{\
 .       rr #AUTO_LEAD
 .       rr #AUTOLEAD_FACTOR
 .    \}
-.    nr #OLD_LEAD \\n(.v
 .    vs \\$1
-.    nr #TOP_BASELINE_ADJ \\n(.v-\\n[#OLD_LEAD]
-.    if !\\n[#DOCS] \{\
-.       if \\n[#TOP_ALD]=1 \{\
-.          sp -\\n[#TOP_BASELINE_ADJ]u
-.          rr #TOP_ALD
-.       \}
-\# The following clause ensures that the first .LS call after a top
-\# margin has been set (.T_MARGIN or .PAGE) doesn't change the
-\# vertical position on the page
-.       if \\n[#T_MARGIN_SET]=1 \{\
-.          ie (\\n(nl >= \\n[#T_MARGIN]) \{\
-.             if \\n(.n=0 \{\
-'                sp -\\n[#TOP_BASELINE_ADJ]u
-.                rr #T_MARGIN_SET
-.             \}
-.          \}
-.          el \{\
-.             if !\\n[#TOP_LEAD]=0&\\n[#TOP_ALD]=0 \{ .nr #TOP_LEAD 1 \}
-.             vs 1u
-.             sp |\\n[#T_MARGIN]u
-.             wh \\n(nlu+1v RESET_LEAD
-.             rr #T_MARGIN_SET
-.          \}
-.       \}
+.    if \\n[#TOP] \{\
+.       nr #TOP_BASELINE_ADJ \\n(.v-\\n[#OLD_LEAD]
+.       sp -\\n[#TOP_BASELINE_ADJ]u
+.       rr #TOP
+.       rr #TOP_BASELINE_ADJ
 .    \}
 .END
 \#
@@ -627,30 +604,11 @@
 .    el \{\
 .       vs \\n[#PT_SIZE]u+\\n[#AUTOLEAD_VALUE]u
 .    \}
-.    nr #TOP_BASELINE_ADJ \\n(.v-\\n[#OLD_LEAD]
-.    if !\\n[#DOCS] \{\
-.       if \\n[#TOP_ALD]=1 \{\
-.          sp -\\n[#TOP_BASELINE_ADJ]u
-.          rr #TOP_ALD
-.       \}
-\# The following clause ensures that the first .LS call after a top
-\# margin has been set (.T_MARGIN or .PAGE) doesn't change the
-\# vertical position on the page
-.       if \\n[#T_MARGIN_SET]=1 \{\
-.          ie (\\n(nl >= \\n[#T_MARGIN]) \{\
-.             if \\n(.n=0 \{\
-'                sp -\\n[#TOP_BASELINE_ADJ]u
-.                rr #T_MARGIN_SET
-.             \}
-.          \}
-.          el \{\
-.             if !\\n[#TOP_LEAD]=0&\\n[#TOP_ALD]=0 \{ .nr #TOP_LEAD 1 \}
-.             vs 1u
-.             sp |\\n[#T_MARGIN]u
-.             wh \\n(nlu+1v RESET_LEAD
-.             rr #T_MARGIN_SET
-.          \}
-.       \}
+.    if \\n[#TOP] \{\
+.       nr #TOP_BASELINE_ADJ \\n(.v-\\n[#OLD_LEAD]
+.       sp -\\n[#TOP_BASELINE_ADJ]u
+.       rr #TOP
+.       rr #TOP_BASELINE_ADJ
 .    \}
 .END
 \#
@@ -1014,36 +972,21 @@
 \#   Requires a unit of measure.
 \#
 .MAC ALD END
-.    if \\n(nl=0 \{ .nr #TOP_ALD 1 \}
-.    if \\n(nl=\\n[#T_MARGIN] \{ .nr #TOP_LEAD 1 \}
-.    if !r#DOCS \{\
-.       if \\n[#TOP_LEAD]=1 \{\
-.          rr #TOP_ALD
-.          rr #TOP_LEAD
-.          RESET_LEAD
-.          RLD 1v
-.       \}
-.    \}
+.    if \\n(nl=0 \{ .nr #TOP 1 \}
 .    if '\\$0'ALD' \{\
 .       nr #ALD (\\$1)
-.       ie \\n(nl=\\n[#T_MARGIN] \{\
-.          ie !r#DOCS \{\
-.             PRINT \&
-.             sp \\n[#ALD]u-1v
-.          \}
-.          el \{ .sp \\n[#ALD]u \}
-.       \}
-.       el \{ .sp \\n[#ALD]u \}
+.       sp \\n[#ALD]u
+.    \}
+.    if '\\$0'ADD_SPACE' \{\
+.       nr #ALD (\\$1)
+.       rs
+.       sp \\n[#ALD]u
 .    \}
 .    if '\\$0'SPACE' \{\
-.       ie \\n(nl=\\n[#T_MARGIN] \{\
-.          ie !r#DOCS \{\
-.             PRINT \&
-.             sp \\$1-1v
-.          \}
-.          el \{ .sp \\n[#ALD]u \}
-.       \}
-.       el \{ .sp \\$1u \}
+.       sp \\$1u
+.    \}
+.    if '\\$0'SP' \{\
+.       sp \\$1u
 .    \}
 .END
 \#
@@ -1330,6 +1273,12 @@
 .    TRAP
 .END
 \#
+\# An inline escape to accomplish the same thing.  Actually
+\# preferable, since it works with filled and non-filled copy and
+\# doesn't require the user to remember to use (or not use) the \c.
+\#
+.ds B \h'|0'\c
+\#
 \# =====================================================================
 \#
 \# +++FILLING/QUADDING/JUSTIFYING+++
@@ -1644,7 +1593,12 @@
 .    nr #TAB_OFFSET (\\$2)
 .    nr #TAB_LENGTH (\\$3)
 .    MAC TAB\\n[#TAB_NUMBER] DONE \"Define TAB macro
-.        br
+.        if !\\\\n[#TB+]=1 \{ .br \}
+.        if \\\\n[#TB+]=1 \{\
+.           EL
+.           vpt 0
+.           rr #TB+
+.        \}
 .        in 0
 .        nr #TAB_ACTIVE 1
 .        nr #CURRENT_TAB \\n[#TAB_NUMBER]
@@ -1709,6 +1663,11 @@
 .    TAB\\n[#NEXT_TAB]
 .END
 \#
+\# An inline escape to accomplish the same thing.  Actually
+\# preferable, since it works with filled and non-filled copy and
+\# doesn't require the user to remember to use (or not use) the \c.
+\#
+.ds TB+ "\c\\R'#TB+ 1'\\R'#TN 1'\\R'#NEXT_TAB \\n[#CURRENT_TAB]+1'\\*[TAB\\n[#NEXT_TAB]]\c
 \#
 \# TAB QUIT
 \# --------
@@ -2414,7 +2373,7 @@
 .MAC PAD END
 .    if \\n(.u=1 \{ .nr #FILL_MODE 1 \}
 .    nf
-.    if !d$PAD_MARKER \{ .ds $PAD_MARKER # \}
+.    if !d$PAD_MARKER .ds $PAD_MARKER #
 .    char \\*[$PAD_MARKER] \R'#PAD_COUNT \En[#PAD_COUNT]+1'
 .    ds $FAMILY_FOR_PAD \\n[.fam]
 .    fp \\n[.fp] \\*[$FONT]
@@ -2456,6 +2415,11 @@
 .    rm $PAD_STRING
 .    rm PAD_STRING
 .    rchar #
+.    if '\\$2'NOBREAK' \{\
+.       TRAP OFF
+.       EOL
+.       TRAP
+.    \}
 .END
 \#
 \#
@@ -2692,6 +2656,7 @@
 \c
 .    EL
 .    if \\n(.u=1 \{\
+.       nr #FILL_WAS_ON 1
 .       ds $CURRENT_QUAD \\*[$QUAD_VALUE]
 .       nf
 .    \}
@@ -2699,15 +2664,19 @@
 .       nr #RESTORE_L_LENGTH \\n(.l
 .       if \\n[#INDENT_BOTH_ACTIVE] \{ .ll \\n(.lu-\\n[#BL_INDENT]u \}
 .       if \\n[#INDENT_LEFT_ACTIVE] \{ .ll \\n(.lu-\\n[#L_INDENT]u \}
-.       PRINT \El'\En(.lu'
+.       PRINT \El'\En(.lu'\c
 .       ll \\n[#RESTORE_L_LENGTH]u
 .       rr #RESTORE_L_LENGTH
 .    \}
 .    el \{\
-.       PRINT \El'\En(.lu'
+.       PRINT \El'\En(.lu'\c
+.    \}
+.    if r#FILL_WAS_ON \{\
+.       fi
+.       rr #FILL_WAS_ON
+.       QUAD \\*[$CURRENT_QUAD]
+.       rm $CURRENT_QUAD
 .    \}
-.    QUAD \\*[$CURRENT_QUAD]
-.    rm $CURRENT_QUAD
 .    EL
 .END
 \#
@@ -2735,8 +2704,8 @@
 .MAC WS END
 .    ds $WS_CONSTANT 12
 .    ds $WS_VAR \\$1
-.    ie '\\$1'DEFAULT' \{ .ds $WS_VAR +0 \}
-.    el                \{ .ds $WS (\\*[$WS_CONSTANT]\\*[$WS_VAR]) \}
+.    ie '\\$1'DEFAULT' .ds $WS_VAR +0
+.    el                .ds $WS (\\*[$WS_CONSTANT]\\*[$WS_VAR])
 .    ie \\n[.sss]=12   \{ .ss \\*[$WS] 12 \}
 .    el \{\
 .       ss \\*[$WS] (\\*[$WS]\\*[$SS_VAR])
@@ -3339,6 +3308,7 @@
 \#
 \# +++TYPESETTING ALIASES+++
 \#
+.ALIAS    ADD_SPACE       ALD
 .ALIAS    CENTRE          CENTER
 .ALIAS    COLOUR          COLOR
 .ALIAS    COMMENT         SILENT
@@ -3355,6 +3325,7 @@
 .ALIAS    LIG             LIGATURES
 .ALIAS    NEWCOLOUR       NEWCOLOR
 .ALIAS    PADMARKER       PAD_MARKER
+.ALIAS    SP              ALD
 .ALIAS    SPACE           ALD
 .ALIAS    TABSET          TAB_SET
 .ALIAS    TB              TAB
@@ -3491,6 +3462,7 @@
 .          UNDERLINE_QUOTES
 .          nr #IGNORE_COLUMNS 1
 .          char \(em --
+.          tr `'
 .       \}
 .       if '\\$1'TYPESET' \{\
 .          nr #PRINT_STYLE 2
@@ -3697,13 +3669,13 @@
 .                   ie !'\\*[$CHAPTER_TITLE]'' \{\
 .                      ds $HDRFTR_CENTER \\*[$CHAPTER_TITLE]
 .                   \}
-.                   el \{ .ds $HDRFTR_CENTER \\*[$CHAPTER_STRING] \}
+.                   el \{ .ds $HDRFTR_CENTER \\*[$CHAPTER_STRING]\}
 .                \}
 .                el \{\
 .                   ie !'\\*[$CHAPTER_TITLE]'' \{\
 .                      ds $HDRFTR_CENTER \\*[$CHAPTER_TITLE]
 .                   \}
-.                   el \{ .ds $HDRFTR_CENTER \\*[$CHAPTER_STRING] \\*[$CHAPTER] \}
+.                   el \{ .ds $HDRFTR_CENTER \\*[$CHAPTER_STRING] \\*[$CHAPTER]\}
 .                \}
 .             \}
 .             el \{\
@@ -4628,25 +4600,25 @@
 \# String defaults for both PRINTSTYLEs
 .    ie \\n[#DOC_TYPE]=1 \{\
 .       ie '\\*[$DOC_TITLE]'' \{\
-.          if \\n[#USER_DEF_HDRFTR_LEFT]=0   \{ .ds $HDRFTR_LEFT \\*[$AUTHOR_1] \}
+.          if \\n[#USER_DEF_HDRFTR_LEFT]=0   \{ .ds $HDRFTR_LEFT \\*[$AUTHOR_1]\}
 .          rr #USER_DEF_HDRFTR_LEFT
-.          if \\n[#USER_DEF_HDRFTR_RIGHT]=0  \{ .ds $HDRFTR_RIGHT \\*[$TITLE] \}
+.          if \\n[#USER_DEF_HDRFTR_RIGHT]=0  \{ .ds $HDRFTR_RIGHT \\*[$TITLE]\}
 .          rr #USER_DEF_HDRFTR_RIGHT
 .       \}
 .       el \{\
 .          if \\n[#COPY_STYLE]=1 \{ .DRAFT_WITH_PAGENUMBER \}
-.          if \\n[#USER_DEF_HDRFTR_LEFT]=0   \{ .ds $HDRFTR_LEFT \\*[$AUTHOR_1] \}
+.          if \\n[#USER_DEF_HDRFTR_LEFT]=0   \{ .ds $HDRFTR_LEFT \\*[$AUTHOR_1]\}
 .          rr #USER_DEF_HDRFTR_LEFT
-.          if \\n[#USER_DEF_HDRFTR_CENTER]=0 \{ .ds $HDRFTR_CENTER \\*[$TITLE] \}
+.          if \\n[#USER_DEF_HDRFTR_CENTER]=0 \{ .ds $HDRFTR_CENTER \\*[$TITLE]\}
 .          rr #USER_DEF_HDRFTR_CENTER
-.          if \\n[#USER_DEF_HDRFTR_RIGHT]=0  \{ .ds $HDRFTR_RIGHT \\*[$DOC_TITLE] \}
+.          if \\n[#USER_DEF_HDRFTR_RIGHT]=0  \{ .ds $HDRFTR_RIGHT \\*[$DOC_TITLE]\}
 .          rr #USER_DEF_HDRFTR_RIGHT
 .       \}
 .    \}
 .    el \{\
-.       if \\n[#USER_DEF_HDRFTR_LEFT]=0   \{ .ds $HDRFTR_LEFT \\*[$AUTHOR_1] \}
+.       if \\n[#USER_DEF_HDRFTR_LEFT]=0   \{ .ds $HDRFTR_LEFT \\*[$AUTHOR_1]\}
 .       rr #USER_DEF_HDRFTR_LEFT
-.       if \\n[#USER_DEF_HDRFTR_RIGHT]=0  \{ .ds $HDRFTR_RIGHT \\*[$TITLE] \}
+.       if \\n[#USER_DEF_HDRFTR_RIGHT]=0  \{ .ds $HDRFTR_RIGHT \\*[$TITLE]\}
 .       rr #USER_DEF_HDRFTR_RIGHT
 .    \}
 .    if !d$ATTRIBUTE_STRING           \{ .ATTRIBUTE_STRING "by"            \}
@@ -5244,8 +5216,8 @@
 \#
 \#
 .MAC COVERTITLE END
-.    ie '\\$0'DOC_COVERTITLE' \{ .ds $DOC_COVER_TITLE \\$1 \}
-.    el \{ .ds $COVER_TITLE \\$1 \}
+.    ie '\\$0'DOC_COVERTITLE' \{ .ds $DOC_COVER_TITLE \\$1\}
+.    el \{ .ds $COVER_TITLE \\$1\}
 .END
 \#
 \#
@@ -7737,7 +7709,7 @@
 \#   event that the user enters .TITLE in caps/lc), I've used
 \#   quad left, quad centre, and quad right to arrange the three bits
 \#   of the header, rather than .tl.  This allows the use of the CAPS macro.
-\#   The downside is that I have to add \\v'-(\\n[#LEAD]u*#) in order
+\#   The downside is that I have to add \\v'-(\\n[#LEAD]u*<n>) in order
 \#   for -Tlatin1 output to align the header/footer strings on the baseline.
 \#   The console output still isn't brilliant, but at least it's
 \#   comprehensible.
@@ -9153,9 +9125,20 @@
 .          if \\n[#PP_SPACE] \{\
 .             if \\n[#PRINT_STYLE]=2 \{\
 .                ie \\n[#END_QUOTE] \{\
+.                   ALD \\n[#DOC_LEAD]u
 .                   rr #END_QUOTE
+.                   nr #NO_SPACE 1
+.                   nr #BASELINE_MARK \\n(nl
+.                \}
+.                el \{\
+.                   if \\n[#NO_SPACE]=1 \{\
+.                      rr #NO_SPACE
+.                   \}
+.                   if !\\n(nl=\\n[#BASELINE_MARK] \{\
+.                      ALD \\n[#DOC_LEAD]u
+.                      rr #BASELINE_MARK
+.                   \}
 .                \}
-.                el \{ .ALD \\n[#DOC_LEAD]u \}
 .             \}
 .          \}
 .          ie \\n[#INDENT_ACTIVE] \{ .ti \\n[#INDENT]u+\\n[#PP_INDENT]u \}
@@ -11418,7 +11401,7 @@
 .       el \{ .nr #PAGINATE 0 \}
 .    \}
 .    if \\n[#FOOTERS_ON]=1 \{\
-.       if !'\\*[$HDRFTR_CENTER_OLD]'' \{ .ds $HDRFTR_CENTER \\*[$HDRFTR_CENTER_OLD] \}
+.       if !'\\*[$HDRFTR_CENTER_OLD]'' \{ .ds $HDRFTR_CENTER \\*[$HDRFTR_CENTER_OLD]\}
 .    \}
 .    NEWPAGE
 .    if \\n[#FOOTERS_ON]=1 \{\
@@ -11786,7 +11769,7 @@
 .       \}
 .    \}
 .    if \\n[#FOOTERS_ON]=1 \{\
-.       if !'\\*[$HDRFTR_CENTER_OLD]'' \{ .ds $HDRFTR_CENTER \\*[$HDRFTR_CENTER_OLD] \}
+.       if !'\\*[$HDRFTR_CENTER_OLD]'' \{ .ds $HDRFTR_CENTER \\*[$HDRFTR_CENTER_OLD]\}
 .       ie \\n[#PAGINATE_TOC]=1 \{ .PAGINATE \}
 .       el \{ .PAGINATION OFF \}
 .    \}
@@ -13208,6 +13191,10 @@
 .ALIAS   DO_DOC_COVER          DO_COVER
 .ALIAS   PRINT_FOOTNOTE_RULE   FOOTNOTE_RULE
 \#
+\# Miscellaneous aliases
+.ALIAS  SECTION       LINEBREAK
+.ALIAS  SECTION_CHAR  LINEBREAK_CHAR
+\#
 \# Miscellaneous macros to take care of backward compatibility
 \# -----------------------------------------------------------
 \#



From MAILER-DAEMON Tue Jan 25 16:02:33 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1CtXpZ-0000pb-BU
	for mharc-groff-commit@gnu.org; Tue, 25 Jan 2005 16:02:33 -0500
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1CtXpY-0000o6-3K
	for groff-commit@gnu.org; Tue, 25 Jan 2005 16:02:32 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1CtXnI-0008FG-S6
	for groff-commit@gnu.org; Tue, 25 Jan 2005 16:00:19 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1CtXnB-0008DG-Sl
	for groff-commit@gnu.org; Tue, 25 Jan 2005 16:00:05 -0500
Received: from [199.232.41.4] (helo=savannah)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1CtXT2-000303-Ks
	for groff-commit@gnu.org; Tue, 25 Jan 2005 15:39:16 -0500
Received: from savannah ([127.0.0.1])
	by savannah with smtp (Exim 3.35 #1 (Debian)) id 1CtXT1-0003S7-00
	for <groff-commit@gnu.org>; Tue, 25 Jan 2005 15:39:15 -0500
To: groff-commit@gnu.org
From: Werner LEMBERG <wl@gnu.org>
Message-Id: <E1CtXT1-0003S7-00@savannah>
Date: Tue, 25 Jan 2005 15:39:15 -0500
Subject: [Groff-commit] groff ./ChangeLog src/roff/nroff/nroff.sh
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: groff-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Jan 2005 21:02:32 -0000

CVSROOT:	/cvsroot/groff
Module name:	groff
Branch: 	
Changes by:	Werner LEMBERG <wl@savannah.gnu.org>	05/01/25 20:39:15

Modified files:
	.              : ChangeLog 
	src/roff/nroff : nroff.sh 

Log message:
	* src/roff/nroff/nroff.sh: Handle `*.ISO8859-1' in locale.  From
	NetBSD bin/29114.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.780&tr2=1.781&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/roff/nroff/nroff.sh.diff?tr1=1.15&tr2=1.16&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.780 groff/ChangeLog:1.781
--- groff/ChangeLog:1.780	Mon Jan 24 08:26:19 2005
+++ groff/ChangeLog	Tue Jan 25 20:39:14 2005
@@ -1,3 +1,8 @@
+2005-01-25  Werner LEMBERG  <wl@gnu.org>
+
+	* src/roff/nroff/nroff.sh: Handle `*.ISO8859-1' in locale.  From
+	NetBSD bin/29114.
+
 2005-01-22  Ruslan Ermilov  <ru@FreeBSD.org>
 
 	* tmac/doc.tmac (Sm): Improved.  It didn't work properly in many
@@ -12,7 +17,7 @@
 
 	* src/libs/libdriver/input.cpp (delete_current_env, do_file):
 	Reset pointers to zero after deallocation.  This fixes a crash
-	if a driver is called with multiple output files.  Reported by
+	if a driver is called with multiple input files.  Reported by
 	Ken Chilton <ken@chiltonfamily.org>.
 
 	* src/devices/grops/grops.man: Add more info on DSC.
Index: groff/src/roff/nroff/nroff.sh
diff -u groff/src/roff/nroff/nroff.sh:1.15 groff/src/roff/nroff/nroff.sh:1.16
--- groff/src/roff/nroff/nroff.sh:1.15	Wed Apr  7 17:46:00 2004
+++ groff/src/roff/nroff/nroff.sh	Tue Jan 25 20:39:15 2005
@@ -16,7 +16,7 @@
     case "${LC_ALL-${LC_CTYPE-${LANG}}}" in
       *.UTF-8)
         T=-Tutf8 ;;
-      iso_8859_1 | *.ISO-8859-1)
+      iso_8859_1 | *.ISO-8859-1 | *.ISO8859-1)
         T=-Tlatin1 ;;
       *.IBM-1047)
         T=-Tcp1047 ;;



