From MAILER-DAEMON Wed Oct 04 17:24:54 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1dzr9y-0001Qt-Bc
	for mharc-groff-commit@gnu.org; Wed, 04 Oct 2017 17:24:54 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:54521)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bertrand.garrigues@laposte.net>) id 1dzr9w-0001Qd-RY
	for groff-commit@gnu.org; Wed, 04 Oct 2017 17:24:53 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <bertrand.garrigues@laposte.net>) id 1dzr9v-0006xQ-Ue
	for groff-commit@gnu.org; Wed, 04 Oct 2017 17:24:52 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:45449)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bertrand.garrigues@laposte.net>) id 1dzr9v-0006x9-RP
	for groff-commit@gnu.org; Wed, 04 Oct 2017 17:24:51 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 132203)
	id A0907200D7; Wed,  4 Oct 2017 17:24:51 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 02/03: Update `gnulib' submodule with latest version.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: Bertrand Garrigues <bertrand.garrigues@laposte.net>
In-Reply-To: groff@gnu.org
References: <20171004212450.25661.32465@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 50f924741b8031856fe6194c61ed65eb679fad19
Auto-Submitted: auto-generated
Message-Id: <20171004212451.A0907200D7@vcs0.savannah.gnu.org>
Date: Wed,  4 Oct 2017 17:24:51 -0400 (EDT)
From: bertrand.garrigues@laposte.net (Bertrand Garrigues)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit/>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Oct 2017 21:24:53 -0000

bgarrigues pushed a commit to branch master
in repository groff.

commit 50f924741b8031856fe6194c61ed65eb679fad19
Author: Bertrand Garrigues <bertrand.garrigues@laposte.net>
Date:   Sun Sep 3 00:10:04 2017 +0200

    Update `gnulib' submodule with latest version.
   =20
    * gnulib: now points on e70694158bc1da629241f24757076278aa60a356
    from `gnulib' repository.
---
 ChangeLog | 7 +++++++
 gnulib    | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e82af30..9ab4273 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,13 @@
=20
 2017-09-02  Bertrand Garrigues <bertrand.garrigues@laposte.net>
=20
+	Update `gnulib' submodule with latest version.
+
+	* gnulib: now points on 07a187be7f66d3ced66587405f18205971c762e9
+	from `gnulib' repository.
+
+2017-09-02  Bertrand Garrigues <bertrand.garrigues@laposte.net>
+
 	Fix .gitignore files for in-source build.
=20
 	Fix bug https://savannah.gnu.org/bugs/?51415.
diff --git a/gnulib b/gnulib
index 4084b3a..e706941 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 4084b3a1094372b960ce4a97634e08f4538c8bdd
+Subproject commit e70694158bc1da629241f24757076278aa60a356


From MAILER-DAEMON Wed Oct 04 17:24:56 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1dzrA0-0001SB-7u
	for mharc-groff-commit@gnu.org; Wed, 04 Oct 2017 17:24:56 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:54525)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bertrand.garrigues@laposte.net>) id 1dzr9x-0001Qf-2P
	for groff-commit@gnu.org; Wed, 04 Oct 2017 17:24:54 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <bertrand.garrigues@laposte.net>) id 1dzr9v-0006xf-WC
	for groff-commit@gnu.org; Wed, 04 Oct 2017 17:24:53 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:45452)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bertrand.garrigues@laposte.net>) id 1dzr9v-0006xM-U6
	for groff-commit@gnu.org; Wed, 04 Oct 2017 17:24:51 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 132203)
	id CECA02041C; Wed,  4 Oct 2017 17:24:51 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 03/03: Fix build on MacOS X
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: Bertrand Garrigues <bertrand.garrigues@laposte.net>
In-Reply-To: groff@gnu.org
References: <20171004212450.25661.32465@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 33bb99f90546ad15d8212a413b1e5651fdacf0d0
Auto-Submitted: auto-generated
Message-Id: <20171004212451.CECA02041C@vcs0.savannah.gnu.org>
Date: Wed,  4 Oct 2017 17:24:51 -0400 (EDT)
From: bertrand.garrigues@laposte.net (Bertrand Garrigues)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit/>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Oct 2017 21:24:54 -0000

bgarrigues pushed a commit to branch master
in repository groff.

commit 33bb99f90546ad15d8212a413b1e5651fdacf0d0
Author: Bertrand Garrigues <bertrand.garrigues@laposte.net>
Date:   Wed Oct 4 23:23:39 2017 +0200

    Fix build on MacOS X
   =20
    See https://savannah.gnu.org/bugs/?49651
---
 ChangeLog |  6 ++++++
 bootstrap | 15 ++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 9ab4273..c668811 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-10-04  Bertrand Garrigues <bertrand.garrigues@laposte.net>
+
+	Fix build on MacOS X
+
+	See https://savannah.gnu.org/bugs/?49651
+
 2017-09-11  Bertrand Garrigues <bertrand.garrigues@laposte.net>
=20
 	Build from git: Make `configure' fail if `yacc' is not found.
diff --git a/bootstrap b/bootstrap
index 932ff85..d188412 100755
--- a/bootstrap
+++ b/bootstrap
@@ -450,7 +450,20 @@ check_versions() {
   while read app req_ver; do
     # We only need libtoolize from the libtool package.
     if test "$app" =3D libtool; then
-      app=3Dlibtoolize
+      case `uname` in
+      Darwin*)
+        # on MacOS X systems. GNU libtool conflicts with the Xcode
+        # libtool, and 'libtoolize' is often installed as
+        # 'glibtoolize'.
+        if check_exists libtoolize; then
+          app=3Dlibtoolize
+        elif check_exists glibtoolize; then
+          app=3Dglibtoolize
+        else
+          die 'cannot find libtoolize or glibtoolize'
+        fi;;
+      *) app=3Dlibtoolize;;
+      esac
     fi
     # Exempt git if --no-git is in effect.
     if test "$app" =3D git; then


From MAILER-DAEMON Wed Oct 04 17:24:55 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1dzr9z-0001RO-4d
	for mharc-groff-commit@gnu.org; Wed, 04 Oct 2017 17:24:55 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:54523)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bertrand.garrigues@laposte.net>) id 1dzr9w-0001Qe-V8
	for groff-commit@gnu.org; Wed, 04 Oct 2017 17:24:53 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <bertrand.garrigues@laposte.net>) id 1dzr9v-0006xR-V5
	for groff-commit@gnu.org; Wed, 04 Oct 2017 17:24:52 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:45447)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bertrand.garrigues@laposte.net>) id 1dzr9v-0006x8-RI
	for groff-commit@gnu.org; Wed, 04 Oct 2017 17:24:51 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 132203)
	id 7A92D20416; Wed,  4 Oct 2017 17:24:51 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/03: Build from git: Make `configure' fail if `yacc' is
	not found.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: Bertrand Garrigues <bertrand.garrigues@laposte.net>
In-Reply-To: groff@gnu.org
References: <20171004212450.25661.32465@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 554a95f1976f3f795653d333c7558bbcae4a69d2
Auto-Submitted: auto-generated
Message-Id: <20171004212451.7A92D20416@vcs0.savannah.gnu.org>
Date: Wed,  4 Oct 2017 17:24:51 -0400 (EDT)
From: bertrand.garrigues@laposte.net (Bertrand Garrigues)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit/>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Oct 2017 21:24:53 -0000

bgarrigues pushed a commit to branch master
in repository groff.

commit 554a95f1976f3f795653d333c7558bbcae4a69d2
Author: Bertrand Garrigues <bertrand.garrigues@laposte.net>
Date:   Tue Sep 12 00:49:23 2017 +0200

    Build from git: Make `configure' fail if `yacc' is not found.
   =20
    * m4/groff.m4 (GROFF_PROG_YACC): look for (in this order) `byacc',
    `bison -y', `yacc'.  Set `YACC' to `missing' is nothing is found
    and generate an error.  Don't generate an error if build is not
    done from git as tarball already distribute files generated by
    `yacc'.
---
 ChangeLog   | 10 ++++++++++
 m4/groff.m4 | 13 ++++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 696e977..e82af30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2017-09-11  Bertrand Garrigues <bertrand.garrigues@laposte.net>
+
+	Build from git: Make `configure' fail if `yacc' is not found.
+
+	* m4/groff.m4 (GROFF_PROG_YACC): look for (in this order) `byacc',
+	`bison -y', `yacc'.  Set `YACC' to `missing' is nothing is found
+	and generate an error.  Don't generate an error if build is not
+	done from git as tarball already distribute files generated by
+	`yacc'.
+
 2017-09-02  Bertrand Garrigues <bertrand.garrigues@laposte.net>
=20
 	Fix .gitignore files for in-source build.
diff --git a/m4/groff.m4 b/m4/groff.m4
index 1f41649..062573b 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -49,11 +49,18 @@ AC_DEFUN([GROFF_PRINT],
    AC_SUBST([DVIPRINT])
    AC_MSG_RESULT([$DVIPRINT])])
=20
-# Bison generated parsers have problems with C++ compilers other than g+=
+.
-# So byacc is preferred over bison.
+
+# Bison generated parsers have problems with C++ compilers other than
+# g++.  So byacc is preferred over bison.  If no 'yacc' program is
+# available, we issue an error only if building from the source as in
+# distributed tarball files generated by 'yacc' are already present.
=20
 AC_DEFUN([GROFF_PROG_YACC],
-  [AC_CHECK_PROGS([YACC], [byacc 'bison -y'], [yacc])])
+  [AC_CHECK_PROGS([YACC], [byacc 'bison -y' yacc], [missing])
+  if test "x$YACC" =3D "xmissing" -a -d ${srcdir}/.git; then
+    AC_MSG_ERROR([Could not find 'yacc' or 'bison'], 1)
+  fi
+  ])
=20
=20
 # We need Perl 5.6.1 or newer.


From MAILER-DAEMON Tue Oct 17 09:11:43 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1e4Rep-0004pR-J2
	for mharc-groff-commit@gnu.org; Tue, 17 Oct 2017 09:11:43 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:34202)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <deri@chuzzlewit.myzen.co.uk>) id 1e4Reg-0004jC-Hj
	for groff-commit@gnu.org; Tue, 17 Oct 2017 09:11:42 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <deri@chuzzlewit.myzen.co.uk>) id 1e4Ree-0006Lq-Gf
	for groff-commit@gnu.org; Tue, 17 Oct 2017 09:11:34 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:36096)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <deri@chuzzlewit.myzen.co.uk>) id 1e4Ree-0006LO-E3
	for groff-commit@gnu.org; Tue, 17 Oct 2017 09:11:32 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 126928)
	id 0987B20417; Tue, 17 Oct 2017 09:11:31 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/01: Make gropdf reallocate unused character codes
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: Deri James <deri@chuzzlewit.myzen.co.uk>
In-Reply-To: groff@gnu.org
References: <20171017131131.25990.40824@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/gropdfmultiglyph
X-Git-Reftype: branch
X-Git-Rev: 919396ef40ca277b79b0c791e71d73b45d079167
Auto-Submitted: auto-generated
Message-Id: <20171017131132.0987B20417@vcs0.savannah.gnu.org>
Date: Tue, 17 Oct 2017 09:11:31 -0400 (EDT)
From: deri@chuzzlewit.myzen.co.uk (Deri James)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit/>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Oct 2017 13:11:42 -0000

deri pushed a commit to branch gropdfmultiglyph
in repository groff.

commit 919396ef40ca277b79b0c791e71d73b45d079167
Author: Deri James <deri@chuzzlewit.myzen.co.uk>
Date:   Tue Oct 17 14:05:07 2017 +0100

    Make gropdf reallocate unused character codes
   =20
    	* src/devices/gropdf/gropdf.pl: Allow gropdf to reallocate
    	  character codes which  are unused to point to glyphs in
    	  positions above 255 which are used.
---
 src/devices/gropdf/gropdf.pl | 190 +++++++++++++++++++++++++++++--------=
------
 1 file changed, 131 insertions(+), 59 deletions(-)

diff --git a/src/devices/gropdf/gropdf.pl b/src/devices/gropdf/gropdf.pl
index de357c0..4ce4a38 100644
--- a/src/devices/gropdf/gropdf.pl
+++ b/src/devices/gropdf/gropdf.pl
@@ -23,6 +23,15 @@
 use strict;
 use Getopt::Long qw(:config bundling);
=20
+use constant
+{
+    WIDTH		=3D> 0,
+    CHRCODE		=3D> 1,
+    PSNAME		=3D> 2,
+    ASSIGNED		=3D> 3,
+    USED		=3D> 4,
+};
+
 my $gotzlib=3D0;
=20
 my $rc =3D eval
@@ -184,7 +193,7 @@ my @idirs;
=20
 #Load_Config();
=20
-GetOptions("F=3Ds" =3D> \$fd, 'I=3Ds' =3D> \@idirs, 'l' =3D> \$frot, 'p=3D=
s' =3D> \$fpsz, 'd!' =3D> \$debug, 'v' =3D> \$version, 'e' =3D> \$embedal=
l, 'y=3Ds' =3D> \$Foundry, 's' =3D> \$stats, 'u:s' =3D> \$unicodemap);
+GetOptions("F=3Ds" =3D> \$fd, 'I=3Ds' =3D> \@idirs, 'l' =3D> \$frot, 'p=3D=
s' =3D> \$fpsz, 'd!' =3D> \$debug, 'v' =3D> \$version, 'version' =3D> \$v=
ersion, 'e' =3D> \$embedall, 'y=3Ds' =3D> \$Foundry, 's' =3D> \$stats, 'u=
:s' =3D> \$unicodemap);
=20
 unshift(@idirs,'.');
=20
@@ -339,13 +348,24 @@ PutObj($objct);
 foreach my $fontno (keys %fontlst)
 {
     my $o=3D$fontlst{$fontno}->{FNT};
+
+    foreach my $ch (@{$o->{NO}})
+    {
+	my $psname=3D$o->{NAM}->{$ch->[1]}->[PSNAME] || '/.notdef';
+	my $wid=3D$o->{NAM}->{$ch->[1]}->[WIDTH] || 0;
+
+	push(@{$o->{DIFF}},$psname);
+	push(@{$o->{WIDTH}},$wid);
+	last if $#{$o->{DIFF}} >=3D 255;
+    }
+    unshift(@{$o->{DIFF}},0);
     my $p=3DGetObj($fontlst{$fontno}->{OBJ});
=20
     if (exists($p->{LastChar}) and $p->{LastChar} > 255)
     {
 	$p->{LastChar} =3D 255;
-	splice(@{$o->{GNO}},256);
-	splice(@{$o->{WID}},256);
+	splice(@{$o->{DIFF}},256);
+	splice(@{$o->{WIDTH}},256);
     }
 }
=20
@@ -2043,6 +2063,7 @@ sub LoadFont
     my @fntbbox=3D(0,0,0,0);
     my $capheight=3D0;
     my $lastchr=3D0;
+    my $lastnm;
     my $t1flags=3D0;
     my $fixwid=3D-1;
     my $ascent=3D0;
@@ -2071,7 +2092,7 @@ sub LoadFont
 	    $stg=3D3,next if lc($_) eq 'charset';
=20
 	    my ($ch1,$ch2,$k)=3Dsplit;
-	    $fnt{KERN}->{$ch1}->{$ch2}=3D$k;
+# 	    $fnt{KERN}->{$ch1}->{$ch2}=3D$k;
 	}
 	else
 	{
@@ -2080,15 +2101,16 @@ sub LoadFont
=20
 	    if ($r[1] eq '"')
 	    {
-		$fnt{GNM}->{$r[0]}=3D$lastchr;
+		$fnt{NAM}->{$r[0]}=3D$fnt{NAM}->{$lastnm};
 		next;
 	    }
=20
 	    $r[0]=3D'u0020' if $r[3] =3D=3D 32;
+	    $r[0]=3D"u00".hex($r[3]) if $r[0] eq '---';
 #	    next if $r[3] >255;
-	    $fnt{GNM}->{$r[0]}=3D$r[3];
-	    $fnt{GNO}->[$r[3]]=3D'/'.$r[4];
-	    $fnt{WID}->[$r[3]]=3D$p[0];
+	    $fnt{NAM}->{$r[0]}=3D[$p[0],$r[3],'/'.$r[4],$r[3],0];
+	    $fnt{NO}->[$r[3]]=3D[$r[0],$r[0]];
+	    $lastnm=3D$r[0];
 	    $lastchr=3D$r[3] if $r[3] > $lastchr;
 	    $fixwid=3D$p[0] if $fixwid =3D=3D -1;
 	    $fixwid=3D-2 if $fixwid > 0 and $p[0] !=3D $fixwid;
@@ -2104,20 +2126,16 @@ sub LoadFont
=20
     close($f);
=20
-    unshift(@{$fnt{GNO}},0);
-
-    foreach my $glyph (@{$fnt{GNO}})
-    {
-	$glyph=3D'/.notdef' if !defined($glyph);
-    }
-
-    foreach my $w (@{$fnt{WID}})
+    foreach my $j (0..$lastchr)
     {
-	$w=3D0 if !defined($w);
+	$fnt{NO}->[$j]=3D['',''] if !defined($fnt{NO}->[$j]);
     }
=20
     my $fno=3D0;
     my $slant=3D0;
+    $fnt{DIFF}=3D[];
+    $fnt{WIDTH}=3D[];
+    $fnt{NAM}->{''}=3D[0,-1,'/.notdef',-1,0];
     $slant=3D-$fnt{'slant'} if exists($fnt{'slant'});
     $fnt{'spacewidth'}=3D700 if !exists($fnt{'spacewidth'});
=20
@@ -2136,12 +2154,12 @@ sub LoadFont
 			{'Type' =3D> '/Font',
 			'Subtype' =3D> '/Type1',
 			'BaseFont' =3D> '/'.$fnt{internalname},
-			'Widths' =3D> $fnt{WID},
+			'Widths' =3D> $fnt{WIDTH},
 			'FirstChar' =3D> 0,
 			'LastChar' =3D> $lastchr,
 			'Encoding' =3D> BuildObj($objct+1,
 				    {'Type' =3D> '/Encoding',
-				    'Differences' =3D> $fnt{GNO}
+				    'Differences' =3D> $fnt{DIFF}
 				    }
 				    ),
 			'FontDescriptor' =3D> BuildObj($objct+2,
@@ -2154,7 +2172,7 @@ sub LoadFont
 					'Descent' =3D> $fntbbox[1],
 					'CapHeight' =3D> $capheight,
 					'StemV' =3D> 0,
-					'CharSet' =3D> "($charset)",
+#					'CharSet' =3D> "($charset)",
 					'FontFile' =3D> BuildObj($objct+3,
 						    {'Length1' =3D> $l1,
 						    'Length2' =3D> $l2,
@@ -2180,12 +2198,12 @@ sub LoadFont
 			{'Type' =3D> '/Font',
 			'Subtype' =3D> '/Type1',
 			'BaseFont' =3D> '/'.$fnt{internalname},
-			'Widths' =3D> $fnt{WID},
+			'Widths' =3D> $fnt{WIDTH},
 			'FirstChar' =3D> 0,
 			'LastChar' =3D> $lastchr,
 			'Encoding' =3D> BuildObj($objct+1,
 				    {'Type' =3D> '/Encoding',
-				    'Differences' =3D> $fnt{GNO}
+				    'Differences' =3D> $fnt{DIFF}
 				    }
 				    ),
 			'FontDescriptor' =3D> BuildObj($objct+2,
@@ -2389,14 +2407,21 @@ sub do_p
 sub do_f
 {
     my $par=3Dshift;
+    my $fnt=3D$fontlst{$par}->{FNT};
=20
 #	IsText();
     $cft=3D"$par";
     $fontchg=3D1;
 #	$stream.=3D"/F$cft $cftsz Tf\n" if $cftsz;
     $widtbl=3DCacheWid($par);
-    $origwidtbl=3D$fontlst{$par}->{FNT}->{WID};
-    $krntbl=3D$fontlst{$par}->{FNT}->{KERN};
+    $origwidtbl=3D[];
+
+    foreach my $w (@{$fnt->{NO}})
+    {
+	push(@{$origwidtbl},$fnt->{NAM}->{$w->[1]}->[WIDTH]);
+    }
+
+#     $krntbl=3D$fnt->{KERN};
 }
=20
 sub CacheWid
@@ -2405,7 +2430,7 @@ sub CacheWid
=20
     if (!defined($fontlst{$par}->{CACHE}->{$cftsz}))
     {
-	$fontlst{$par}->{CACHE}->{$cftsz}=3DBuildCache($fontlst{$par}->{FNT}->{=
WID});
+	$fontlst{$par}->{CACHE}->{$cftsz}=3DBuildCache($fontlst{$par}->{FNT});
     }
=20
     return($fontlst{$par}->{CACHE}->{$cftsz});
@@ -2413,13 +2438,15 @@ sub CacheWid
=20
 sub BuildCache
 {
-    my $wid=3Dshift;
-    return([]);
+    my $fnt=3Dshift;
     my @cwid;
+    $origwidtbl=3D[];
=20
-    foreach my $w (@{$wid})
+    foreach my $w (@{$fnt->{NO}})
     {
-	push(@cwid,$w*$cftsz);
+	my $wid=3D(defined($w) and defined($w->[1]))?$fnt->{NAM}->{$w->[1]}->[W=
IDTH]:0;
+	push(@cwid,$wid*$cftsz);
+	push(@{$origwidtbl},$wid);
     }
=20
     return(\@cwid);
@@ -3090,9 +3117,9 @@ sub do_v
 sub TextWid
 {
     my $txt=3Dshift;
+    my $fnt=3Dshift;
     my $w=3D0;
     my $ck=3D0;
-    $txt=3D~s/^!\|!\|(\d\d\d)/chr($1)/e;
=20
     foreach my $c (split('',$txt))
     {
@@ -3109,6 +3136,7 @@ sub TextWid
 sub do_t
 {
     my $par=3Dshift;
+    my $fnt=3D$fontlst{$cft}->{FNT};
=20
     if ($kernadjust !=3D $curkern)
     {
@@ -3117,9 +3145,44 @@ sub do_t
 	$curkern=3D$kernadjust;
     }
=20
-    my $wid=3DTextWid($par);
+    my $par2=3D$par;
+    $par2=3D~s/^!\|!\|(\d\d\d)/chr(oct($1))/e;
+
+    foreach my $j (0..length($par2)-1)
+    {
+	my $cn=3Dord(substr($par2,$j,1));
+	my $chnm=3D$fnt->{NAM}->{$fnt->{NO}->[$cn]->[1]};
+
+	if ($chnm->[USED]=3D=3D0)
+	{
+	    $chnm->[USED]=3D1;
+	}
+	elsif ($fnt->{NO}->[$cn]->[0] ne $fnt->{NO}->[$cn]->[1])
+	{
+	    # A glyph has already been remapped to this char, so find a spare
+
+	    my $cn2=3DRemapChr($cn,$fnt,$fnt->{NO}->[$cn]->[0]);
+	    $stream.=3D"% MMM Remap $cn to $cn2\n" if $debug;
+
+	    if ($cn2)
+	    {
+		substr($par2,$j,1)=3Dchr($cn2);
+
+		if ($par=3D~m/^!\|!\|(\d\d\d)/)
+		{
+		    substr($par,4,3)=3Dsprintf("%03o",$cn2);
+		}
+		else
+		{
+		    substr($par,$j,1)=3Dchr($cn2);
+		}
+	    }
+	}
+    }
+    my $wid=3DTextWid($par2,$fnt);
+
+    $par=3Dreverse(split('',$par)) if $xrev and $par!~m/^!\|!\|(\d\d\d)/=
;
=20
-    $par=3Dreverse(split('',$par)) if $xrev;
     if ($n_flg and defined($mark))
     {
 	$mark->{ypos}=3D$ypos;
@@ -3242,12 +3305,11 @@ sub do_H
 sub do_C
 {
     my $par=3Dshift;
-    my $nm;
=20
-    ($par,$nm)=3DFindChar($par);
+    my ($par2,$nm)=3DFindChar($par);
=20
-    do_t($par);
-    $nomove=3D$nm;
+    do_t($par2);
+    $nomove=3D$fontlst{$cft}->{FNT}->{NAM}->{$par}->[WIDTH]*$cftsz ;
 }
=20
 sub FindChar
@@ -3255,12 +3317,13 @@ sub FindChar
     my $chnm=3Dshift;
     my $fnt=3D$fontlst{$cft}->{FNT};
=20
-    if (exists($fnt->{GNM}->{$chnm}))
+    if (exists($fnt->{NAM}->{$chnm}))
     {
-	my $ch=3D$fnt->{GNM}->{$chnm};
+	my $ch=3D$fnt->{NAM}->{$chnm}->[ASSIGNED];
 	$ch=3DRemapChr($ch,$fnt,$chnm) if ($ch > 255);
+	$fnt->{NAM}->{$chnm}->[USED]=3D0 if $fnt->{NO}->[$ch]->[1] eq $chnm;
=20
-	return(($ch<32)?sprintf("!|!|%03o",$ch):chr($ch),$fnt->{WID}->[$ch]*$cf=
tsz);
+	return(($ch<32)?sprintf("!|!|%03o",$ch):chr($ch),$widtbl->[$ch]);
     }
     else
     {
@@ -3275,17 +3338,33 @@ sub RemapChr
     my $chnm=3Dshift;
     my $unused=3D0;
=20
-    foreach my $un (2..$#{$fnt->{GNO}})
+    foreach my $un (0..$#{$fnt->{NO}})
+    {
+	next if $un >=3D 139 and $un <=3D 144;
+	$unused=3D$un,last if $fnt->{NO}->[$un]->[1] eq '';
+    }
+
+    if (!$unused)
     {
-	$unused=3D$un,last if $fnt->{GNO}->[$un] eq '/.notdef' and $un ne 14;
+	foreach my $un (128..255)
+	{
+	    next if $un >=3D 139 and $un <=3D 144;
+	    my $glyph=3D$fnt->{NO}->[$un]->[1];
+	    $unused=3D$un,last if $fnt->{NAM}->{$glyph}->[USED] =3D=3D 0;
+	}
     }
=20
-    if (--$unused <=3D 255)
+    if ($unused && $unused <=3D 255)
     {
-	$fnt->{GNM}->{$chnm}=3D$unused++;
-	$fnt->{GNO}->[$unused]=3D$fnt->{GNO}->[$ch+1];
-	$fnt->{WID}->[$unused]=3D$fnt->{WID}->[$ch];
-	$ch=3D$unused-1;
+	my $glyph=3D$fnt->{NO}->[$unused]->[1];
+	delete($fontlst{$cft}->{CACHE}->{$cftsz});
+	$fnt->{NAM}->{$chnm}->[ASSIGNED]=3D$unused;
+	$fnt->{NO}->[$unused]->[1]=3D$chnm;
+	$widtbl=3DCacheWid($cft);
+
+	$stream.=3D"% AAA Assign $chnm ($ch) to $unused\n" if $debug;
+
+	$ch=3D$unused;
 	return($ch);
     }
     else
@@ -3303,28 +3382,21 @@ sub do_c
     $par=3Dsubstr($par,0,1);
     my $ch=3Dord($par);
     do_N($ch);
-    $nomove=3D$fontlst{$cft}->{FNT}->{WID}->[$ch]*$cftsz;
 }
=20
 sub do_N
 {
     my $par=3Dshift;
+    my $fnt=3D$fontlst{$cft}->{FNT};
=20
-    if ($par > 255)
+    if (!defined($fnt->{NO}->[$par]))
     {
-	my $fnt=3D$fontlst{$cft}->{FNT};
-	my $chnm=3D'';
-
-	foreach my $c (keys %{$fnt->{GNM}})
-	{
-	    $chnm=3D$c,last if $fnt->{GNM}->{$c} =3D=3D $par;
-	}
-
-	$par=3DRemapChr($par,$fnt,$chnm);
+	Msg(0,"No chr($par) in font $fnt->{internalname}");
+	return;
     }
=20
-    do_t(chr($par));
-    $nomove=3D$fontlst{$cft}->{FNT}->{WID}->[$par]*$cftsz;
+    my $chnm=3D$fnt->{NO}->[$par]->[0];
+    do_C($chnm);
 }
=20
 sub do_n


From MAILER-DAEMON Sun Oct 22 02:56:41 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1e6ABd-0007MK-IX
	for mharc-groff-commit@gnu.org; Sun, 22 Oct 2017 02:56:41 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:46310)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6ABZ-0007Gd-8D
	for groff-commit@gnu.org; Sun, 22 Oct 2017 02:56:38 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6ABY-0002kG-Bf
	for groff-commit@gnu.org; Sun, 22 Oct 2017 02:56:37 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:46451)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6ABY-0002k6-8U
	for groff-commit@gnu.org; Sun, 22 Oct 2017 02:56:36 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id D059B201F7; Sun, 22 Oct 2017 02:56:35 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/01: Divert would-be diversion users to groff_tmac(5).
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: "G. Branden Robinson" <g.branden.robinson@gmail.com>
In-Reply-To: groff@gnu.org
References: <20171022065635.16749.35915@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: fd5e01280330c0965b8f2fa8f6a58adbfd85089e
Auto-Submitted: auto-generated
Message-Id: <20171022065635.D059B201F7@vcs0.savannah.gnu.org>
Date: Sun, 22 Oct 2017 02:56:35 -0400 (EDT)
From: g.branden.robinson@gmail.com (G. Branden Robinson)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit/>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Oct 2017 06:56:38 -0000

gbranden pushed a commit to branch master
in repository groff.

commit fd5e01280330c0965b8f2fa8f6a58adbfd85089e
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Sun Oct 22 02:55:05 2017 -0400

    Divert would-be diversion users to groff_tmac(5).
   =20
    An explanation how to write a diversion that works is lacking in the
    manual pages, except in groff_tmac(5).
   =20
    Signed-off-by: Bjarni Ingi Gislason <bjarniig@rhi.hi.is>
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 man/groff.7.man | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/man/groff.7.man b/man/groff.7.man
index 2e9c581..96f8978 100644
--- a/man/groff.7.man
+++ b/man/groff.7.man
@@ -539,6 +539,9 @@ Moreover, there are some advanced roff elements.
 A
 .B diversion
 stores (formatted) information into a macro for later usage.
+See
+.BR groff_tmac (@MAN5EXT@)
+for more details.
 .
 A
 .B trap
@@ -1530,6 +1533,9 @@ End current diversion.
 .REQ .di "macro"
 Divert to
 .IR macro .
+See
+.BR groff_tmac (@MAN5EXT@)
+for more details.
 .
 .TPx
 .REQ .do "name"
@@ -4569,6 +4575,12 @@ the predefined groff special characters (glyphs).
 the specification of fonts and the DESC file.
 .
 .TP
+.BR groff_tmac (@MAN5EXT@)
+contains an overview of available groff macro packages, instructions on
+how to interface them with a document, guidance on writing macro
+packages and using diversions, and historical information on macro
+package naming conventions.
+.TP
 .BR roff (@MAN7EXT@)
 the history of roff, the common parts shared by all roff systems, and
 pointers to further documentation.


From MAILER-DAEMON Sun Oct 22 03:56:35 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1e6B7b-0004cp-8w
	for mharc-groff-commit@gnu.org; Sun, 22 Oct 2017 03:56:35 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:50884)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6B7S-0004Y2-T3
	for groff-commit@gnu.org; Sun, 22 Oct 2017 03:56:34 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6B7K-0006qz-RX
	for groff-commit@gnu.org; Sun, 22 Oct 2017 03:56:26 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:47049)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6B7K-0006qv-Lo
	for groff-commit@gnu.org; Sun, 22 Oct 2017 03:56:18 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id 51226201F7; Sun, 22 Oct 2017 03:56:18 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/01: Tidy up source format.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: "G. Branden Robinson" <g.branden.robinson@gmail.com>
In-Reply-To: groff@gnu.org
References: <20171022075617.6186.56113@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 723b5e7cef7b4cf603a5c5fe42b69b24324d0e30
Auto-Submitted: auto-generated
Message-Id: <20171022075618.51226201F7@vcs0.savannah.gnu.org>
Date: Sun, 22 Oct 2017 03:56:17 -0400 (EDT)
From: g.branden.robinson@gmail.com (G. Branden Robinson)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit/>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Oct 2017 07:56:34 -0000

gbranden pushed a commit to branch master
in repository groff.

commit 723b5e7cef7b4cf603a5c5fe42b69b24324d0e30
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Sun Oct 22 03:49:09 2017 -0400

    Tidy up source format.
   =20
    Break lines at sentence endings.  See man-pages(7), chapter "Conventi=
ons
    for source file layout", and groff(7): "In text paragraphs, it is
    advantageous to start each sentence at a line of its own."
   =20
    Also remove a repeated word ("the")
   =20
    Also guard a non-sentence-ending " ." with \&.
   =20
    Signed-off-by: Bjarni Ingi Gislason <bjarniig@rhi.hi.is>
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 doc/pic.ms | 926 ++++++++++++++++++++++++++++++++++---------------------=
------
 1 file changed, 516 insertions(+), 410 deletions(-)

diff --git a/doc/pic.ms b/doc/pic.ms
index 483578e..2286d03 100644
--- a/doc/pic.ms
+++ b/doc/pic.ms
@@ -61,10 +61,12 @@ Eric S. Raymond
 .AB
 The \fBpic\fP language is a \fBtroff\fP extension that makes it easy
 to create and alter box-and-arrow diagrams of the kind frequently used
-in technical papers and textbooks.  This paper is both an introduction
-to and reference for \fIgpic\/\fP(1), the implementation distributed by
-the Free Software Foundation for use with \fIgroff\/\fP(1).  It also
-catalogs other implementations and explains the differences among them.
+in technical papers and textbooks.
+This paper is both an introduction to and reference for \fIgpic\/\fP(1),
+the implementation distributed by the Free Software Foundation for use
+with \fIgroff\/\fP(1).
+It also catalogs other implementations and explains the differences
+among them.
 .AE
 .\"%%TUTORIAL%%
 .
@@ -76,44 +78,49 @@ Introduction to PIC
 Why PIC?
 .PP
 The \fBpic\fP language provides an easy way to write procedural
-box-and-arrow diagrams to be included in \fBtroff\fP documents.  The
-language is sufficiently flexible to be quite useful for state charts,
-Petri-net diagrams, flow charts, simple circuit schematics, jumper
-layouts, and other kinds of illustration involving repetitive uses of
-simple geometric forms and splines.  Because these descriptions are
-procedural and object-based, they are both compact and easy to modify.
+box-and-arrow diagrams to be included in \fBtroff\fP documents.
+The language is sufficiently flexible to be quite useful for state
+charts, Petri-net diagrams, flow charts, simple circuit schematics,
+jumper layouts, and other kinds of illustration involving repetitive
+uses of simple geometric forms and splines.
+Because these descriptions are procedural and object-based, they are
+both compact and easy to modify.
 .PP
 The phrase \[lq]GNU pic\[rq] may refer to either of two \fBpic\fP
 implementations distributed by the Free Software Foundation and
-intended to accept the same input language.  The \fIgpic\/\fP(1)
-implementation is for use with the \fIgroff\/\fP(1) implementation of
-\fBtroff\fP.  The \fIpic2plot\/\fP(1) implementation runs standalone
-and is part of the \fBplotutils\fR package. Because both
-implementations are widely available in source form for free, they are
-good bets for writing very portable documentation.
+intended to accept the same input language.
+The \fIgpic\/\fP(1) implementation is for use with the \fIgroff\/\fP(1)
+implementation of \fBtroff\fP.
+The \fIpic2plot\/\fP(1) implementation runs standalone and is part of
+the \fBplotutils\fR package.
+Because both implementations are widely available in source form for
+free, they are good bets for writing very portable documentation.
 .
 .NH 2
 PIC Versions
 .PP
 The original 1984 pre-\fIditroff\/\fP(1) version of \fBpic\fP is long
-obsolete.  The rewritten 1991 version is still available as part of
-the Documenter's Work Bench module of System V.
+obsolete.
+The rewritten 1991 version is still available as part of the
+Documenter's Work Bench module of System V.
 .PP
 Where differences between Documenter's Work Bench (1991) \fBpic\fP and G=
NU
 \fBpic\fP need to be described, original \fBpic\fP is referred to as
-\[lq]DWB pic\[rq].  Details on the history of the program are given at t=
he
-end of this document.
+\[lq]DWB pic\[rq].
+Details on the history of the program are given at the end of this
+document.
 .PP
 The \fBpic2plot\fR program does not require the rest of the
-\fIgroff\/\fP(1) toolchain to render graphics.  It can display
-\fBpic\fR diagrams in a X\~window, or generate output plots in a large
-number of other formats.  These formats include: PNG, PBM, PGM, PPM, GIF=
,
-SVG, Adobe Illustrator format, idraw-editable Postscript, the WebCGM
-format for Web-based vector graphics, the format used by the \fBxfig\fP
-drawing editor, the Hewlett-Packard PCL\~5 printer language, the
-Hewlett-Packard Graphics Language (by default, HP-GL/2), the ReGIS
-(remote graphics instruction set) format developed by DEC, Tektronix
-format, and device-independent GNU graphics metafile format.
+\fIgroff\/\fP(1) toolchain to render graphics.
+It can display \fBpic\fR diagrams in an X\~window, or generate output
+plots in a large number of other formats.
+These formats include: PNG, PBM, PGM, PPM, GIF, SVG, Adobe Illustrator
+format, idraw-editable Postscript, the WebCGM format for Web-based
+vector graphics, the format used by the \fBxfig\fP drawing editor, the
+Hewlett-Packard PCL\~5 printer language, the Hewlett-Packard Graphics
+Language (by default, HP-GL/2), the ReGIS (remote graphics instruction
+set) format developed by DEC, Tektronix format, and device-independent
+GNU graphics metafile format.
 .PP
 In this document, \fIgpic\/\fP(1) and \fIpic2plot\/\fP(1) extensions are
 marked as such.
@@ -123,25 +130,26 @@ marked as such.
 Invoking PIC
 .PP
 Every \fBpic\fP description is a little program describing drawing
-actions.  The \fB[gtn]roff\fP-dependent versions compile the program
-by \fIpic\/\fP(1) into \fIgtroff\/\fP(1) macros; the
-\fIpic2plot\/\fP(1) implementation uses a plotting library to draw the
-picture directly.  Programs that process or display
+actions.
+The \fB[gtn]roff\fP-dependent versions compile the program by
+\fIpic\/\fP(1) into \fIgtroff\/\fP(1) macros; the \fIpic2plot\/\fP(1)
+implementation uses a plotting library to draw the picture directly.
+Programs that process or display
 \fIgtroff\/\fP(1) output need not know or care that parts of the image
 began life as \fBpic\fP descriptions.
 .PP
 The \fIpic\/\fP(1) program tries to translate anything between \fB.PS\fP
-and \fB.PE\fP markers, and passes through everything else.  The normal
-definitions of \fB.PS\fP and \fB.PE\fP in the \fIms\fP macro package
-and elsewhere have also the side-effect of centering the \fBpic\fP outpu=
t
-on the page.
+and \fB.PE\fP markers, and passes through everything else.
+The normal definitions of \fB.PS\fP and \fB.PE\fP in the \fIms\fP macro
+package and elsewhere have also the side-effect of centering the
+\fBpic\fP output on the page.
 .
 .NH 2
 PIC Error Messages
 .PP
 If you make a \fBpic\fP syntax error, \fIgpic\/\fP(1) issues an
-error message in the standard \fIgcc\/\fP(1)-like syntax.  A typical
-error message looks like this,
+error message in the standard \fIgcc\/\fP(1)-like syntax.
+A typical error message looks like this
 .KS
 .DS
 .CW
@@ -159,10 +167,12 @@ just after) the error location.
 Basic PIC Concepts
 .PP
 Pictures are described procedurally, as collections of objects
-connected by motions.  Normally, \fBpic\fP tries to string together
-objects left-to-right in the sequence they are described, joining them
-at visually natural points.  Here is an example illustrating the
-flow of data in \fBpic\fP processing:
+connected by motions.
+Normally, \fBpic\fP tries to string together objects left-to-right in
+the sequence they are described, joining them at visually natural
+points.
+Here is an example illustrating the flow of data in \fBpic\fP
+processing:
 .KS
 .PS
 ellipse "document";
@@ -198,20 +208,23 @@ ellipse "PostScript"
 .R
 .KE
 .LP
-This little program illustrates several \fBpic\fP basics.  Firstly, we
-see how to invoke three object types; ellipses, arrows, and boxes.  We
-see how to declare text lines to go within an object (and that text
-can have font changes in it).  We see how to change the line style of
-an object from solid to dashed.  And we see that a box can be made
-wider than its default size to accommodate more text (we'll discuss
-this facility in detail in the next section).
-.PP
-We also get to see \fBpic\fP's simple syntax.  Statements are ended by
-newlines or semicolons.  String quotes are required around all text
-arguments, whether or not they contain spaces.  In general, the order
-of command arguments and modifiers like \[lq]width 1.2\[rq] or
-\[lq]dashed\[rq] doesn't matter, except that the order of text arguments
-is significant.
+This little program illustrates several \fBpic\fP basics.
+Firstly, we see how to invoke three object types; ellipses, arrows, and
+boxes.
+We see how to declare text lines to go within an object (and that text
+can have font changes in it).
+We see how to change the line style of an object from solid to dashed.
+And we see that a box can be made wider than its default size to
+accommodate more text (we'll discuss this facility in detail in the next
+section).
+.PP
+We also get to see \fBpic\fP's simple syntax.
+Statements are ended by newlines or semicolons.
+String quotes are required around all text arguments, whether or not
+they contain spaces.
+In general, the order of command arguments and modifiers like \[lq]width
+1.2\[rq] or \[lq]dashed\[rq] doesn't matter, except that the order of
+text arguments is significant.
 .PP
 Here are all but one of the basic \fBpic\fP objects at their default siz=
es:
 .KS
@@ -230,14 +243,15 @@ arc; down; move; "arc"
 .PE
 .CE "2: Basic \fBpic\fP objects"
 .PP
-The missing simple object type is a \fIspline\fP.  There is also a way
-to collect objects into \fIblock composites\fP which allows you to
-treat the whole group as a single object (resembling a box) for many
-purposes.  We'll describe both of these later on.
+The missing simple object type is a \fIspline\fP.
+There is also a way to collect objects into \fIblock composites\fP which
+allows you to treat the whole group as a single object (resembling a
+box) for many purposes.
+We'll describe both of these later on.
 .PP
 The box, ellipse, circle, and block composite objects are \fIclosed\/\fR=
;
-lines, arrows, arcs and splines are \fIopen\fP.  This distinction
-is often important in explaining command modifiers.
+lines, arrows, arcs and splines are \fIopen\fP.
+This distinction is often important in explaining command modifiers.
 .PP
 Figure \n[H1]-2 was produced by the following \fBpic\fP program,
 which introduces some more basic concepts:
@@ -266,8 +280,9 @@ default distance (1/2 inch) in the current movement d=
irection.
 .PP
 Secondly, see how we can also decorate lines and arrows with text.
 The line and arrow commands each take two arguments here, specifying
-text to go above and below the object.  If you wonder why one argument
-would not do, contemplate the output of \fBarrow "ow!"\fP:
+text to go above and below the object.
+If you wonder why one argument would not do, contemplate the output of
+\fBarrow "ow!"\fP:
 .KS
 .PS
 arrow "ow!"
@@ -275,8 +290,10 @@ arrow "ow!"
 .CE "3: Text centered on an arrow"
 .PP
 When a command takes one text string, \fBpic\fP tries to place it at
-the object's geometric center.  As you add more strings, \fBpic\fP
-treats them as a vertical block to be centered.  The program
+the object's geometric center.
+As you add more strings, \fBpic\fP treats them as a vertical block to be
+centered.
+The program
 .KS
 .DS
 .CW
@@ -305,9 +322,9 @@ line "1" "2" "3" "4" "5";
 The last line of Figure 3-2's program, `\fBarc; down; move;
 "arc"\fP', describing the captioned arc, introduces several new ideas.
 Firstly, we see how to change the direction in which objects are
-joined.  Had we written \fBarc; move; "arc"\fP,
-omitting \fBdown\fP the caption would have been joined to the top
-of the arc, like this:
+joined.
+Had we written \fBarc; move; "arc"\fP, omitting \fBdown\fP the caption
+would have been joined to the top of the arc, like this:
 .KS
 .PS
 arc; move; "arc";
@@ -315,7 +332,8 @@ arc; move; "arc";
 .CE "5: Result of \fBarc; move; \"arc\"\fP"
 .PP
 This is because drawing an arc changes the default direction to the
-one its exit end points at.  To reinforce this point, consider:
+one its exit end points at.
+To reinforce this point, consider:
 .KS
 .PS
 arc cw; move; "arc";
@@ -348,18 +366,18 @@ joined to the end of the first.
 Finally, observe that a string, alone, is treated as text to be
 surrounded by an invisible box of a size either specified by width
 and height attributes or by the defaults \fBtextwid\fR and
-\fBtextht\fR.  Both are initially zero (because we don't know the
-default font size).
+\fBtextht\fR.
+Both are initially zero (because we don't know the default font size).
 .
 .
 .NH 1
 Sizes and Spacing
 .PP
-Sizes are specified in inches.  If you don't like inches, it's
-possible to set a global style variable \fBscale\fP that changes the
-unit.  Setting \fBscale =3D 2.54\fP effectively changes the internal
-unit to centimeters (all other size variable values are scaled
-correspondingly).
+Sizes are specified in inches.
+If you don't like inches, it's possible to set a global style variable
+\fBscale\fP that changes the unit.
+Setting \fBscale =3D 2.54\fP effectively changes the internal unit to
+centimeters (all other size variable values are scaled correspondingly).
 .
 .NH 2
 Default Sizes of Objects
@@ -389,22 +407,24 @@ The simplest way to think about these defaults is t=
hat they make the
 other basic objects fit snugly into a default-sized box.
 .PP
 \fIpic2plot\/\fP(1) does not necessarily emit a physical inch for
-each virtual inch in its drawing coordinate system.  Instead, it draws
-on a canvas 8\~virtual inches by 8\~virtual inches wide.  If its
-output page size is \[lq]letter\[rq], these virtual inches will map to
-real ones.  Specifying a different page size (such as, say,
-\[lq]a4\[rq]) will scale virtual inches so they are output as one
-eighth of the page width.  Also, \fIpic2plot\/\fP(1) centers all
-images by default, though the \fB\-n\fP option can be used to prevent
-this.
+each virtual inch in its drawing coordinate system.
+Instead, it draws on a canvas 8\~virtual inches by 8\~virtual inches
+wide.
+If its output page size is \[lq]letter\[rq], these virtual inches will
+map to real ones.
+Specifying a different page size (such as, say, \[lq]a4\[rq]) will scale
+virtual inches so they are output as one eighth of the page width.
+Also, \fIpic2plot\/\fP(1) centers all images by default, though the
+\fB\-n\fP option can be used to prevent this.
 .
 .NH 2
 Objects Do Not Stretch!
 .PP
 Text is rendered in the current font with normal troff line spacing.
 Boxes, circles, and ellipses do \fInot\fP automatically resize to fit
-enclosed text.  Thus, if you say \fBbox "this text far too long for a
-default box"\fP you'll get this:
+enclosed text.
+Thus, if you say \fBbox "this text far too long for a default box"\fP
+you'll get this:
 .KS
 .PS
 box "this text is far too long for a default box"
@@ -424,9 +444,10 @@ box width 3 "this text is far too long for a default=
 box"
 .PE
 .CE "2: Result of \fBbox width 3 \"text far too long\"\fP"
 .PP
-This modifier takes a dimension in inches.  There is also a \[lq]height\=
[rq]
-modifier that changes a box's height.  The \fBwidth\fP keyword may
-be abbreviated to \fBwid\fP; the \fBheight\fP keyword to \fBht\fP.
+This modifier takes a dimension in inches.
+There is also a \[lq]height\[rq] modifier that changes a box's height.
+The \fBwidth\fP keyword may be abbreviated to \fBwid\fP; the
+\fBheight\fP keyword to \fBht\fP.
 .
 .NH 2
 Resizing Other Object Types
@@ -467,8 +488,10 @@ the radius also increases the size of the arc's boun=
ding box.
 The `same' Keyword
 .PP
 In place of a dimension specification, you can use the keyword
-\fBsame\fR.  This gives the object the same size as the previous one
-of its type.  As an example, the program
+\fBsame\fR.
+This gives the object the same size as the previous one
+of its type.
+As an example, the program
 .KS
 .DS
 .CW
@@ -495,8 +518,9 @@ Diagonal Lines
 .PP
 It is possible to specify diagonal lines or arrows by adding multiple \f=
Bup\fP,
 \fBdown\fP, \fBleft\fP, and \fBright\fP modifiers to the line object.
-Any of these can have a multiplier.  To understand the effects, think
-of the drawing area as being gridded with standard-sized boxes.
+Any of these can have a multiplier.
+To understand the effects, think of the drawing area as being gridded
+with standard-sized boxes.
 .KS
 .PS
 # Draw a demonstration up left arrow with grid box overlay
@@ -571,7 +595,8 @@ undef zigzag;
 .CE "3: \fBspline right 1 then down .5 left 1 then right 1\fP"
 .PP
 You can describe many natural-looking but irregular curves this
-way.  For example:
+way.
+For example:
 .KS
 .PS
 [spline right then up then left then down ->;]
@@ -584,9 +609,10 @@ move up 0.2;
 .PE
 .CE "4: Two more spline examples"
 .LP
-Note the arrow decorations.  Arrowheads can be applied naturally to
-any path-based object, line or spline.  We'll see how in the next
-section.
+Note the arrow decorations.
+Arrowheads can be applied naturally to any path-based object, line or
+spline.
+We'll see how in the next section.
 .
 .
 .NH 1
@@ -609,25 +635,27 @@ Revert to previous style; only works one level deep=
, does not stack.
 In the \fBpic\fP implementations that are preprocessors for a
 toolchain that include \fB[gtn]roff\fP, text objects may also contain
 \fB[gtn]roff\fP vertical- and horizontal-motion escapes such as \eh or \=
ev.
-Troff special glyphs are also available.  All \e-escapes will be
-passed through to the postprocessing stage and have their normal
-effects.  The base font family is set by the \fB[gtn]roff\fP
-environment at the time the picture is rendered.
+Troff special glyphs are also available.
+All \e-escapes will be passed through to the postprocessing stage and
+have their normal effects.
+The base font family is set by the \fB[gtn]roff\fP environment at the
+time the picture is rendered.
 .PP
 \fBpic2plot\fP replaces \fB[gtn]roff\fP horizontal- and vertical-motion
-escapes with \e-escapes of its own.  Troff special glyphs are not
-available, but in most back ends Latin-1 special characters and a
-square-root radical will be.  See the \fBpic2plot\fP documentation for
-full details.
+escapes with \e-escapes of its own.
+Troff special glyphs are not available, but in most back ends Latin-1
+special characters and a square-root radical will be.
+See the \fBpic2plot\fP documentation for full details.
 .
 .NH 2
 Dashed Objects
 .PP
 We've already seen that the modifier \fBdashed\fP can change the line
-style of an object from solid to dashed.  GNU \fBgpic\fP permits you to
-dot or dash ellipses, circles, and arcs (and splines in \*[tx] mode
-only); some versions of DWB may only permit dashing of lines and
-boxes.  It's possible to change the dash interval by specifying a
+style of an object from solid to dashed.
+GNU \fBgpic\fP permits you to dot or dash ellipses, circles, and arcs
+(and splines in \*[tx] mode only); some versions of DWB may only permit
+dashing of lines and boxes.
+It's possible to change the dash interval by specifying a
 number after the modifier.
 .PP
 .KS
@@ -647,11 +675,12 @@ box dashed 0.2 "0.2";
 .NH 2
 Dotted Objects
 .PP
-Another available qualifier is \fBdotted\fP.  GNU \fBgpic\fP permits
-you to dot or dash ellipses, circles, and arcs (and splines in \*[tx]
-mode only); some versions of DWB may only permit dashing of lines and
-boxes.  It too can be suffixed with a number to specify the interval
-between dots:
+Another available qualifier is \fBdotted\fP.
+GNU \fBgpic\fP permits you to dot or dash ellipses, circles, and arcs
+(and splines in \*[tx] mode only); some versions of DWB may only permit
+dashing of lines and boxes.
+It too can be suffixed with a number to specify the interval between
+dots:
 .KS
 .PS
 box dotted "default";
@@ -709,29 +738,30 @@ position.
 .NH 2
 Arrowheads
 .PP
-Lines and arcs can be decorated as well.  Any line or arc (and any
-spline as well) can be decorated with arrowheads by adding one or more
-as modifiers:
+Lines and arcs can be decorated as well.
+Any line or arc (and any spline as well) can be decorated with
+arrowheads by adding one or more as modifiers:
 .KS
 .PS
 line <- ->
 .PE
 .CE "5: Double-headed line made with  \fBline <- ->\fP"
 .PP
-In fact, the \fBarrow\fP command is just shorthand for \fBline ->\fP.  A=
nd
-there is a double-head modifier <->, so the figure above could have been=
 made
-with \fBline <->\fP.
+In fact, the \fBarrow\fP command is just shorthand for \fBline ->\fP.
+And there is a double-head modifier <->, so the figure above could have
+been made with \fBline <->\fP.
 .PP
 Arrowheads have a \fBwidth\fP attribute, the distance across the rear;
 and a \fBheight\fP attribute, the length of the arrowhead along the shaf=
t.
 .PP
 Arrowhead style is controlled by the style variable \fBarrowhead\fP.
-The DWB and GNU versions interpret it differently.  DWB defaults to
-open arrowheads and an \fBarrowhead\fP value of\~2; the Kernighan
-paper says a value of\~7 makes solid arrowheads.  GNU \fBgpic\fP
-defaults to solid arrowheads and an \fBarrowhead\fP value of\~1; a
-value of\~0 produces open arrowheads.  Note that solid arrowheads are
-always filled with the current outline color.
+The DWB and GNU versions interpret it differently.
+DWB defaults to open arrowheads and an \fBarrowhead\fP value of\~2; the
+Kernighan paper says a value of\~7 makes solid arrowheads.
+GNU \fBgpic\fP defaults to solid arrowheads and an \fBarrowhead\fP value
+of\~1; a value of\~0 produces open arrowheads.
+Note that solid arrowheads are always filled with the current outline
+color.
 .
 .NH 2
 Line Thickness
@@ -749,12 +779,15 @@ in \*[tx] output mode with the
 option, this means use the line thickness specified by
 .B .ps
 lines; in troff output mode, this means use a thickness proportional
-to the pointsize.  A zero value means draw the thinnest possible line
-supported by the output device.  Initially it has a value of -1.
+to the pointsize.
+A zero value means draw the thinnest possible line supported by the
+output device.
+Initially it has a value of -1.
 There is also a \fBthickness\fP attribute (which can be abbreviated to
-\fBthick\fP).  For example, \fBcircle thickness 1.5\fP would draw a
-circle using a line with a thickness of 1.5 points.  The thickness of
-lines is not affected by the value of the
+\fBthick\fP).
+For example, \fBcircle thickness 1.5\fP would draw a circle using a line
+with a thickness of 1.5 points.
+The thickness of lines is not affected by the value of the
 .B scale
 variable, nor by any width or height given in the
 .B .PS
@@ -763,34 +796,38 @@ line.
 .NH 2
 Invisible Objects
 .PP
-The modifier \fBinvis[ible]\fP makes an object entirely invisible.  This
-used to be useful for positioning text in an invisible object that is
-properly joined to neighboring ones.  Newer DWB versions and GNU
-\fBpic\fP treat stand-alone text in exactly this way.
+The modifier \fBinvis[ible]\fP makes an object entirely invisible.
+This used to be useful for positioning text in an invisible object that
+is properly joined to neighboring ones.
+Newer DWB versions and GNU \fBpic\fP treat stand-alone text in exactly
+this way.
 .
 .NH 2
 Filled Objects
 .PP
-It is possible to fill boxes, circles, and ellipses.  The
-modifier \fBfill[ed]\fP accomplishes this.  You can suffix it with a fil=
l
-value; the default is given by the style variable \fBfillval\fP.
+It is possible to fill boxes, circles, and ellipses.
+The modifier \fBfill[ed]\fP accomplishes this.
+You can suffix it with a fill value; the default is given by the style
+variable \fBfillval\fP.
 .PP
 DWB \fBpic\fP and \fBgpic\fP have opposite conventions for fill values
-and different defaults.  DWB \fBfillval\fP defaults to 0.3 and smaller
-values are darker; GNU \fBfillval\fP uses 0 for white and 1 for black.
+and different defaults.
+DWB \fBfillval\fP defaults to 0.3 and smaller values are darker; GNU
+\fBfillval\fP uses 0 for white and 1 for black.
 .KS
 .PS
 circle fill; move; circle fill 0.4; move; circle fill 0.9;
 .PE
 .CE "6: \fBcircle fill; move; circle fill 0.4; move; circle fill 0.9;\fR=
"
 .PP
-GNU \fBgpic\fP makes some additional guarantees.  A fill value greater
-than 1 can also be used: this means fill with the shade of gray that
-is currently being used for text and lines.  Normally this is
-black, but output devices may provide a mechanism for changing this.
-The invisible attribute does not affect the filling of objects.  Any
-text associated with a filled object is added after the object
-has been filled, so that the text is not obscured by the filling.
+GNU \fBgpic\fP makes some additional guarantees.
+A fill value greater than 1 can also be used: this means fill with the
+shade of gray that is currently being used for text and lines.
+Normally this is black, but output devices may provide a mechanism for
+changing this.
+The invisible attribute does not affect the filling of objects.
+Any text associated with a filled object is added after the object has
+been filled, so that the text is not obscured by the filling.
 .PP
 The closed-object modifier \fBsolid\fP is equivalent to \fBfill\fP
 with the darkest fill value (DWB \fBpic\fP had this capability but
@@ -800,9 +837,11 @@ mentioned it only in a reference section).
 Colored Objects
 .PP
 As a GNU extension, three additional modifiers are available to specify
-colored objects.  \fBoutline\fP sets the color of the outline, \fBshaded=
\fP
-the fill color, and \fBcolor\fP sets both.  All three keywords expect a
-suffix specifying the color.  Example:
+colored objects.
+\fBoutline\fP sets the color of the outline, \fBshaded\fP the fill
+color, and \fBcolor\fP sets both.
+All three keywords expect a suffix specifying the color.
+Example:
 .KS
 .PS
 box color "yellow"; arrow color "cyan"; circle shaded "green" outline "b=
lack";
@@ -817,8 +856,8 @@ Predefined color names for \fI[gtn]roff\/\fP-based \f=
Bpic\fP
 implementations are defined in the device macro files, for example
 \f(CWps.tmac\fP; additional colors can be defined with the
 \fB.defcolor\fP request (see the manual page of GNU \fItroff\/\fP(1)
-for more details).  Currently, color support is not available at all
-in \*[tx] mode.
+for more details).
+Currently, color support is not available at all in \*[tx] mode.
 .PP
 The \fIpic2plot\/\fP(1) carries with its own set of color names,
 essentially those recognized by the X\~window system with \[lq]grey\[rq]
@@ -832,11 +871,12 @@ color are set to the default value.
 More About Text Placement
 .PP
 By default, text is centered at the geometric center of the object it is
-associated with.  The modifier \fBljust\fP causes the left end to be
-at the specified point (which means that the text lies to the right of
-the specified place!), the modifier \fBrjust\fP puts the right end at
-the place.  The modifiers \fBabove\fP and \fBbelow\fP center the text
-one half line space in the given direction.
+associated with.
+The modifier \fBljust\fP causes the left end to be at the specified
+point (which means that the text lies to the right of the specified
+place!), the modifier \fBrjust\fP puts the right end at the place.
+The modifiers \fBabove\fP and \fBbelow\fP center the text one half line
+space in the given direction.
 .PP
 Text attributes can be combined:
 .KS
@@ -852,9 +892,9 @@ move;
 .CE "1: Text attributes"
 .PP
 What actually happens is that \fIn\fP text strings are centered in a box
-that is \fBtextwid\fP wide by \fBtextht\fP high.  Both these variables
-are initially zero (that is \fBpic\fR's way of not making assumptions
-about \fI[tg]roff\/\fP(1)'s default point size).
+that is \fBtextwid\fP wide by \fBtextht\fP high.
+Both these variables are initially zero (that is \fBpic\fR's way of not
+making assumptions about \fI[tg]roff\/\fP(1)'s default point size).
 .PP
 In GNU \fBgpic\fR, objects can have an
 .B aligned
@@ -874,8 +914,8 @@ end points are coincident.
 More About Direction Changes
 .PP
 We've already seen how to change the direction in which objects are
-composed from rightwards to downwards.  Here are some more
-illustrative examples:
+composed from rightwards to downwards.
+Here are some more illustrative examples:
 .KS
 .PS
 down;
@@ -947,9 +987,11 @@ ellipse
 .DE
 .KE
 .LP
-Why is this?  Because the exit point for the current direction is
-already set when you draw the object.  The second arrow in Figure
-\*[SN]2 dropped downwards from the circle's attachment point for an
+Why is this?
+Because the exit point for the current direction is already set when you
+draw the object.
+The second arrow in Figure \*[SN]2 dropped downwards from the circle's
+attachment point for an
 object to be joined to the right.
 .PP
 The meaning of the command \fBmove to last circle .s\fP should be obviou=
s.
@@ -961,33 +1003,38 @@ important topics; locations and object names.
 Naming Objects
 .PP
 The most natural way to name locations in \fBpic\fP is relative to
-objects.  In order to do this, you have to be able you have to be able
-to name objects.  The \fBpic\fP language has rich facilities for this
-that try to emulate the syntax of English.
+objects.
+In order to do this, you have to be able you have to be able to name
+objects.
+The \fBpic\fP language has rich facilities for this that try to emulate
+the syntax of English.
 .
 .NH 2
 Naming Objects By Order Of Drawing
 .PP
 The simplest (and generally the most useful) way to name an object is
-with a \fBlast\fP clause.  It needs to be followed by an object type
-name; \fBbox\fP, \fBcircle\fP, \fBellipse\fP, \fBline\fP, \fBarrow\fP,
-\fBspline\fP, \fB""\fP, or \fB[]\fP (the last type refers to a \fIcompos=
ite
-object\fP which we'll discuss later).  So, for example, the \fBlast
-circle\fP clause in the program attached to Figure \*[SN]3 refers to the
-last circle drawn.
+with a \fBlast\fP clause.
+It needs to be followed by an object type name; \fBbox\fP, \fBcircle\fP,
+\fBellipse\fP, \fBline\fP, \fBarrow\fP, \fBspline\fP, \fB""\fP, or
+\fB[]\fP (the last type refers to a \fIcomposite object\fP which we'll
+discuss later).
+So, for example, the \fBlast circle\fP clause in the program attached to
+Figure \*[SN]3 refers to the last circle drawn.
 .PP
 More generally, objects of a given type are implicitly numbered
-(starting from\~1).  You can refer to (say) the third ellipse in the
-current picture with \fB3rd ellipse\fP, or to the first box as \fB1st
-box\fP, or to the fifth text string (which isn't an attribute to another
-object) as \fB5th ""\fP.
+(starting from\~1).
+You can refer to (say) the third ellipse in the current picture with
+\fB3rd ellipse\fP, or to the first box as \fB1st box\fP, or to the fifth
+text string (which isn't an attribute to another object) as \fB5th
+""\fP.
 .PP
 Objects are also numbered backwards by type from the last one.
 You can say \fB2nd last box\fP to get the second-to-last box, or
 \fB3rd last ellipse\fP to get the third-to-last ellipse.
 .PP
 In places where \fIn\/\fBth\fR is allowed, \fB`\fIexpr\/\fB'th\fR is
-also allowed.  Note that
+also allowed.
+Note that
 .B 'th
 is a single token: no space is allowed between the
 .B '
@@ -1007,9 +1054,10 @@ for i =3D 1 to 4 do {
 .NH 2
 Naming Objects With Labels
 .PP
-You can also specify an object by referring to a label.  A label is a
-word (which must begin with a capital letter) followed by a colon;
-you declare it by placing it immediately before the object drawing comma=
nd.
+You can also specify an object by referring to a label.
+A label is a word (which must begin with a capital letter) followed by a
+colon; you declare it by placing it immediately before the object
+drawing command.
 For example, the program
 .KS
 .DS
@@ -1037,23 +1085,24 @@ arrow right at A .r;
 .PE
 .CE "1: Example of label use"
 The \fBat\fP statement in the fourth line uses the label \fBA\fP (the
-behavior of \fBat\fP is explained in the next section).  We'll
-see later on that labels are most useful for referring to block composit=
e
-objects.
+behavior of \fBat\fP is explained in the next section).
+We'll see later on that labels are most useful for referring to block
+composite objects.
 .PP
 Labels are not constants but variables (you can view colon as a sort
-of assignment).  You can say something like \fBA: A + (1,0);\fP
-and the effect is to reassign the label \fBA\fR to designate a
-position one inch to the right of its old value.
+of assignment).
+You can say something like \fBA: A + (1,0);\fP and the effect is to
+reassign the label \fBA\fR to designate a position one inch to the right
+of its old value.
 .
 .
 .NH 1
 Describing locations
 .PP
-The location of points can be described in many different ways.  All the=
se
-forms are interchangeable as for as the \fBpic\fP language syntax is
-concerned; where you can use one, any of the others that would make
-semantic sense are allowed.
+The location of points can be described in many different ways.
+All these forms are interchangeable as for as the \fBpic\fP language
+syntax is concerned; where you can use one, any of the others that would
+make semantic sense are allowed.
 .PP
 The special label \fBHere\fR always refers to the current position.
 .
@@ -1063,24 +1112,27 @@ Absolute Coordinates
 The simplest is absolute coordinates in inches; \fBpic\fP uses a
 Cartesian system with (0,0) at the lower left corner of the virtual
 drawing surface for each picture (that is, X\~increases to the right
-and Y\~increases upwards).  An absolute location may always be written i=
n the
-conventional form as two comma-separated numbers surrounded by
-parentheses (and this is recommended for clarity).  In contexts where
-it creates no ambiguity, the pair of X and Y\~coordinates suffices
-without parentheses.
-.PP
-It is a good idea to avoid absolute coordinates, however.  They tend
-to make picture descriptions difficult to understand and modify.
+and Y\~increases upwards).
+An absolute location may always be written in the conventional form as
+two comma-separated numbers surrounded by parentheses (and this is
+recommended for clarity).
+In contexts where it creates no ambiguity, the pair of X and
+Y\~coordinates suffices without parentheses.
+.PP
+It is a good idea to avoid absolute coordinates, however.
+They tend to make picture descriptions difficult to understand and
+modify.
 Instead, there are quite a number of ways to specify locations
 relative to \fBpic\fP objects and previous locations.
 .PP
 Another possibility of surprise is the fact that \fBpic\fP crops the
-picture to the smallest bounding box before writing it out.  For
-example, if you have a picture consisting of a small box with its lower
-left corner at (2,2) and another small box with its upper right corner
-at (5,5), the width and height of the image are both 3\~units and
-not\~5.  To get the origin at (0,0) included, simply add an invisible
-object to the picture, positioning the object's left corner at (0,0).
+picture to the smallest bounding box before writing it out.
+For example, if you have a picture consisting of a small box with its
+lower left corner at (2,2) and another small box with its upper right
+corner at (5,5), the width and height of the image are both 3\~units and
+not\~5.
+To get the origin at (0,0) included, simply add an invisible object to
+the picture, positioning the object's left corner at (0,0).
 .
 .NH 2
 Locations Relative to Objects
@@ -1090,12 +1142,14 @@ drawn or the destination of the last \fBmove\fP.
 .PP
 Alone and unqualified, a \fBlast circle\fP or any other way of
 specifying a closed-object or arc location refers as a position to the
-geometric center of the object.  Unqualified, the name of a line or
-spline object refers to the position of the object start.
+geometric center of the object.
+Unqualified, the name of a line or spline object refers to the position
+of the object start.
 .PP
 Also, \fBpic\fP objects have quite a few named locations
-associated with them.  One of these is the object center, which can be
-indicated (redundantly) with the suffix \fB.center\fP (or just \fB.c\fP)=
.
+associated with them.
+One of these is the object center, which can be indicated (redundantly)
+with the suffix \fB.center\fP (or just \fB.c\fP).
 Thus, \fBlast circle \&.center\fP is equivalent to \fBlast
 circle\fP.
 .NH 3
@@ -1128,9 +1182,10 @@ compass(ellipse wid 1.5 ht 1);
 .CE "1: Compass points"
 .LP
 these are the locations where eight compass rays from the geometric cent=
er
-would intersect the figure.  So when we say \fBlast circle .s\fP we are
-referring to the south compass point of the last circle drawn.  The
-explanation of Figure 8-3's program is now complete.
+would intersect the figure.
+So when we say \fBlast circle .s\fP we are referring to the south
+compass point of the last circle drawn.
+The explanation of Figure 8-3's program is now complete.
 .PP
 (In case you dislike compass points, the names \fB.top\fP,
 \&\fB.bottom\fP, \fB.left\fP and \fB.right\fP are synonyms for \fB.n\fP,
@@ -1141,22 +1196,23 @@ The names \fBcenter\fP, \fBtop\fP, \fBbottom\fP, =
\fBleft\fP, \fBright\fP,
 \fBnorth\fP, \fBsouth\fP, \fBeast\fP, and \fBwest\fP can also be used
 (without the leading dot) in a prefix form marked by \fBof\fP; thus,
 \fBcenter of last circle\fP and \fBtop of 2nd last ellipse\fP are both
-valid object references.  Finally, the names \fBleft\fP and \fBright\fP
-can be prefixed with \fBupper\fP and \fBlower\fP which both have the
-obvious meaning.
+valid object references.
+Finally, the names \fBleft\fP and \fBright\fP can be prefixed with
+\fBupper\fP and \fBlower\fP which both have the obvious meaning.
 .PP
 Arc objects also have compass points; they are the compass points of
 the implied circle.
 .PP
 Non-closed objects (line, arrow, or spline) have compass points too, but
-the locations of them are completely arbitrary.  In particular, differen=
t
-\fBpic\fP implementations return different locations.
+the locations of them are completely arbitrary.
+In particular, different \fBpic\fP implementations return different
+locations.
 .NH 3
 Locations Relative to Open Objects
 .PP
 Every open object (line, arrow, arc, or spline) has three named
-points: \fB.start\fP, \fB.center\fP (or \fB.c\fP), and \fB.end\fP.  They
-can also be used without leading dots in the \fBof\fP prefix form.
+points: \fB.start\fP, \fB.center\fP (or \fB.c\fP), and \fB.end\fP.
+They can also be used without leading dots in the \fBof\fP prefix form.
 The center of an arc is the center of its circle, but the center of
 a line, path, or spline is halfway between its endpoints.
 .KS
@@ -1191,21 +1247,22 @@ Positions may be added or subtracted to yield a n=
ew position (to be
 more precise, you can only add a position and an expression pair; the
 latter must be on the right side of the addition or subtraction sign).
 The result is the conventional vector sum or difference of coordinates.
-For example, \fBlast box .ne + (0.1, 0)\fP is a valid position.  This
-example illustrates a common use, to define a position slightly offset
-from a named one (say, for captioning purposes).
+For example, \fBlast box .ne + (0.1, 0)\fP is a valid position.
+This example illustrates a common use, to define a position slightly
+offset from a named one (say, for captioning purposes).
 .NH 3
 Interpolation Between Positions
 .PP
-A position may be interpolated between any two positions.  The syntax
-is `\fIfraction\fP \fBof the way between\fP \fIposition1\fP \fBand\fP
-\fIposition2\fP'.  For example, you can say \fB1/3 of the way between
-Here and last ellipse .ne\fP.  The fraction may be in
-numerator/denominator form or may be an ordinary number (values are
-\fInot\fP restricted to [0,1]).  As an alternative to this verbose
-syntax, you can say `\fIfraction\fP  \fB<\,\fP\fIposition1\fP \fB,\fP
-\fIposition2\/\fP\fB>\fP'; thus, the example could also be written as
-\fB1/3 <Here, last ellipse>\fP.
+A position may be interpolated between any two positions.
+The syntax is `\fIfraction\fP \fBof the way between\fP \fIposition1\fP
+\fBand\fP \fIposition2\fP'.
+For example, you can say \fB1/3 of the way between Here and last ellipse
+\&.ne\fP.
+The fraction may be in numerator/denominator form or may be an ordinary
+number (values are \fInot\fP restricted to [0,1]).
+As an alternative to this verbose syntax, you can say `\fIfraction\fP
+\fB<\,\fP\fIposition1\fP \fB,\fP \fIposition2\/\fP\fB>\fP'; thus, the
+example could also be written as \fB1/3 <Here, last ellipse>\fP.
 .KS
 .PS
 arrow up right;
@@ -1244,9 +1301,9 @@ Projections of Points
 .PP
 Given two positions \fIp\fP and \fIq\fP, the position
 \fB(\,\fP\fIp\fP\fB,\fP \fIq\fP\fB)\fP has the X\~coordinate of \fIp\fP
-and the Y coordinate of \fIq\fP.  This can be helpful in placing an
-object at one of the corners of the virtual box defined by two other
-objects.
+and the Y coordinate of \fIq\fP.
+This can be helpful in placing an object at one of the corners of the
+virtual box defined by two other objects.
 .KS
 .PS
 box invis wid 2 height 1;
@@ -1261,8 +1318,9 @@ dot(last box .nw); "A" ljust at last circle + (-0.1=
, 0.1)
 Using Locations
 .PP
 There are four ways to use locations; \fBat\fP, \fBfrom\fP, \fBto\fP,
-and \fBwith\fP.  All four are object modifiers; that is, you use them
-as suffixes to a drawing command.
+and \fBwith\fP.
+All four are object modifiers; that is, you use them as suffixes to a
+drawing command.
 .PP
 The \fBat\fP modifier says to draw a closed object or arc with its
 center at the following location, or to draw a line/spline/arrow
@@ -1272,9 +1330,10 @@ The \fBto\fP modifier can be used alone to specify=
 a move destination.
 The \fBfrom\fP modifier can be used alone in the same way as \fBat\fP.
 .PP
 The \fBfrom\fP and \fBto\fP modifiers can be used with a \fBline\fR or
-\fBarc\fR command to specify start and end points of the object.  In
-conjunction with named locations, this offers a very flexible
-mechanism for connecting objects.  For example, the following program
+\fBarc\fR command to specify start and end points of the object.
+In conjunction with named locations, this offers a very flexible
+mechanism for connecting objects.
+For example, the following program
 .KS
 .DS
 .CW
@@ -1302,8 +1361,8 @@ arc cw from 1/3 of the way \
 .PP
 The \fBwith\fP modifier allows you to identify a named attachment
 point of an object (or a position within the object) with another point.
-This is very useful for connecting objects in a natural way.  For an
-example, consider these two programs:
+This is very useful for connecting objects in a natural way.
+For an example, consider these two programs:
 .KS
 .PS
 [
@@ -1332,7 +1391,8 @@ The `chop' Modifier
 .PP
 When drawing lines between circles that don't intersect them at a
 compass point, it is useful to be able to shorten a line by the radius
-of the circle at either or both ends.  Consider the following program:
+of the circle at either or both ends.
+Consider the following program:
 .KS
 .DS
 .CW
@@ -1361,14 +1421,16 @@ arrow from 3rd circle to 1st circle chop
 .CE "8: The \fBchop\fR modifier"
 .LP
 Notice that the \fBchop\fR attribute moves arrowheads rather than
-stepping on them.  By default, the \fBchop\fR modifier shortens both
-ends of the line by \fBcirclerad\fR.  By suffixing it with a number
-you can change the amount of chopping.
+stepping on them.
+By default, the \fBchop\fR modifier shortens both ends of the line by
+\fBcirclerad\fR.
+By suffixing it with a number you can change the amount of chopping.
 .PP
 If you say \fBline .\|.\|.\& chop \fIr1\fP chop \fIr2\fP\fR with \fIr1\f=
P
 and \fIr2\fP both numbers, you can vary the amount of chopping at both
-ends.  You can use this in combination with trigonometric functions
-to write code that deals with more complex intersections.
+ends.
+You can use this in combination with trigonometric functions to write
+code that deals with more complex intersections.
 .
 .
 .NH 1
@@ -1381,17 +1443,19 @@ grouping\fP and \fIblock composites\fP.
 Brace Grouping
 .PP
 The simpler method is simply to group a set of objects within curly
-bracket or brace characters.  On exit from this grouping, the current
-position and direction are restored to their value when the opening
-brace was encountered.
+bracket or brace characters.
+On exit from this grouping, the current position and direction are
+restored to their value when the opening brace was encountered.
 .
 .NH 2
 Block Composites
 .PP
 A block composite object is created a series of commands enclosed by
-square brackets.  The composite can be treated for most purposes like
-a single closed object, with the size and shape of its bounding box.
-Here is an example.  The program fragment
+square brackets.
+The composite can be treated for most purposes like a single closed
+object, with the size and shape of its bounding box.
+Here is an example.
+The program fragment
 .KS
 .DS
 .CW
@@ -1409,8 +1473,8 @@ A: [
 .KE
 .LP
 yields the block in figure \n[H1]-1, which we show both with and
-without its attachment points.  The block's location becomes the
-value of \fBA\fP.
+without its attachment points.
+The block's location becomes the value of \fBA\fP.
 .KS
 .PS
 define junction {
@@ -1429,20 +1493,24 @@ compass([junction()]);
 .CE "1: A sample composite object"
 .LP
 To refer to one of the composite's attachment points, you can say
-(for example) \fBA .s\fP.  For purposes of object naming, composites
-are a class.  You could write \fBlast [] .s\fP as an equivalent
-reference, usable anywhere a location is needed.  This construction is
-very important for putting together large, multi-part diagrams.
+(for example) \fBA .s\fP.
+For purposes of object naming, composites are a class.
+You could write \fBlast [] .s\fP as an equivalent reference, usable
+anywhere a location is needed.
+This construction is very important for putting together large,
+multi-part diagrams.
 .PP
 Blocks are also a variable-scoping mechanism, like a \fIgroff\/\fP(1)
-environment.  All variable assignments done inside a block are undone
-at the end of it.  To get at values within a block, write a name of
-the block followed by a dot, followed by the label you
-want.  For example, we could refer the the center of the box in the
-above composite as \fBlast [] .Caption\fP or \fBA.Caption\fP.
+environment.
+All variable assignments done inside a block are undone at the end of it=
.
+To get at values within a block, write a name of the block followed by a
+dot, followed by the label you want.
+For example, we could refer the center of the box in the above composite=
 as
+\fBlast [] \&.Caption\fP or \fBA.Caption\fP.
 .PP
 This kind of reference to a label can be used in any way any other
-location can be.  For example, if we added \fB"Hi!" at A.Caption\fP
+location can be.
+For example, if we added \fB"Hi!" at A.Caption\fP
 the result would look like this:
 .KS
 .PS
@@ -1452,9 +1520,9 @@ A: [junction();]
 .CE "2: Adding a caption using interior labeling"
 .PP
 You can also use interior labels in either part of a \fBwith\fR
-modifier.  This means that the example composite could be placed
-relative to its caption box by a command containing \fBwith A.Caption
-at\fP.
+modifier.
+This means that the example composite could be placed relative to its
+caption box by a command containing \fBwith A.Caption at\fP.
 .PP
 Note that both width and height of the block composite object are always
 positive:
@@ -1480,8 +1548,9 @@ move from last [].e 2
 .PE
 .CE "3: Composite block objects always have positive width and height"
 .PP
-Blocks may be nested.  This means you can use block attachment points
-to build up complex diagrams hierarchically, from the inside out.
+Blocks may be nested.
+This means you can use block attachment points to build up complex
+diagrams hierarchically, from the inside out.
 Note that \fBlast\fP and the other sequential naming mechanisms
 don't look inside blocks, so if you have a program that looks
 like
@@ -1504,7 +1573,8 @@ the arrow in the last line is attached to object \f=
BP\fP, not
 object \fBQ\fP.
 .PP
 In DWB \fBpic\fP, only references one level deep into enclosed blocks
-were permitted.  GNU \fBgpic\fP removes this restriction.
+were permitted.
+GNU \fBgpic\fP removes this restriction.
 .PP
 The combination of block variable scoping, assignability of labels and
 the macro facility that we'll describe later on can be used to
@@ -1516,9 +1586,10 @@ block braces).
 Style Variables
 .PP
 There are a number of global style variables in \fBpic\fR that can be us=
ed to
-change its overall behavior.  We've mentioned several of them in
-previous sections.  They're all described here.  For each variable,
-the default is given.
+change its overall behavior.
+We've mentioned several of them in previous sections.
+They're all described here.
+For each variable, the default is given.
 .TS H
 center, tab(@), linesize(2);
 lb | lb | lb
@@ -1576,21 +1647,23 @@ State variables retain their values across pictur=
es until reset.
 Expressions, Variables, and Assignment
 .PP
 A number is a valid expression, of course (all numbers are stored
-internally as floating-point).  Decimal-point notation is acceptable;
+internally as floating-point).
+Decimal-point notation is acceptable;
 in GNU \fBgpic\fR, scientific notation in C's `e' format (like
 \f(CW5e-2\fP) is accepted.
 .PP
 Anywhere a number is expected, the language also accepts a
-variable.  Variables may be the built-in style variable described in
-the last section, or new variables created by assignment.
+variable.
+Variables may be the built-in style variable described in the last
+section, or new variables created by assignment.
 .PP
 DWB \fBpic\fP supports only the ordinary assignment via \fB=3D\fP, which
 defines the variable (on the left side of the equal sign) in the current
 block if it is not already defined there, and then changes the value (on
-the right side) in the current block.  The variable is not visible outsi=
de
-of the block.  This is similar to the C\~programming language where a
-variable within a block shadows a variable with the same name outside of
-the block.
+the right side) in the current block.
+The variable is not visible outside of the block.
+This is similar to the C\~programming language where a variable within a
+block shadows a variable with the same name outside of the block.
 .PP
 GNU \fBgpic\fP supports an alternate form of assignment using \fB:=3D\fP=
.
 The variable must already be defined, and the value is assigned to
@@ -1612,8 +1685,8 @@ print x " " y
 prints \fB3 5\fP.
 .PP
 You can use the height, width, radius, and x and y coordinates of any
-object or corner in expressions.  If \fBA\fP is an object label or name,
-all the following are valid:
+object or corner in expressions.
+If \fBA\fP is an object label or name, all the following are valid:
 .KS
 .DS
 .CW
@@ -1629,11 +1702,12 @@ A.ht                 # and its height
 Note the second expression, showing how to extract a corner coordinate.
 .PP
 Basic arithmetic resembling those of C operators are available; \fB+\fP,
-\fB*\fP, \fB-\fP, \fB/\fP, and \fB%\fP.  So is \fB^\fP for exponentiatio=
n.
-Grouping is permitted in the usual way using parentheses.  GNU \fBgpic\f=
P
-allows logical operators to appear in expressions; \fB!\&\fP (logical
-negation, not factorial), \fB&&\fP, \fB|\||\fP, \fB=3D=3D\fP, \fB!=3D\fP=
,
-\fB>=3D\fP, \fB<=3D\fP, \fB<\fP, \fB>\fP.
+\fB*\fP, \fB-\fP, \fB/\fP, and \fB%\fP.
+So is \fB^\fP for exponentiation.
+Grouping is permitted in the usual way using parentheses.
+GNU \fBgpic\fP allows logical operators to appear in expressions;
+\fB!\&\fP (logical negation, not factorial), \fB&&\fP, \fB|\||\fP,
+\fB=3D=3D\fP, \fB!=3D\fP, \fB>=3D\fP, \fB<=3D\fP, \fB<\fP, \fB>\fP.
 .PP
 Various built-in functions are supported: \fBsin(\fIx\fB)\fR,
 \fBcos(\fIx\fB)\fR, \fBlog(\fIx\fB)\fR, \fBexp(\fIx\fB)\fR,
@@ -1659,9 +1733,10 @@ function that only takes %, %e, %f, and %g format =
strings.
 Macros
 .PP
 You can define macros in \fBpic\fP, with up to 32 arguments (up to 16
-on EBCDIC platforms).  This is useful for diagrams with
-repetitive parts.  In conjunction with the scope rules for block
-composites, it effectively gives you the ability to write functions.
+on EBCDIC platforms).
+This is useful for diagrams with repetitive parts.
+In conjunction with the scope rules for block composites, it effectively
+gives you the ability to write functions.
 .PP
 The syntax is
 .DS
@@ -1671,7 +1746,8 @@ The syntax is
 .DE
 .LP
 This defines \fIname\fR as a macro to be replaced by the replacement
-text (not including the braces).  The macro may be called as
+text (not including the braces).
+The macro may be called as
 .DS
 .CW
 \fIname\fB(\fIarg1, arg2, \|.\|.\|.\& argn\fB)\fR
@@ -1778,16 +1854,16 @@ This macro example illustrates how you can combin=
e [], brace grouping,
 and variable assignment to write true functions.
 .PP
 One detail the example above does not illustrate is the fact that
-macro argument parsing is not token-oriented.  If you call
-\fBjumper(\ 1\ )\fP, the value of $1 is \fB"\ 1\ "\fP.  You could
-even call \fBjumper(big\ string)\fP to give $1 the value
+macro argument parsing is not token-oriented.
+If you call \fBjumper(\ 1\ )\fP, the value of $1 is \fB"\ 1\ "\fP.
+You could even call \fBjumper(big\ string)\fP to give $1 the value
 \fB"big\ string"\fP.
 .PP
 If you want to pass in a coordinate pair, you can avoid getting
 tripped up by the comma by wrapping the pair in parentheses.
 .PP
-Macros persist through pictures.  To undefine a macro, say \fBundef\fP
-\fIname\fR; for example,
+Macros persist through pictures.
+To undefine a macro, say \fBundef\fP \fIname\fR; for example,
 .DS
 \f(CWundef jumper\fP
 \f(CWundef jumperblock\fP
@@ -1811,20 +1887,22 @@ The statement
 .DE
 .LP
 inserts the contents of \fIfilename\fR in the \fBpic\fP input stream.
-Any \fB.PS\fP/\fB.PE\fP pair in the file is ignored.  You
-can use this to include pre-generated images.
+Any \fB.PS\fP/\fB.PE\fP pair in the file is ignored.
+You can use this to include pre-generated images.
 .PP
 A variant of this statement replicates the \fBcopy thru\fP feature of
-\fIgrap\/\fP(1).  The call
+\fIgrap\/\fP(1).
+The call
 .DS
 \f(CWcopy\fP \fIfilename\fR \f(CWthru\fP \fImacro\fP
 .DE
 .LP
 calls \fImacro\fP (which may be either a name or replacement text)
 on the arguments obtained by breaking each line of the file into
-blank-separated fields.  The macro may have up to 9\~arguments.  The
-replacement text may be delimited by braces or by a pair of instances
-of any character not appearing in the rest of the text.
+blank-separated fields.
+The macro may have up to 9\~arguments.
+The replacement text may be delimited by braces or by a pair of
+instances of any character not appearing in the rest of the text.
 .PP
 If you write
 .DS
@@ -1879,8 +1957,8 @@ box
 Debug Messages
 .PP
 The command \fBprint\fR accepts any number of arguments, concatenates
-their output forms, and writes the result to standard error.  Each
-argument must be an expression, a position, or a text string.
+their output forms, and writes the result to standard error.
+Each argument must be an expression, a position, or a text string.
 .
 .NH 2
 Escape to Post-Processor
@@ -1891,7 +1969,8 @@ If you write
 .DE
 .LP
 \fBpic\fP concatenates the arguments and pass them through as a line
-to troff or \*[tx].  Each
+to troff or \*[tx].
+Each
 .I arg
 must be an expression, a position, or text.
 This has a similar effect to a line beginning with
@@ -1931,17 +2010,19 @@ The command
 .LP
 macro-expands the text in braces, then executes it as a shell command.
 This could be used to generate images or data tables for later
-inclusion.  The delimiters shown as {} here may also be two copies of
-any one character not present in the shell command text.  In either
-case, the body may contain balanced {} pairs.  Strings in the body
-may contain balanced or unbalanced braces in any case.
+inclusion.
+The delimiters shown as {} here may also be two copies of any one
+character not present in the shell command text.
+In either case, the body may contain balanced {} pairs.
+Strings in the body may contain balanced or unbalanced braces in any
+case.
 .
 .
 .NH 1
 Control-flow constructs
 .PP
-The \fBpic\fP language provides conditionals and looping.  For
-example,
+The \fBpic\fP language provides conditionals and looping.
+For example,
 .KS
 .DS
 .CW
@@ -2036,25 +2117,26 @@ Eithe or both of the
 or
 .I Y
 pairs may instead be balanced pairs of
-braces ({ and\~}) as in the \fBsh\fR command.  In either case, the
-\fIif-true\fR may contain balanced pairs of braces.  None of these
-delimiters are seen inside strings.
+braces ({ and\~}) as in the \fBsh\fR command.
+In either case, the \fIif-true\fR may contain balanced pairs of braces.
+None of these delimiters are seen inside strings.
 .PP
 All the usual relational operators my be used in conditional expressions=
;
 \fB!\&\fP (logical negation, not factorial), \fB&&\fP, \fB|\||\fP, \fB=3D=
=3D\fP,
 \fB!=3D\fP, \fB>=3D\fP, \fB<=3D\fP, \fB<\fP, \fB>\fP.
 .PP
-String comparison is also supported using \fB=3D=3D\fP and \fB!=3D\fP.  =
String
-comparisons may need to be parenthesized to avoid syntactic
+String comparison is also supported using \fB=3D=3D\fP and \fB!=3D\fP.
+String comparisons may need to be parenthesized to avoid syntactic
 ambiguities.
 .
 .
 .NH 1
 Interface To [gt]roff
 .PP
-The output of \fBpic\fP is \fB[gt]roff\fP drawing commands.  The GNU
-\fIgpic\/\fP(1) command warns that it relies on drawing extensions
-present in \fIgroff\/\fP(1) that are not present in \fItroff\/\fP(1).
+The output of \fBpic\fP is \fB[gt]roff\fP drawing commands.
+The GNU \fIgpic\/\fP(1) command warns that it relies on drawing
+extensions present in \fIgroff\/\fP(1) that are not present in
+\fItroff\/\fP(1).
 .
 .NH 2
 Scaling Arguments
@@ -2062,22 +2144,23 @@ Scaling Arguments
 The DWB \fIpic\/\fP(1) program accepts one or two arguments to
 \&\fB.PS\fP, which is interpreted as a width and height in inches to
 which the results of \fIpic\/\fP(1) should be scaled (width and height
-scale independently).  If there is only one argument, it is
-interpreted as a width to scale the picture to, and height is
-scaled by the same proportion.
+scale independently).
+If there is only one argument, it is interpreted as a width to scale the
+picture to, and height is scaled by the same proportion.
 .PP
 GNU \fBgpic\fP is less general; it accepts a single width to scale
-to, or a zero width and a maximum height to scale to.  With
-two non-zero arguments, it scales to the maximum height.
+to, or a zero width and a maximum height to scale to.
+With two non-zero arguments, it scales to the maximum height.
 .
 .NH 2
 How Scaling is Handled
 .PP
 When \fBpic\fP processes a picture description on input, it passes
-\fB.PS\fP and \fB.PE\fP through to the postprocessor.  The \fB.PS\fP
-gets decorated with two numeric arguments which are the X and
-Y\~dimensions of the picture in inches.  The post-processor can use
-these to reserve space for the picture and center it.
+\fB.PS\fP and \fB.PE\fP through to the postprocessor.
+The \fB.PS\fP gets decorated with two numeric arguments which are the X
+and Y\~dimensions of the picture in inches.
+The post-processor can use these to reserve space for the picture and
+center it.
 .PP
 The GNU incarnation of the \fBms\fP macro package, for example, includes
 the following definitions:
@@ -2118,8 +2201,8 @@ The invocation
 \&\fB.PS <\,\fP\fIfile\fP
 .DE
 .LP
-causes the contents of \fIfile\fP to replace the \fB.PS\fP line.  This
-feature is deprecated; use `\fBcopy\fP \fIfile\fR' instead).
+causes the contents of \fIfile\fP to replace the \fB.PS\fP line.
+This feature is deprecated; use `\fBcopy\fP \fIfile\fR' instead).
 .
 .NH 2
 PIC and [gt]roff commands
@@ -2142,7 +2225,8 @@ complicated equations inside \fBpic\fR pictures; th=
ey come out wrong if
 \fIeqn\/\fP(1) has to leave extra vertical space for the equation.
 If your equation involves more than subscripts and superscripts, you
 must add to the beginning of each equation the extra information
-\fBspace\~0\fP.  He gives the following example:
+\fBspace\~0\fP.
+He gives the following example:
 .KS
 .DS
 .CW
@@ -2167,11 +2251,13 @@ arrow
 Absolute Positioning of Pictures
 .PP
 A \fBpic\fP picture is positioned vertically by troff at the current
-position.  The topmost position possible on a page is not the paper edge
+position.
+The topmost position possible on a page is not the paper edge
 but a position which is one baseline lower so that the first row of glyp=
hs
-is visible.  To make a picture really start at the paper edge you have
-to make the baseline-to-baseline distance zero, this is, you must set th=
e
-vertical spacing to\~0 (using \fB.vs\fP) before starting the picture.
+is visible.
+To make a picture really start at the paper edge you have to make the
+baseline-to-baseline distance zero, this is, you must set the vertical
+spacing to\~0 (using \fB.vs\fP) before starting the picture.
 .
 .
 .NH 1
@@ -2568,27 +2654,31 @@ This is an annotated grammar of \fBpic\fP.
 Lexical Items
 .PP
 In general, \fBpic\fP is a free-format, token-oriented language that
-ignores whitespace outside strings.  But certain lines and contructs
-are specially interpreted at the lexical level:
+ignores whitespace outside strings.
+But certain lines and contructs are specially interpreted at the lexical
+level:
 .PP
 A comment begins with \fB#\fP and continues to \fB\en\fP (comments may
-also follow text in a line).  A line beginning with a period or
-backslash may be interpreted as text to be passed through to the
-post-processor, depending on command-line options.  An end-of-line
-backslash is interpreted as a request to continue the line; the
-backslash and following newline are ignored.
+also follow text in a line).
+A line beginning with a period or backslash may be interpreted as text
+to be passed through to the post-processor, depending on command-line
+options.
+An end-of-line backslash is interpreted as a request to continue the
+line; the backslash and following newline are ignored.
 .PP
 .RS
 Here are the grammar terminals:
 .IP \s[-1]INT\s[0]
 A positive integer.
 .IP \s[-1]NUMBER\s[0]
-A floating point numeric constant.  May contain a decimal point or be
-expressed in scientific notation in the style of \fIprintf\/\fP(3)'s %e
-escape.  A trailing `i' or `I' (indicating the unit `inch') is ignored.
+A floating point numeric constant.
+May contain a decimal point or be expressed in scientific notation in
+the style of \fIprintf\/\fP(3)'s %e escape.
+A trailing `i' or `I' (indicating the unit `inch') is ignored.
 .IP \s[-1]TEXT\s[0]
-A string enclosed in double quotes.  A double quote within \s[-1]TEXT\s[=
0]
-must be preceded by a backslash.  Instead of \s[-1]TEXT\s[0] you can use
+A string enclosed in double quotes.
+A double quote within \s[-1]TEXT\s[0] must be preceded by a backslash.
+Instead of \s[-1]TEXT\s[0] you can use
 .DS
 .CW
 sprintf ( TEXT [, <expr> ...] )
@@ -2614,7 +2704,8 @@ where \fIX\fP doesn't occur in the string.
 Delimiters as in \s[-1]BALANCED-TEXT\s[0]; the body is interpreted as
 `\fB\[la]command\[ra].\|.\|.\fP'.
 .IP \s[-1]FILENAME\s[0]
-The name of a file.  This has the same semantics as \s[-1]TEXT\s[0].
+The name of a file.
+This has the same semantics as \s[-1]TEXT\s[0].
 .IP \s[-1]MACRONAME\s[0]
 Either \s[-1]VARIABLE\s[0] or \s[-1]LABEL\s[0].
 .RE
@@ -2632,8 +2723,8 @@ of the preceding element(s).
 An enclosure in square brackets has its usual meaning of `this clause is
 optional'.
 .IP 4.
-Square-bracket-enclosed portions within tokens are optional.  Thus,
-`h\^[eigh]\^t' matches either `height' or `ht'.
+Square-bracket-enclosed portions within tokens are optional.
+Thus, `h\^[eigh]\^t' matches either `height' or `ht'.
 .LP
 If one of these special tokens has to be referred to literally, it is
 surrounded with single quotes.
@@ -2650,15 +2741,16 @@ The top-level \fBpic\fP object is a picture.
 .PP
 The arguments, if present, represent the width and height of the picture=
,
 causing \fBpic\fR to attempt to scale it to the given dimensions in
-inches.  In no case, however, the X and Y\~dimensions of the
-picture exceed the values of the style variables \fBmaxpswid\fP and
-\fBmaxpsheight\fP (which default to the normal 8.5\^i by 11\^i page size=
).
+inches.
+In no case, however, the X and Y\~dimensions of the picture exceed the
+values of the style variables \fBmaxpswid\fP and \fBmaxpsheight\fP
+(which default to the normal 8.5\^i by 11\^i page size).
 .PP
 If the ending `.PE' is replaced by `.PF', the page vertical position is
-restored to its value at the time `.PS' was encountered.  Another
-alternate form of invocation is `.PS\ <\s[-1]FILENAME\s[0]', which
-replaces the `.PS' line with a file to be interpreted by \fBpic\fR (but
-this feature is deprecated).
+restored to its value at the time `.PS' was encountered.
+Another alternate form of invocation is `.PS\ <\s[-1]FILENAME\s[0]',
+which replaces the `.PS' line with a file to be interpreted by \fBpic\fR
+(but this feature is deprecated).
 .PP
 The `.PS', `.PE', and `.PF' macros to perform centering and scaling are
 normally supplied by the post-processor.
@@ -2706,7 +2798,8 @@ The current position and direction are saved on ent=
ry to a `{\ .\|.\|.\ }'
 construction and restored on exit from it.
 .PP
 Note that in `if' constructions, newlines can only occur in
-\s[-1]BALANCED-BODY\s[0].  This means that
+\s[-1]BALANCED-BODY\s[0].
+This means that
 .DS
 .CW
 if
@@ -2716,7 +2809,8 @@ else
 .R
 .DE
 .PP
-fails.  You have to use the braces on the same line as the keywords:
+fails.
+You have to use the braces on the same line as the keywords:
 .DS
 .CW
 if {
@@ -2731,11 +2825,11 @@ This restriction doesn't hold for the body after =
the `do' in a `for'
 construction.
 .PP
 At the beginning of each picture, `figname' is reset to the vbox name
-`graph'; this command has only a meaning in \*[tx] mode.  While the gram=
mar
-rules allow digits and the underscore in the value of `figname', \*[tx]
-normally accepts uppercase and lowercase letters only as box names
-(you have to use `\ecsname' if you really need to circumvent this
-limitation).
+`graph'; this command has only a meaning in \*[tx] mode.
+While the grammar rules allow digits and the underscore in the value of
+`figname', \*[tx] normally accepts uppercase and lowercase letters only
+as box names (you have to use `\ecsname' if you really need to
+circumvent this limitation).
 .DS
 .CW
 <any-expr> ::=3D
@@ -2760,9 +2854,9 @@ limitation).
 .DE
 .PP
 Logical operators are handled specially by \fBpic\fP since they can
-deal with text strings also.  \fBpic\fP uses \%\fIstrcmp\/\fP(3) to test
-for equality of strings; an empty string is considered as `false' for
-`&&' and `|\||'.
+deal with text strings also.
+\fBpic\fP uses \%\fIstrcmp\/\fP(3) to test for equality of strings; an
+empty string is considered as `false' for `&&' and `|\||'.
 .DS
 .CW
 <primitive> ::=3D
@@ -2782,9 +2876,11 @@ for equality of strings; an empty string is consid=
ered as `false' for
 .PP
 Drawn objects within `[\ .\|.\|.\ ]' are treated as a single composite
 object with a rectangular shape (that of the bounding box of all the
-elements).  Variable and label assignments within a block are local to
-the block.  Current direction of motion is restored to the value at star=
t
-of block upon exit.  Position is \fInot\fR restored (unlike `{\ }');
+elements).
+Variable and label assignments within a block are local to the block.
+Current direction of motion is restored to the value at start of block
+upon exit.
+Position is \fInot\fR restored (unlike `{\ }');
 instead, the current position becomes the exit position for the current
 direction on the block's bounding box.
 .DS
@@ -2829,13 +2925,13 @@ direction on the block's bounding box.
 .DE
 .PP
 Missing attributes are supplied from defaults; inappropriate ones are
-silently ignored.  For lines, splines, and arcs, height and width
-refer to arrowhead size.
+silently ignored.
+For lines, splines, and arcs, height and width refer to arrowhead size.
 .PP
-The `at' primitive sets the center of the current object.  The
-`with' attribute fixes the specified feature of the given object
-to a specified location.  (Note that `with' is incorrectly described
-in the Kernighan paper.)
+The `at' primitive sets the center of the current object.
+The `with' attribute fixes the specified feature of the given object to
+a specified location.
+(Note that `with' is incorrectly described in the Kernighan paper.)
 .PP
 The `by' primitive is not documented in the tutorial portion of
 the Kernighan paper, and should probably be considered unreliable.
@@ -2844,14 +2940,15 @@ The primitive `arrow' is a synonym for `line\ ->'=
.
 .PP
 Text is normally an attribute of some object, in which case successive
 strings are vertically stacked and centered on the object's center by
-default.  Standalone text is treated as though placed in an invisible
-box.
+default.
+Standalone text is treated as though placed in an invisible box.
 .PP
 A text item consists of a string or sprintf-expression, optionally
-followed by positioning information.  Text (or strings specified with
-`sprintf') may contain font changes, size changes, and local
-motions, provided those changes are undone before the end of the current
-item.  Text may also contain \e-escapes denoting special characters.
+followed by positioning information.
+Text (or strings specified with `sprintf') may contain font changes,
+size changes, and local motions, provided those changes are undone
+before the end of the current item.
+Text may also contain \e-escapes denoting special characters.
 The base font and specific set of escapes supported is implementation
 dependent, but supported escapes always include the following:
 .IP "\efR, \ef1"
@@ -2867,8 +2964,8 @@ Color names are dependent on the \gBpic\fR implemen=
tation, but in
 all modern versions color names recognized by the X\~window system are
 supported.
 .PP
-A position is an (x,y) coordinate pair.  There are lots of different
-ways to specify positions:
+A position is an (x,y) coordinate pair.
+There are lots of different ways to specify positions:
 .DS
 .CW
 <position> ::=3D
@@ -2971,8 +3068,8 @@ an expression, as opposed to a numeric literal) is =
not documented in DWB's
 .PP
 The \[la]\,\fIxxx\/\fP-of\|\[ra] rule is special: The lexical parser che=
cks whether
 \fIxxx\fP is followed by the token `of' without eliminating it so that
-the grammar parser can still see `of'.  Valid examples of specifying a
-place with corner and label are thus
+the grammar parser can still see `of'.
+Valid examples of specifying a place with corner and label are thus
 .DS
 .CW
 A .n
@@ -2989,8 +3086,8 @@ north A
 A north
 .R
 .DE
-both cause a syntax error.  (DWB \fBpic\fP also allows the weird form
-`A\ north\ of'.)
+both cause a syntax error.
+(DWB \fBpic\fP also allows the weird form `A\ north\ of'.)
 .PP
 Here the special rules for the `with' keyword using a path:
 .DS
@@ -3043,14 +3140,16 @@ fillval@0.5@Default fill value
 _
 .TE
 Any of these can be set by assignment, or reset using the \fBreset\fP
-statement.  Style variables assigned within `[\ ]' blocks are restored t=
o
-their beginning-of-block value on exit; top-level assignments persist
-across pictures.  Dimensions are divided by \fBscale\fR on output.
+statement.
+Style variables assigned within `[\ ]' blocks are restored to their
+beginning-of-block value on exit; top-level assignments persist across
+pictures.
+Dimensions are divided by \fBscale\fR on output.
 .PP
 All \fBpic\fP expressions are evaluated in floating point; units
-are always inches (a trailing `i' or `I' is ignored).  Expressions have
-the following simple grammar, with semantics very similar to
-C\~expressions:
+are always inches (a trailing `i' or `I' is ignored).
+Expressions have the following simple grammar, with semantics very
+similar to C\~expressions:
 .DS
 .CW
 <expr> ::=3D
@@ -3104,7 +3203,8 @@ These may be used to define pseudo-functions.
 .DE
 .LP
 This defines \fIname\fR as a macro to be replaced by the replacement
-text (not including the braces).  The macro may be called as
+text (not including the braces).
+The macro may be called as
 .DS
 .CW
 \fIname\/\fB(\,\fIarg1, arg2, .\|.\|., argn\fB\/)\fR
@@ -3112,8 +3212,9 @@ text (not including the braces).  The macro may be =
called as
 .DE
 .LP
 The arguments (if any) are substituted for tokens $1, $2 .\|.\|.\& $n
-appearing in the replacement text.  To undefine a macro, say \fBundef\fP
-\fIname\fR, specifying the name to be undefined.
+appearing in the replacement text.
+To undefine a macro, say \fBundef\fP \fIname\fR, specifying the name to
+be undefined.
 .\"%%POSTLUDE%%
 .
 .
@@ -3127,8 +3228,9 @@ with substantial enhancements (apparently as part o=
f the evolution of
 device-independent output).
 .PP
 The language had been inspired by some earlier graphics languages
-including \fBideal\fP and \fBgrap\fP.  Kernighan credits Chris van Wyk
-(the designer of \fBideal\fP) with many of the ideas that went into
+including \fBideal\fP and \fBgrap\fP.
+Kernighan credits Chris van Wyk (the designer of \fBideal\fP) with many
+of the ideas that went into
 \fBpic\fP.
 .PP
 .\" the original definitions of EQ and EN cause insertion of vertical
@@ -3144,7 +3246,8 @@ The \fBpic\fP language was originally described by =
Brian Kernighan in
 Bell Labs Computing Science Technical Report #116 (you can obtain a
 PostScript copy of the revised version, [1], by sending a mail message t=
o
 \fInetlib@research.att.com\fP with a body of `send 116 from
-research/cstr').  There have been two revisions, in 1984 and 1991.
+research/cstr').
+There have been two revisions, in 1984 and 1991.
 .PP
 The document you are reading effectively subsumes Kernighan's
 description; it was written to fill in lacun\[ae] in the exposition and
@@ -3152,8 +3255,9 @@ integrate in descriptions of the GNU \fIgpic\/\fP(1=
) and
 \fIpic2plot\/\fP(1) features.
 .PP
 The GNU \fBgpic\fR implementation was written by James Clark
-\[la]\,\fIjjc@jclark.com\/\fP\[ra].  It is currently maintained by Werne=
r
-Lemberg \[la]\,\fIwl@gnu.org\/\fP\[ra].
+\[la]\,\fIjjc@jclark.com\/\fP\[ra].
+It is currently maintained by Werner Lemberg
+\[la]\,\fIwl@gnu.org\/\fP\[ra].
 .PP
 The GNU \fBpic2plot\fR implementation is based on James Clark's parser
 code and maintained by Robert Maier, principal author of \fBplotutils\fP=
.
@@ -3162,11 +3266,13 @@ code and maintained by Robert Maier, principal au=
thor of \fBplotutils\fP.
 .NH 1
 Bibliography
 .IP 1.
-Kernighan, B. W.  \fBPIC \[em] A Graphics Language for Typesetting
-(Revised User Manual)\fP.  Bell Labs Computing Science Technical Report
-#116, December 1991.
+Kernighan, B. W.
+\fBPIC \[em] A Graphics Language for Typesetting
+(Revised User Manual)\fP.
+Bell Labs Computing Science Technical Report #116, December 1991.
 .IP 2.
-Van Wyk, C. J.  \fBA high-level language for specifying pictures\fP.
+Van Wyk, C. J.
+\fBA high-level language for specifying pictures\fP.
 \fIACM Transactions On Graphics\fP 1,2 (1982) 163-182.
 .
 .\" end of pic.ms


From MAILER-DAEMON Sun Oct 22 04:41:10 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1e6Bok-0002Ou-N7
	for mharc-groff-commit@gnu.org; Sun, 22 Oct 2017 04:41:10 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:55302)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6Boj-0002Oo-3J
	for groff-commit@gnu.org; Sun, 22 Oct 2017 04:41:10 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6Boh-0000SH-Ei
	for groff-commit@gnu.org; Sun, 22 Oct 2017 04:41:09 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:47471)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6Boh-0000Rv-Ah
	for groff-commit@gnu.org; Sun, 22 Oct 2017 04:41:07 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id EECFA209A7; Sun, 22 Oct 2017 04:41:06 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/01: www.tmac: Rename font 'C' to 'CR'; define 'CR'.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: "G. Branden Robinson" <g.branden.robinson@gmail.com>
In-Reply-To: groff@gnu.org
References: <20171022084106.22370.52798@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 0de1d6d79cdb959ffa7dac3af77c2a36ef31873f
Auto-Submitted: auto-generated
Message-Id: <20171022084106.EECFA209A7@vcs0.savannah.gnu.org>
Date: Sun, 22 Oct 2017 04:41:06 -0400 (EDT)
From: g.branden.robinson@gmail.com (G. Branden Robinson)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit/>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Oct 2017 08:41:10 -0000

gbranden pushed a commit to branch master
in repository groff.

commit 0de1d6d79cdb959ffa7dac3af77c2a36ef31873f
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Sun Oct 22 04:33:46 2017 -0400

    www.tmac: Rename font 'C' to 'CR'; define 'CR'.
   =20
    The font name 'C' ('CW') is not a part of groff's fonts.
   =20
    Fixes Savannah #51417 and half of #51426.
   =20
    Signed-off-by: Bjarni Ingi Gislason <bjarniig@rhi.hi.is>
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 tmac/groff_www.7.man |  4 ++--
 tmac/www.tmac.in     | 13 +++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/tmac/groff_www.7.man b/tmac/groff_www.7.man
index fe20eeb..c6e1273 100644
--- a/tmac/groff_www.7.man
+++ b/tmac/groff_www.7.man
@@ -233,7 +233,7 @@ or
 it appears as:
 .RS
 .IP
-foo \[la]\f[C]http://foo.org\f[]\[ra]:
+foo \[la]\f[CR]http://foo.org\f[]\[ra]:
 .RE
 .
 .IP
@@ -646,7 +646,7 @@ The macro set initializes itself with the following c=
all
 .IP
 .nf
 .ft B
-\&.LINKSTYLE blue C \e[la] \e[ra]
+\&.LINKSTYLE blue CR \e[la] \e[ra]
 .ft P
 .fi
 .RE
diff --git a/tmac/www.tmac.in b/tmac/www.tmac.in
index ccc2399..98542e3 100644
--- a/tmac/www.tmac.in
+++ b/tmac/www.tmac.in
@@ -51,6 +51,15 @@ HTML always denotes XHTML also.
 .cp 0
 .
 .
+.\" Taken from tmac/an-ext.tmac
+.\" Map mono-width fonts to standard fonts for groff's TTY device.
+.if n \{\
+.  do ftr CR R
+.  do ftr CW R
+.  do ftr CI I
+.  do ftr CB B
+.\}
+.
 .ie r xhtml \
 .  ds www-> />\"
 .el \
@@ -1472,7 +1481,7 @@ HTML always denotes XHTML also.
 .\" start of some code
 .\"
 .de CDS
-.  ft C
+.  ft CR
 .  nf
 ..
 .
@@ -1603,7 +1612,7 @@ HTML always denotes XHTML also.
 .\" final setup
 .\" --------------------------------------------------------------------
 .
-.LINKSTYLE blue C \[la] \[ra]
+.LINKSTYLE blue CR \[la] \[ra]
 .
 .if \n[www-html] \{\
 .  nh


From MAILER-DAEMON Sun Oct 22 04:51:16 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1e6ByW-0003eO-Sp
	for mharc-groff-commit@gnu.org; Sun, 22 Oct 2017 04:51:16 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:56120)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6ByV-0003eI-LF
	for groff-commit@gnu.org; Sun, 22 Oct 2017 04:51:16 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6ByU-0005ez-RT
	for groff-commit@gnu.org; Sun, 22 Oct 2017 04:51:15 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:47553)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6ByU-0005ep-Na
	for groff-commit@gnu.org; Sun, 22 Oct 2017 04:51:14 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id 11961209A7; Sun, 22 Oct 2017 04:51:14 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/01: groff_hdtbl: Change reference to font 'C' to 'CR'.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: "G. Branden Robinson" <g.branden.robinson@gmail.com>
In-Reply-To: groff@gnu.org
References: <20171022085113.26424.53961@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: fcec3e0a5bee74a3f66e968abc1d668555f01147
Auto-Submitted: auto-generated
Message-Id: <20171022085114.11961209A7@vcs0.savannah.gnu.org>
Date: Sun, 22 Oct 2017 04:51:13 -0400 (EDT)
From: g.branden.robinson@gmail.com (G. Branden Robinson)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit/>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Oct 2017 08:51:16 -0000

gbranden pushed a commit to branch master
in repository groff.

commit fcec3e0a5bee74a3f66e968abc1d668555f01147
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Sun Oct 22 04:48:57 2017 -0400

    groff_hdtbl: Change reference to font 'C' to 'CR'.
   =20
    Font 'C' does not exist in 'groff'.
   =20
    Fixes the remaining half of Savannah #51426.
   =20
    Signed-off-by: Bjarni Ingi Gislason <bjarniig@rhi.hi.is>
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 contrib/hdtbl/groff_hdtbl.7.man | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/contrib/hdtbl/groff_hdtbl.7.man b/contrib/hdtbl/groff_hdtbl.=
7.man
index 1798a51..70179b6 100644
--- a/contrib/hdtbl/groff_hdtbl.7.man
+++ b/contrib/hdtbl/groff_hdtbl.7.man
@@ -300,7 +300,7 @@ representation is
 .PP
 .nf
 .nh
-.ft C
+.ft CR
 .RS
 +------------------------------------------------------+
 | contents-of-the-table-cell                           |
@@ -363,7 +363,7 @@ representation is
 .PP
 .nf
 .nh
-.ft C
+.ft CR
 .RS
 +--------------------------+---------------------------+
 | 1*1                      | 1*2                       |
@@ -453,7 +453,7 @@ The first table looks like
 .PP
 .nf
 .nh
-.ft C
+.ft CR
 .RS
 +------------------------------------------------------+
 | 1*1 1*2                                              |
@@ -473,7 +473,7 @@ and the second one like
 .PP
 .nf
 .nh
-.ft C
+.ft CR
 .RS
 +------------------------------------------------------+
 | 1*1 1*2                                              |
@@ -835,7 +835,7 @@ is
 This looks like
 .
 .PP
-.ft C
+.ft CR
 .if t \{\
 .  ne 7v
 .\}
@@ -881,7 +881,7 @@ is
 which looks like
 .
 .PP
-.ft C
+.ft CR
 .RS
 .nf
 .nh
@@ -893,7 +893,7 @@ which looks like
 .hy
 .fi
 .RE
-.ft C
+.ft CR
 .
 .RE
 .RE


From MAILER-DAEMON Sun Oct 22 05:02:06 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1e6C90-0004kZ-T2
	for mharc-groff-commit@gnu.org; Sun, 22 Oct 2017 05:02:06 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:57024)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6C8y-0004kN-VC
	for groff-commit@gnu.org; Sun, 22 Oct 2017 05:02:05 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6C8y-0001mW-B8
	for groff-commit@gnu.org; Sun, 22 Oct 2017 05:02:05 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:47987)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6C8y-0001mL-8c
	for groff-commit@gnu.org; Sun, 22 Oct 2017 05:02:04 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id BC1FA20A1A; Sun, 22 Oct 2017 05:02:02 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/01: Fix broken markup in groff_font(5).
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: "G. Branden Robinson" <g.branden.robinson@gmail.com>
In-Reply-To: groff@gnu.org
References: <20171022090201.30307.88528@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 9fc74c09433b89cd6af97e8ff97a3d1c3a05503d
Auto-Submitted: auto-generated
Message-Id: <20171022090203.BC1FA20A1A@vcs0.savannah.gnu.org>
Date: Sun, 22 Oct 2017 05:02:02 -0400 (EDT)
From: g.branden.robinson@gmail.com (G. Branden Robinson)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit/>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Oct 2017 09:02:05 -0000

gbranden pushed a commit to branch master
in repository groff.

commit 9fc74c09433b89cd6af97e8ff97a3d1c3a05503d
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Sun Oct 22 04:59:21 2017 -0400

    Fix broken markup in groff_font(5).
   =20
    The markup in the example of using groffer was incorrect.
   =20
    Also style fix "man\-page"(!) to "man page".
   =20
    Also note unique placement of very basic information in this obscure
    page.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 man/groff_font.5.man | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/man/groff_font.5.man b/man/groff_font.5.man
index 0b000fa..04e8d21 100644
--- a/man/groff_font.5.man
+++ b/man/groff_font.5.man
@@ -699,7 +699,8 @@ of device
 .
 .
 .P
-A man\-page
+.\" XXX: Why is this paragraph _here_, of all places?
+A man page
 .IR name ( n )
 of section
 .I n
@@ -711,7 +712,7 @@ can be viewed either with
 for text mode or
 .RS
 \[Do]
-.BI "groffer " n  name"
+.BI groffer " n name"
 .RE
 for graphical mode (default is PDF mode).
 .RE


From MAILER-DAEMON Sun Oct 22 05:04:37 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1e6CBR-00055Y-63
	for mharc-groff-commit@gnu.org; Sun, 22 Oct 2017 05:04:37 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:57222)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6CBP-00055R-6X
	for groff-commit@gnu.org; Sun, 22 Oct 2017 05:04:36 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6CBO-0002x3-D1
	for groff-commit@gnu.org; Sun, 22 Oct 2017 05:04:35 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:48003)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6CBO-0002wz-AX
	for groff-commit@gnu.org; Sun, 22 Oct 2017 05:04:34 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id 2DFB3209A7; Sun, 22 Oct 2017 05:04:34 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/01: Fix reflexive appositive in groff_hdtbl(7).
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: "G. Branden Robinson" <g.branden.robinson@gmail.com>
In-Reply-To: groff@gnu.org
References: <20171022090433.31098.97815@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: eceaa0c137061cc58924ea23677e261a47986bf7
Auto-Submitted: auto-generated
Message-Id: <20171022090434.2DFB3209A7@vcs0.savannah.gnu.org>
Date: Sun, 22 Oct 2017 05:04:33 -0400 (EDT)
From: g.branden.robinson@gmail.com (G. Branden Robinson)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit/>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Oct 2017 09:04:36 -0000

gbranden pushed a commit to branch master
in repository groff.

commit eceaa0c137061cc58924ea23677e261a47986bf7
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Sun Oct 22 05:04:04 2017 -0400

    Fix reflexive appositive in groff_hdtbl(7).
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 contrib/hdtbl/groff_hdtbl.7.man | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/hdtbl/groff_hdtbl.7.man b/contrib/hdtbl/groff_hdtbl.=
7.man
index 70179b6..767c7d9 100644
--- a/contrib/hdtbl/groff_hdtbl.7.man
+++ b/contrib/hdtbl/groff_hdtbl.7.man
@@ -14,7 +14,7 @@ groff_hdtbl \- groff `hdtbl' macros for generation of t=
ables
 .de co
 Copyright \[co] 2005-2014 Free Software Foundation, Inc.
=20
-This file is part of groff, the groff.
+This file is part of groff, the GNU roff type-setting system.
=20
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or


From MAILER-DAEMON Sun Oct 22 14:31:47 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1e6L2J-0003Bp-7g
	for mharc-groff-commit@gnu.org; Sun, 22 Oct 2017 14:31:47 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:35258)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6L2H-0003Av-Di
	for groff-commit@gnu.org; Sun, 22 Oct 2017 14:31:46 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6L2G-0005xa-Dr
	for groff-commit@gnu.org; Sun, 22 Oct 2017 14:31:45 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:54831)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6L2G-0005xV-9y
	for groff-commit@gnu.org; Sun, 22 Oct 2017 14:31:44 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id 15FD420A4E; Sun, 22 Oct 2017 14:31:43 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/01: pdfpic: Suppress warning if in compatibility mode.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: "G. Branden Robinson" <g.branden.robinson@gmail.com>
In-Reply-To: groff@gnu.org
References: <20171022183143.22519.13724@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 4328d0964fbb3541f9402e05d45b16716661d457
Auto-Submitted: auto-generated
Message-Id: <20171022183144.15FD420A4E@vcs0.savannah.gnu.org>
Date: Sun, 22 Oct 2017 14:31:43 -0400 (EDT)
From: g.branden.robinson@gmail.com (G. Branden Robinson)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit/>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Oct 2017 18:31:46 -0000

gbranden pushed a commit to branch master
in repository groff.

commit 4328d0964fbb3541f9402e05d45b16716661d457
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Sun Oct 22 14:13:43 2017 -0400

    pdfpic: Suppress warning if in compatibility mode.
   =20
    When saving the value of compatibility mode, do so using an old-style
    register reference since compatibility mode may not yet be off.
   =20
    Fixes Savannah #51945.
   =20
    Signed-off-by: Bjarni Ingi Gislason <bjarniig@rhi.hi.is>
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 tmac/pdfpic.tmac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tmac/pdfpic.tmac b/tmac/pdfpic.tmac
index 16ac9e1..3267ea6 100644
--- a/tmac/pdfpic.tmac
+++ b/tmac/pdfpic.tmac
@@ -14,7 +14,7 @@
 .
 .do if d PDFPIC .nx
 .
-.nr _C \n[.C]
+.nr _C \n(.C
 .cp 0
 .
 .de @abort


From MAILER-DAEMON Sun Oct 22 15:12:50 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1e6Lg2-00011p-Lm
	for mharc-groff-commit@gnu.org; Sun, 22 Oct 2017 15:12:50 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:40988)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6Lg0-00011e-Lh
	for groff-commit@gnu.org; Sun, 22 Oct 2017 15:12:49 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6Lfz-0004EW-NI
	for groff-commit@gnu.org; Sun, 22 Oct 2017 15:12:48 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:55220)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6Lfz-0004EN-Jb
	for groff-commit@gnu.org; Sun, 22 Oct 2017 15:12:47 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id 32643209A7; Sun, 22 Oct 2017 15:12:47 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/02: groff(7): Move note about Info manual to the top.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: "G. Branden Robinson" <g.branden.robinson@gmail.com>
In-Reply-To: groff@gnu.org
References: <20171022191246.5753.73991@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: eeec89c3021f56603578d8ccae4febd079ab3edd
Auto-Submitted: auto-generated
Message-Id: <20171022191247.32643209A7@vcs0.savannah.gnu.org>
Date: Sun, 22 Oct 2017 15:12:46 -0400 (EDT)
From: g.branden.robinson@gmail.com (G. Branden Robinson)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit/>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Oct 2017 19:12:49 -0000

gbranden pushed a commit to branch master
in repository groff.

commit eeec89c3021f56603578d8ccae4febd079ab3edd
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Sun Oct 22 15:09:09 2017 -0400

    groff(7): Move note about Info manual to the top.
   =20
    This paragraph is easy to overlook at its current place.
   =20
    Fixes Savannah #50990.
   =20
    Signed-off-by: Bjarni Ingi Gislason <bjarniig@rhi.hi.is>
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 man/groff.7.man | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/man/groff.7.man b/man/groff.7.man
index 96f8978..620c6d0 100644
--- a/man/groff.7.man
+++ b/man/groff.7.man
@@ -246,6 +246,14 @@ Werner Lemberg
 .SH DESCRIPTION
 .\" --------------------------------------------------------------------
 .
+.B Important:
+This file is only a short version of the complete documentation that
+is found in the
+.I groff
+.BR info (1)
+file, which contains more detailed, actual, and concise information.
+.
+.P
 The name
 .I groff
 stands for
@@ -290,13 +298,6 @@ is the general term for the language.
 .
 .
 .P
-This file is only a short version of the complete documentation that
-is found in the
-.I groff
-.BR info (1)
-file, which contains more detailed, actual, and concise information.
-.
-.P
 The general syntax for writing groff documents is relatively easy, but
 writing extensions to the roff language can be a bit harder.
 .


From MAILER-DAEMON Sun Oct 22 15:12:51 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1e6Lg3-00012D-4U
	for mharc-groff-commit@gnu.org; Sun, 22 Oct 2017 15:12:51 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:40986)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6Lg0-00011d-Ih
	for groff-commit@gnu.org; Sun, 22 Oct 2017 15:12:49 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6Lfz-0004EZ-Ni
	for groff-commit@gnu.org; Sun, 22 Oct 2017 15:12:48 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:55222)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6Lfz-0004EO-Jh
	for groff-commit@gnu.org; Sun, 22 Oct 2017 15:12:47 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id 5AFB8209B1; Sun, 22 Oct 2017 15:12:47 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 02/02: groff_diff(7): Fix subject/verb agreement.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: "G. Branden Robinson" <g.branden.robinson@gmail.com>
In-Reply-To: groff@gnu.org
References: <20171022191246.5753.73991@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 061216fff5dd1aa8555c8aff9734f426fc8a14cc
Auto-Submitted: auto-generated
Message-Id: <20171022191247.5AFB8209B1@vcs0.savannah.gnu.org>
Date: Sun, 22 Oct 2017 15:12:47 -0400 (EDT)
From: g.branden.robinson@gmail.com (G. Branden Robinson)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit/>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Oct 2017 19:12:49 -0000

gbranden pushed a commit to branch master
in repository groff.

commit 061216fff5dd1aa8555c8aff9734f426fc8a14cc
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Sun Oct 22 15:11:35 2017 -0400

    groff_diff(7): Fix subject/verb agreement.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 man/groff_diff.7.man | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/man/groff_diff.7.man b/man/groff_diff.7.man
index f68f455..497610d 100644
--- a/man/groff_diff.7.man
+++ b/man/groff_diff.7.man
@@ -2635,7 +2635,7 @@ then both an inter-word space and a sentence space =
are added; if
 two spaces follow the end of a sentence in the middle of a line, then
 the second space is a sentence space.
 .
-Note that the behaviour of UNIX troff are exactly that exhibited
+Note that the behaviour of UNIX troff is exactly that exhibited
 by GNU troff if a second argument is never given to the
 .B ss
 request.


From MAILER-DAEMON Sun Oct 22 15:33:43 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1e6M0F-0004FU-M2
	for mharc-groff-commit@gnu.org; Sun, 22 Oct 2017 15:33:43 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:43779)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6M0C-0004FJ-Iy
	for groff-commit@gnu.org; Sun, 22 Oct 2017 15:33:42 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6M0B-0003ew-2W
	for groff-commit@gnu.org; Sun, 22 Oct 2017 15:33:40 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:55456)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6M0A-0003ei-Vf
	for groff-commit@gnu.org; Sun, 22 Oct 2017 15:33:39 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id B94A720A32; Sun, 22 Oct 2017 15:33:38 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/01: Fix bad grammar "allows <infinitive>".
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: "G. Branden Robinson" <g.branden.robinson@gmail.com>
In-Reply-To: groff@gnu.org
References: <20171022193338.13990.37302@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 389358ea5a250bb3ac0ef631e81334c961b089a7
Auto-Submitted: auto-generated
Message-Id: <20171022193338.B94A720A32@vcs0.savannah.gnu.org>
Date: Sun, 22 Oct 2017 15:33:38 -0400 (EDT)
From: g.branden.robinson@gmail.com (G. Branden Robinson)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit/>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Oct 2017 19:33:42 -0000

gbranden pushed a commit to branch master
in repository groff.

commit 389358ea5a250bb3ac0ef631e81334c961b089a7
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Sun Oct 22 15:24:58 2017 -0400

    Fix bad grammar "allows <infinitive>".
   =20
    I corrected all occurences of this Denglish construction I could find=
.
    In standard English, the verb "allows" can never take an infinitive a=
s
    its _direct_ object.  Fortunately, there are many alternatives availa=
ble
    to the recaster.
   =20
    See, e.g., <https://english.stackexchange.com/a/85080> et seq.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 contrib/gperl/gperl.1.man         |  4 ++--
 contrib/gpinyin/gpinyin.1.man     |  2 +-
 contrib/groffer/groffer.1.man     |  4 ++--
 doc/groff.texi                    | 10 +++++-----
 doc/webpage.ms                    |  2 +-
 man/groff.7.man                   |  2 +-
 man/groff_diff.7.man              |  4 ++--
 man/groff_out.5.man               |  4 ++--
 src/preproc/preconv/preconv.1.man |  2 +-
 src/roff/groff/groff.1.man        |  4 ++--
 10 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/contrib/gperl/gperl.1.man b/contrib/gperl/gperl.1.man
index 6cc949e..c0b7697 100644
--- a/contrib/gperl/gperl.1.man
+++ b/contrib/gperl/gperl.1.man
@@ -78,9 +78,9 @@ The license text is available in the internet at
 This is a preprocesor for
 .BR \%groff (@MAN1EXT@).
 .
-It allows to add
+It allows the use of
 .BR perl (7)
-code into
+code in
 .BR groff (7)
 files.
 .
diff --git a/contrib/gpinyin/gpinyin.1.man b/contrib/gpinyin/gpinyin.1.ma=
n
index 0ed2d07..91c0935 100644
--- a/contrib/gpinyin/gpinyin.1.man
+++ b/contrib/gpinyin/gpinyin.1.man
@@ -61,7 +61,7 @@ This file was written by Bernd Warken <groff-bernd.wark=
en-72@web.de>.
 This is a preprocesor for
 .BR \%groff (@MAN1EXT@).
 .
-It allows to add the Chinese European-like language
+It allows use of the Chinese European-like language
 .I Pinyin
 into
 .BR groff (7)
diff --git a/contrib/groffer/groffer.1.man b/contrib/groffer/groffer.1.ma=
n
index 3054acd..946c777 100644
--- a/contrib/groffer/groffer.1.man
+++ b/contrib/groffer/groffer.1.man
@@ -1853,7 +1853,7 @@ This can optionally be followed by a string, the so=
-called
 .IR extension .
 The
 .I extension
-allows to store several
+allows the storage of several
 .I man\~pages
 with the same name in the same
 .IR section .
@@ -2113,7 +2113,7 @@ in a dvi viewer program
 The
 .I \%pdf\~mode
 has a major advantage \(em it is the only graphical display mode that
-allows to search for text within the viewer; this can be a really
+allows searching for text within the viewer; this can be a really
 important feature.
 .
 Unfortunately, it takes some time to transform the input into the PDF
diff --git a/doc/groff.texi b/doc/groff.texi
index 98d1f17..88e5248 100644
--- a/doc/groff.texi
+++ b/doc/groff.texi
@@ -5614,7 +5614,7 @@ request), and set to@tie{}0 otherwise.
=20
 @cindex modifying requests
 @cindex requests, modifying
-This allows to reliably modify requests.
+This allows reliable modification of requests.
=20
 @Example
 .als bp*orig bp
@@ -15833,10 +15833,10 @@ newline character.
=20
 The normal commands, those for positioning and text, consist of a single
 letter taking a fixed number of arguments.  For historical reasons, the
-parser allows to stack such commands on the same line, but fortunately,
-in @code{gtroff}'s intermediate output, every command with at least one
-argument is followed by a line break, thus providing excellent
-readability.
+parser allows stacking of such commands on the same line, but
+fortunately, in @code{gtroff}'s intermediate output, every command with
+at least one argument is followed by a line break, thus providing
+excellent readability.
=20
 The other commands -- those for drawing and device controlling -- have a
 more complicated structure; some recognize long command names, and some
diff --git a/doc/webpage.ms b/doc/webpage.ms
index 2c75858..2bf6ee0 100644
--- a/doc/webpage.ms
+++ b/doc/webpage.ms
@@ -618,7 +618,7 @@ equivalents to the \eX and \eY escapes, respectively.
 .LI
 A new read-only number register `.br' is available which is set to\~1
 if a macro is called as .foo and to\~0 if called as 'foo.
-This allows to reliably modify requests.
+This allows reliable modification of requests.
=20
 .in 2m
 .nf
diff --git a/man/groff.7.man b/man/groff.7.man
index 620c6d0..b35e1ec 100644
--- a/man/groff.7.man
+++ b/man/groff.7.man
@@ -3569,7 +3569,7 @@ Plus-minus sign
 .
 There is the extended escape
 .B u
-that allows to include all available Unicode characters into some
+that allows the inclusion of all available Unicode characters into some
 .I roff
 file.
 .
diff --git a/man/groff_diff.7.man b/man/groff_diff.7.man
index 497610d..a38554c 100644
--- a/man/groff_diff.7.man
+++ b/man/groff_diff.7.man
@@ -2686,7 +2686,7 @@ Within a macro call, it is set to\~1 if the macro i=
s called with the
 \[oq]normal\[cq] control character (\[oq].\[cq] by default), and set
 to\~0 otherwise.
 .
-This allows to reliably modify requests.
+This allows the reliable modification of requests.
 .
 .RS
 .IP
@@ -3678,7 +3678,7 @@ for groff.
 .I groff
 provides a
 .B compatibility mode
-that allows to process roff code written for classical
+that allows the processing of roff code written for classical
 .B troff
 or for other implementations of roff in a consistent way.
 .
diff --git a/man/groff_out.5.man b/man/groff_out.5.man
index 994ed72..3f2f082 100644
--- a/man/groff_out.5.man
+++ b/man/groff_out.5.man
@@ -301,7 +301,7 @@ that is optionally followed by a comment, and a newli=
ne character.
 The normal commands, those for positioning and text, consist of a
 single letter taking a fixed number of arguments.
 .
-For historical reasons, the parser allows to stack such commands on
+For historical reasons, the parser allows stacking of such commands on
 the same line, but fortunately, in
 .I groff intermediate
 .IR output ,
@@ -949,7 +949,7 @@ Draw a solid circle using the current fill color with=
 diameter\~\c
 with leftmost point at the current position; then move the current
 position to the rightmost point of the circle.
 .
-An optional second integer argument is ignored (this allows to the
+An optional second integer argument is ignored (this allows the
 formatter to generate an even number of arguments).
 .
 This command is a
diff --git a/src/preproc/preconv/preconv.1.man b/src/preproc/preconv/prec=
onv.1.man
index 70ae3c3..5e3b875 100644
--- a/src/preproc/preconv/preconv.1.man
+++ b/src/preproc/preconv/preconv.1.man
@@ -181,7 +181,7 @@ The Unicode Standard defines character U+FEFF as the =
Byte Order Mark
 On the other hand, value U+FFFE is guaranteed not be a Unicode character=
 at
 all.
 .
-This allows to detect the byte order within the data stream (either
+This allows detection of the byte order within the data stream (either
 big-endian or lower-endian), and the MIME encodings \%\[oq]UTF-16\[cq]
 and \%\[oq]UTF-32\[cq] mandate that the data stream starts with U+FEFF.
 .
diff --git a/src/roff/groff/groff.1.man b/src/roff/groff/groff.1.man
index 192e732..62fb40e 100644
--- a/src/roff/groff/groff.1.man
+++ b/src/roff/groff/groff.1.man
@@ -138,7 +138,7 @@ but adds many extensions.
 .P
 The
 .B groff
-program allows to control the whole
+program allows control of the whole
 .I groff
 system by command line options.
 .
@@ -863,7 +863,7 @@ program is a wrapper around the
 .BR @g@troff (@MAN1EXT@)
 program.
 .
-It allows to specify the preprocessors by command line options and
+It allows one to specify the preprocessors by command line options and
 automatically runs the postprocessor that is appropriate for the
 selected device.
 .


From MAILER-DAEMON Sun Oct 22 16:17:02 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1e6MgA-0003wY-Nh
	for mharc-groff-commit@gnu.org; Sun, 22 Oct 2017 16:17:02 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:50286)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6Mg4-0003v8-3I
	for groff-commit@gnu.org; Sun, 22 Oct 2017 16:17:01 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6Mfx-0003DZ-Lg
	for groff-commit@gnu.org; Sun, 22 Oct 2017 16:16:56 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:55863)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6Mfx-0003DQ-DX
	for groff-commit@gnu.org; Sun, 22 Oct 2017 16:16:49 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id 35478209A7; Sun, 22 Oct 2017 16:16:49 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/01: Fix grammar of "command-line" where needed.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: "G. Branden Robinson" <g.branden.robinson@gmail.com>
In-Reply-To: groff@gnu.org
References: <20171022201648.30864.39282@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: f81a9e32d0b1f80344d8b4dc39ab505b14151e11
Auto-Submitted: auto-generated
Message-Id: <20171022201649.35478209A7@vcs0.savannah.gnu.org>
Date: Sun, 22 Oct 2017 16:16:48 -0400 (EDT)
From: g.branden.robinson@gmail.com (G. Branden Robinson)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit/>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Oct 2017 20:17:01 -0000

gbranden pushed a commit to branch master
in repository groff.

commit f81a9e32d0b1f80344d8b4dc39ab505b14151e11
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Sun Oct 22 16:08:00 2017 -0400

    Fix grammar of "command-line" where needed.
   =20
    When used attributively, e.g. as an adjectival phrase, "command-line"
    should be hyphenated.  See, for instance,
    <http://www.chicagomanualofstyle.org/16/images/ch07_tab01.pdf>.
   =20
    Also found and fixed one error in the reverse direction in tmac/s.tma=
c.
   =20
    I did not bother to fix mistaken uses in change logs, NEWS files, and
    similar, but did in source comments.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 contrib/glilypond/args.pl            |  6 ++--
 contrib/glilypond/glilypond.1.man    |  8 +++---
 contrib/glilypond/glilypond.pl       |  4 +--
 contrib/groffer/README               |  2 +-
 contrib/groffer/groffer.1.man        | 22 +++++++--------
 contrib/groffer/main_subs.pl         |  6 ++--
 contrib/groffer/man.pl               |  2 +-
 contrib/mm/groff_mm.7.man            | 10 +++----
 contrib/mom/momdoc/docelement.html   |  2 +-
 contrib/mom/momdoc/using.html        |  4 +--
 doc/groff.texi                       | 54 ++++++++++++++++++------------=
------
 doc/webpage.ms                       | 32 ++++++++++-----------
 m4/groff.m4                          |  6 ++--
 man/groff.7.man                      |  6 ++--
 man/groff_diff.7.man                 | 12 ++++----
 man/groff_tmac.5.man                 |  8 +++---
 man/roff.7.man                       |  6 ++--
 src/devices/grodvi/grodvi.1.man      |  2 +-
 src/devices/grolbp/grolbp.1.man      |  8 +++---
 src/devices/grolbp/lbp.cpp           |  2 +-
 src/devices/grolj4/grolj4.1.man      |  2 +-
 src/devices/gropdf/gropdf.1.man      |  2 +-
 src/devices/grops/grops.1.man        |  4 +--
 src/devices/xditview/TODO            |  2 +-
 src/devices/xditview/gxditview.1.man |  4 +--
 src/preproc/eqn/eqn.1.man            |  2 +-
 src/preproc/grn/grn.1.man            |  2 +-
 src/preproc/html/pre-html.cpp        |  2 +-
 src/preproc/pic/TODO                 |  2 +-
 src/preproc/preconv/preconv.1.man    |  2 +-
 src/preproc/preconv/preconv.cpp      |  2 +-
 src/preproc/refer/refer.1.man        |  2 +-
 src/preproc/soelim/soelim.1.man      |  2 +-
 src/roff/groff/groff.1.man           | 16 +++++------
 src/roff/nroff/nroff.1.man           |  2 +-
 src/roff/troff/troff.1.man           |  6 ++--
 src/utils/afmtodit/afmtodit.1.man    |  2 +-
 src/utils/indxbib/indxbib.1.man      |  2 +-
 src/utils/lkbib/lkbib.1.man          |  2 +-
 src/utils/lookbib/lookbib.1.man      |  2 +-
 src/utils/tfmtodit/tfmtodit.1.man    |  2 +-
 src/utils/xtotroff/xtotroff.1.man    |  2 +-
 tmac/a4.tmac                         |  2 +-
 tmac/doc.tmac-u                      |  2 +-
 tmac/groff_man.7.man                 |  4 +--
 tmac/groff_mdoc.7.man                |  8 +++---
 tmac/groff_trace.7.man               |  8 +++---
 tmac/papersize.tmac                  |  2 +-
 tmac/s.tmac                          |  2 +-
 tmac/trace.tmac                      |  2 +-
 50 files changed, 149 insertions(+), 149 deletions(-)

diff --git a/contrib/glilypond/args.pl b/contrib/glilypond/args.pl
index fef5ae2..794e7ad 100644
--- a/contrib/glilypond/args.pl
+++ b/contrib/glilypond/args.pl
@@ -112,7 +112,7 @@ my @files =3D EMPTYARRAY;
=20
=20
 #----------
-# first run for command line arguments
+# first run for command-line arguments
 #----------
=20
 # global variables for first run
@@ -386,7 +386,7 @@ sub install_verbose {
   $v->print( $Globals->{'prog'} . " is" . $s .
 	     " installed." );
=20
-  $v->print( 'The command line options are:' );
+  $v->print( 'The command-line options are:' );
=20
   $s =3D "  options:";
   $s .=3D " `" . $_ . "'" for ( @ARGV );
@@ -399,7 +399,7 @@ sub install_verbose {
=20
=20
 #----------
-# second run of command line arguments
+# second run of command-line arguments
 #----------
 sub run_second {
     # Second run of args with new @ARGV from the former splitting.
diff --git a/contrib/glilypond/glilypond.1.man b/contrib/glilypond/glilyp=
ond.1.man
index af1bf3c..6e74a77 100644
--- a/contrib/glilypond/glilypond.1.man
+++ b/contrib/glilypond/glilypond.1.man
@@ -622,7 +622,7 @@ stored in a temporary directory.
 .
 .
 .P
-This process can be changed by command line options.
+This process can be changed by command-line options.
 .
 .
 .\" --------------------------------------------------------------------
@@ -643,7 +643,7 @@ files that are later on referred by
 command in the final
 .I groff
 output can be stored in a different directory that can be set by the
-command line option
+command-line option
 .BR -e | --eps_dir
 .IR directory_name .
 .
@@ -653,7 +653,7 @@ the end of the program.
 .
 .P
 The beginning of the names of the temporary files can be set by the
-command line option
+command-line option
 .OP -p | --prefix
 .IR begin_of_name .
 .
@@ -663,7 +663,7 @@ All of the temporary files except the
 .I EPS
 files are deleted finally.
 .
-This can be changed by setting the command line option
+This can be changed by setting the command-line option
 .OP -k | --keep_files .
 .
 With this, all temporary files and directories are kept, not deleted.
diff --git a/contrib/glilypond/glilypond.pl b/contrib/glilypond/glilypond=
.pl
index 47d2ee1..1c78cfc 100755
--- a/contrib/glilypond/glilypond.pl
+++ b/contrib/glilypond/glilypond.pl
@@ -164,10 +164,10 @@ our $out;
=20
=20
 ########################################################################
-# Args: command line arguments
+# Args: command-line arguments
 ########################################################################
=20
-# command line arguments are handled in 2 runs:
+# command-line arguments are handled in 2 runs:
 # 1) split short option collections, `=3D' optargs, and transfer abbrevs
 # 2) handle the transferred options with subs
=20
diff --git a/contrib/groffer/README b/contrib/groffer/README
index e2b3efd..4187c97 100644
--- a/contrib/groffer/README
+++ b/contrib/groffer/README
@@ -8,7 +8,7 @@ many operating systems.  All `roff' preprocessors, such a=
s `chem' or
=20
 Input
=20
-Input comes from either standard input or command line parameters that
+Input comes from either standard input or command-line parameters that
 represent names of exisiting roff files or standardized specifications
 for searching man pages.  All of these can be compressed in a format
 that is decompressible by `gzip' or `bzip2', including `.gz', `bz2',
diff --git a/contrib/groffer/groffer.1.man b/contrib/groffer/groffer.1.ma=
n
index 946c777..378c6fb 100644
--- a/contrib/groffer/groffer.1.man
+++ b/contrib/groffer/groffer.1.man
@@ -183,7 +183,7 @@ But all parts can also be controlled manually by argu=
ments.
 .
 .
 .P
-Several file names can be specified on the command line arguments.
+Several file names can be specified on the command-line arguments.
 .
 They are transformed into a single document in the normal way of
 .BR \%groff .
@@ -585,7 +585,7 @@ Equivalent to
 .
 .TP
 .B \-\-default
-Reset all configuration from previously processed command line options
+Reset all configuration from previously processed command-line options
 to the default values.
 .
 This is useful to wipe out all former options of the configuration, in
@@ -1302,7 +1302,7 @@ The default is looking up for local files.
 .
 .TP
 .B \-\-man
-Check the non-option command line arguments
+Check the non-option command-line arguments
 .nh
 .RI ( filespecs )
 .hy
@@ -1689,7 +1689,7 @@ files, do not delete them during the run of
 Print the parameters, as obtained from the configuration files, from
 .SM
 .BR \%GROFFER_OPT ,
-and the command line arguments.
+and the command-line arguments.
 .
 .
 .TP
@@ -2425,7 +2425,7 @@ This can be overridden by an option in
 .BR \%$MANOPT .
 .
 .IP \*(BU 2m
-This again is overridden by the command line option
+This again is overridden by the command-line option
 .BR \-\-systems .
 .
 .
@@ -2487,7 +2487,7 @@ This can be overridden by providing an option in
 .BR \%$MANOPT .
 .
 .IP \*(BU 2m
-All these environment variables are overridden by the command line
+All these environment variables are overridden by the command-line
 option
 .BR \-\-locale .
 .
@@ -3589,7 +3589,7 @@ program is written in Perl, the Perl version during=
 writing was v5.8.8.
 .
 .P
 .B \%groffer
-provides its own parser for command line arguments that is compatible
+provides its own parser for command-line arguments that is compatible
 to both \%\f(CRPOSIX\fP
 .BR \%getopts (1)
 and \%\f(CRGNU\fP
@@ -3620,7 +3620,7 @@ is equivalent to
 Long options are options with names longer than one character; they
 are always preceded by a double minus.
 .
-An option argument can either go to the next command line argument or
+An option argument can either go to the next command-line argument or
 be appended with an equal sign to the argument; for example,
 .B \-\-long=3Darg
 is equivalent to
@@ -3630,7 +3630,7 @@ is equivalent to
 .IP \*(BU 2m
 An argument of
 .B \-\-
-ends option parsing; all further command line arguments are
+ends option parsing; all further command-line arguments are
 interpreted as
 .I \%filespec
 parameters, i.e.\& file names or constructs for searching
@@ -3638,7 +3638,7 @@ parameters, i.e.\& file names or constructs for sea=
rching
 .
 .
 .IP \*(BU 2m
-All command line arguments that are neither options nor option
+All command-line arguments that are neither options nor option
 arguments are interpreted as
 .I \%filespec
 parameters and stored until option parsing has finished.
@@ -3723,7 +3723,7 @@ all of them can be used with
 .BR \%grog (@MAN1EXT@)
 This program tries to guess the necessary
 .B \%groff
-command line options from the input and the
+command-line options from the input and the
 .B groffer
 options.
 .
diff --git a/contrib/groffer/main_subs.pl b/contrib/groffer/main_subs.pl
index 67d2cc8..8dd4276 100644
--- a/contrib/groffer/main_subs.pl
+++ b/contrib/groffer/main_subs.pl
@@ -134,9 +134,9 @@ sub main_set_options {
   'encoding', 'extension', 'locale');
=20
 ### main_set_options()
-  ###### collections of command line options
+  ###### collections of command-line options
=20
-  # There are two hashes that control the whole of the command line
+  # There are two hashes that control the whole of the command-line
   # options, one for short and one for long options.  Options without
   # and with arguments are mixed by advicing a value of 0 for an option
   # without argument and a value of 1 for an option with argument.
@@ -434,7 +434,7 @@ sub main_config_params {	# handle configuration files
     chomp @GROFFER_OPT;
   }
=20
-  # Handle command line parameters together with $GROFFER_OPT.
+  # Handle command-line parameters together with $GROFFER_OPT.
   # Options can be abbreviated, with each - as abbreviation place.
   {
     my @argv0 =3D (@GROFFER_OPT, @ARGV);
diff --git a/contrib/groffer/man.pl b/contrib/groffer/man.pl
index 02a4afa..ade82f4 100644
--- a/contrib/groffer/man.pl
+++ b/contrib/groffer/man.pl
@@ -342,7 +342,7 @@ sub man_get {
 # $LC_ALL; this has the same precedence as
 # $MANPATH, $MANSEC, $PAGER, $SYSTEM; overridden by
 # $MANOPT; overridden by
-# the groffer command line options.
+# the groffer command-line options.
 #
 # $MANROFFSEQ is ignored because grog determines the preprocessors.
 #
diff --git a/contrib/mm/groff_mm.7.man b/contrib/mm/groff_mm.7.man
index 929a46b..4794828 100644
--- a/contrib/mm/groff_mm.7.man
+++ b/contrib/mm/groff_mm.7.man
@@ -227,7 +227,7 @@ From a practical point of view it doesn't make a big =
difference
 request or using
 .BR groff 's
 .B \-f
-command line option.
+command-line option.
 .
 On the other hand, if you want to replace just, say, font
 .BR B ,
@@ -2360,7 +2360,7 @@ while setting new width and length.
 .
 (It seems as if this macro sometimes doesn't work too well.
 .
-Use the command line arguments to change
+Use the command-line arguments to change
 line length, page length, and page offset instead.)
 .
 .TP
@@ -3616,7 +3616,7 @@ Useless inside of a document.
 .
 .TP
 .B L
-Page length, only for command line settings.
+Page length, only for command-line settings.
 .
 .TP
 .B Letwam
@@ -3721,7 +3721,7 @@ Default is\~0.
 .
 .TP
 .B O
-Page offset, only for command line settings.
+Page offset, only for command-line settings.
 .
 .TP
 .B Of
@@ -3850,7 +3850,7 @@ Default is 5n.
 .
 .TP
 .B W
-Line length, only for command line settings.
+Line length, only for command-line settings.
 .
 .TP
 .B .mgm
diff --git a/contrib/mom/momdoc/docelement.html b/contrib/mom/momdoc/doce=
lement.html
index 8d67f3b..cd1ffa2 100644
--- a/contrib/mom/momdoc/docelement.html
+++ b/contrib/mom/momdoc/docelement.html
@@ -1989,7 +1989,7 @@ indented from the left margin.  Obviously, she&#821=
7;s thinking
 &#8220;quotes from poetry or song lyrics&#8221;, but with the
 <a href=3D"#quote-control">QUOTE control macros</a>
 you can change her defaults so QUOTE serves other needs, eg
-entering verbatim snippets of programming code, command line
+entering verbatim snippets of programming code, command-line
 instructions, and so on.  (See the
 <a href=3D"#code">CODE</a>
 for a convenience macro to assist in including code snippets in
diff --git a/contrib/mom/momdoc/using.html b/contrib/mom/momdoc/using.htm=
l
index 630fc51..67a34e9 100644
--- a/contrib/mom/momdoc/using.html
+++ b/contrib/mom/momdoc/using.html
@@ -210,7 +210,7 @@ You may also, if you wish, add a comment to the end o=
f a line with
 <h2 id=3D"viewing" class=3D"docs">Processing and viewing documents</h2>
=20
 <p>
-The most basic command line usage for processing a file formatted
+The most basic command-line usage for processing a file formatted
 with the mom macros is
 <br/>
 <span class=3D"pre-in-pp">
@@ -256,7 +256,7 @@ it:
   pdfmom filename.mom &gt; filename.pdf
 </span>
 <strong>pdfmom</strong> is a wrapper around groff, and accepts all
-groff's command line options as listed in the groff manpage.
+groff's command-line options as listed in the groff manpage.
 Full usage is explained in the manual,
 <a href=3D"http://www.schaffter.ca/mom/pdf/mom-pdf.pdf"><span class=3D"b=
ook-title">Producing PDFs with groff and mom</span></a>.
 </p>
diff --git a/doc/groff.texi b/doc/groff.texi
index 88e5248..ff397fc 100644
--- a/doc/groff.texi
+++ b/doc/groff.texi
@@ -1028,7 +1028,7 @@ gtbl}, @ref{Invoking ggrn}, @ref{Invoking grefer}, =
@ref{Invoking gchem},
 @ref{Invoking grodvi}, @ref{Invoking grolj4}, @ref{Invoking grolbp}, and
 @ref{Invoking gxditview}.
=20
-The command line format for @code{groff} is:
+The command-line format for @code{groff} is:
=20
 @Example
 groff [ -abceghijklpstvzCEGNRSUVXZ ] [ -d@var{cs} ] [ -D@var{arg} ]
@@ -1038,7 +1038,7 @@ groff [ -abceghijklpstvzCEGNRSUVXZ ] [ -d@var{cs} ]=
 [ -D@var{arg} ]
       [ -w@var{name} ] [ -W@var{name} ] [ @var{files}@dots{} ]
 @endExample
=20
-The command line format for @code{gtroff} is as follows.
+The command-line format for @code{gtroff} is as follows.
=20
 @Example
 gtroff [ -abcivzCERU ] [ -d@var{cs} ] [ -f@var{fam} ] [ -F@var{dir} ]
@@ -1423,10 +1423,10 @@ none otherwise.
 @tindex GROFF_ENCODING@r{, environment variable}
 The value of this environment value is passed to the @code{preconv}
 preprocessor to select the encoding of input files.  Setting this option
-implies @code{groff}'s command line option @option{-k} (that is,
+implies @code{groff}'s command-line option @option{-k} (that is,
 @code{groff} actually always calls @code{preconv}).  If set without a
 value, @code{groff} calls @code{preconv} without arguments.  An explicit
-@option{-K} command line option overrides the value of
+@option{-K} command-line option overrides the value of
 @env{GROFF_ENCODING}.  See the manual page of @code{preconv} for details=
.
=20
 @item GROFF_FONT_PATH
@@ -1476,7 +1476,7 @@ above.
 @cindex macros, searching
=20
 All macro file names must be named @code{@var{name}.tmac} or
-@code{tmac.@var{name}} to make the @option{-m@var{name}} command line
+@code{tmac.@var{name}} to make the @option{-m@var{name}} command-line
 option work.  The @code{mso} request doesn't have this restriction; any
 file name can be used, and @code{gtroff} won't try to append or prepend
 the @samp{tmac} string.
@@ -1495,7 +1495,7 @@ macro files are (in that order):
 @itemize @bullet
 @item
 The directories specified with @code{gtroff}'s or @code{groff}'s
-@option{-M} command line option.
+@option{-M} command-line option.
=20
 @item
 @tindex GROFF_TMAC_PATH@r{, environment variable}
@@ -1509,7 +1509,7 @@ The directories given in the @env{GROFF_TMAC_PATH} =
environment variable.
 @cindex current directory
 @cindex directory, current
 The current directory (only if in unsafe mode using the @option{-U}
-command line switch).
+command-line switch).
=20
 @item
 @cindex home directory
@@ -1569,7 +1569,7 @@ The elements of the search path for font files are =
(in that order):
 @itemize @bullet
 @item
 The directories specified with @code{gtroff}'s or @code{groff}'s
-@option{-F} command line option.  All device drivers and some
+@option{-F} command-line option.  All device drivers and some
 preprocessors also have this option.
=20
 @item
@@ -1609,7 +1609,7 @@ handled separately.  @xref{Page Layout}, for vertic=
al manipulation of
 the page size.  @xref{Line Layout}, for horizontal changes.
=20
 A default paper size can be set in the device's @file{DESC} file.  Most
-output devices also have a command line option @option{-p} to override
+output devices also have a command-line option @option{-p} to override
 the default paper size and option @option{-l} to use landscape
 orientation.  @xref{DESC File Format}, for a description of the
 @code{papersize} keyword, which takes the same argument as @option{-p}.
@@ -1617,7 +1617,7 @@ orientation.  @xref{DESC File Format}, for a descri=
ption of the
 @pindex papersize.tmac
 @pindex troffrc
 A convenient shorthand to set a particular paper size for @code{gtroff}
-is command line option @option{-dpaper=3D@var{size}}.  This defines stri=
ng
+is command-line option @option{-dpaper=3D@var{size}}.  This defines stri=
ng
 @code{paper}, which is processed in file @file{papersize.tmac} (loaded i=
n
 the start-up file @file{troffrc} by default).  Possible values for
 @var{size} are the same as the predefined values for the
@@ -2247,7 +2247,7 @@ are based on it.
 @node Man options, Man usage, man, man
 @subsection Options
=20
-The command line format for using the @file{man} macros with
+The command-line format for using the @file{man} macros with
 @code{groff} is:
=20
 @Example
@@ -2496,7 +2496,7 @@ Finally, the macros @code{SH}, @code{SS}, @code{LP}=
 (@code{PP},
 @cindex @code{man} macros, how to set fonts
=20
 The standard font is roman; the default text size is 10@tie{}point.  If
-command line option @option{-rS=3D@var{n}} is given, use @var{n}@dmn{pt}
+command-line option @option{-rS=3D@var{n}} is given, use @var{n}@dmn{pt}
 as the default text size.
=20
 @Defmac {SM, [@Var{text}], man}
@@ -4968,7 +4968,7 @@ the file @file{latin1.tmac} is loaded at start-up.
 @cindex input encoding, @w{latin-2} (ISO @w{8859-2})
 @pindex latin2.tmac
 To use this encoding, either say @w{@samp{.mso latin2.tmac}} at the very
-beginning of your document or use @samp{-mlatin2} as a command line
+beginning of your document or use @samp{-mlatin2} as a command-line
 argument for @code{groff}.
=20
 @item latin-5
@@ -4978,7 +4978,7 @@ argument for @code{groff}.
 @cindex input encoding, @w{latin-5} (ISO @w{8859-9})
 @pindex latin5.tmac
 For Turkish.  Either say @w{@samp{.mso latin5.tmac}} at the very
-beginning of your document or use @samp{-mlatin5} as a command line
+beginning of your document or use @samp{-mlatin5} as a command-line
 argument for @code{groff}.
=20
 @item latin-9 (latin-0)
@@ -4991,7 +4991,7 @@ This encoding is intended (at least in Europe) to r=
eplace @w{latin-1}
 encoding.  The main difference to @w{latin-1} is that @w{latin-9}
 contains the Euro character.  To use this encoding, either say
 @w{@samp{.mso latin9.tmac}} at the very beginning of your document or
-use @samp{-mlatin9} as a command line argument for @code{groff}.
+use @samp{-mlatin9} as a command-line argument for @code{groff}.
 @end table
=20
 Note that it can happen that some input encoding characters are not
@@ -5018,7 +5018,7 @@ the box (@w{latin-2} isn't).
=20
 By its very nature, @option{-Tutf8} supports all input encodings;
 @option{-Tdvi} has support for both @w{latin-2} and @w{latin-9} if the
-command line @option{-mec} is used also to load the file @file{ec.tmac}
+command-line @option{-mec} is used also to load the file @file{ec.tmac}
 (which flips to the EC fonts).
=20
=20
@@ -6494,7 +6494,7 @@ GNU@tie{}@code{troff}; it exists for backward compa=
tibility.
 @cindex unsafe mode
 @cindex mode, unsafe
 @vindex .U
-If @code{gtroff} is called with the @option{-U} command line option to
+If @code{gtroff} is called with the @option{-U} command-line option to
 activate unsafe mode, the number register @code{.U} is set to@tie{}1,
 and to zero otherwise.  @xref{Groff Options}.
=20
@@ -6636,7 +6636,7 @@ running under GNU @code{troff}.
 @item \n[.A]
 @vindex .A
 @cindex @acronym{ASCII} approximation output register (@code{.A})
-If the command line option @option{-a} is used to produce an
+If the command-line option @option{-a} is used to produce an
 @acronym{ASCII} approximation of the output, this is set to@tie{}1, zero
 otherwise.  @xref{Groff Options}.
=20
@@ -6654,7 +6654,7 @@ information.
=20
 @item \n[.T]
 @vindex .T
-If @code{gtroff} is called with the @option{-T} command line option, the
+If @code{gtroff} is called with the @option{-T} command-line option, the
 number register @code{.T} is set to@tie{}1, and zero otherwise.
 @xref{Groff Options}.
=20
@@ -13396,7 +13396,7 @@ Internally, @code{color} sets a global flag; it d=
oes not produce a
 token.  Similar to the @code{cp} request, you should use it at the
 beginning of your document to control color output.
=20
-Colors can be also turned off with the @option{-c} command line option.
+Colors can be also turned off with the @option{-c} command-line option.
 @endDefreq
=20
 @Defreq {defcolor, ident scheme color_components}
@@ -13543,7 +13543,7 @@ bar
 yields @samp{This is foobar}.
=20
 The search path for @var{file} can be controlled with the @option{-I}
-command line option.
+command-line option.
 @endDefreq
=20
 @Defreq {pso, command}
@@ -13565,7 +13565,7 @@ for @code{pso} also.
 @Defreq {mso, file}
 Identical to the @code{so} request except that @code{gtroff} searches
 for the specified @var{file} in the same directories as macro files for
-the @option{-m} command line option.
+the @option{-m} command-line option.
 If the file name to be included has the form @file{@var{name}.tmac} and =
it
 isn't found, @code{mso} tries to include @file{tmac.@var{name}} and vice
 versa.
@@ -14111,7 +14111,7 @@ If an error occurs (for example, @code{psbb} cann=
ot find the
 zero.
=20
 The search path for @var{filename} can be controlled with the
-@option{-I} command line option.
+@option{-I} command-line option.
 @endDefreq
=20
=20
@@ -14328,7 +14328,7 @@ also @ref{I/O}.
 @endDefreq
=20
 When doing something involved it is useful to leave the debugging
-statements in the code and have them turned on by a command line flag.
+statements in the code and have them turned on by a command-line flag.
=20
 @Example
 .if \n(DB .tm debugging output
@@ -14466,7 +14466,7 @@ This request is active only if text is justified =
to both margins (using
 @endDefreq
=20
 @cindex warnings
-@code{gtroff} has command line options for printing out more warnings
+@code{gtroff} has command-line options for printing out more warnings
 (@option{-w}) and for printing backtraces (@option{-b}) when a warning
 or an error occurs.  The most verbose level of warnings is @option{-ww}.
=20
@@ -14679,8 +14679,8 @@ otherwise, turn it off.
 The read-only number register @code{.C} is@tie{}1 if compatibility mode
 is on, 0@tie{}otherwise.
=20
-Compatibility mode can be also turned on with the @option{-C} command
-line option.
+Compatibility mode can be also turned on with the @option{-C}
+command-line option.
=20
 The @code{do} request turns off compatibility mode while executing its
 arguments as a @code{gtroff} command.  However, it does not turn off
diff --git a/doc/webpage.ms b/doc/webpage.ms
index 2bf6ee0..98c0ac9 100644
--- a/doc/webpage.ms
+++ b/doc/webpage.ms
@@ -694,7 +694,7 @@ nroff
=20
 .ULS
 .LI
-Two new command line options `\-w' and `\-W' are accepted and passed to
+Two new command-line options `\-w' and `\-W' are accepted and passed to
 groff to enable and disable warning messages, respectively.
 .ULE
 .
@@ -804,11 +804,11 @@ grohtml
 XHTML support has been added.
=20
 .LI
-New command line option `\-V' (to be used in XHTML mode) to produce an
+New command-line option `\-V' (to be used in XHTML mode) to produce an
 XHTML validator button.
=20
 .LI
-New command line option `\-y' to produce a right-justified groff signatu=
re
+New command-line option `\-y' to produce a right-justified groff signatu=
re
 at the end of the document (in combination with option `\-V').
 .ULE
 .
@@ -933,7 +933,7 @@ DragonFly OS.
=20
 .LI
 If mdoc is used to print multiple man pages (together with the \-rcR=3D0
-command line option), each man page now starts a new page.
+command-line option), each man page now starts a new page.
=20
 .LI
 \-mtrace has been considerably improved, now showing number and string
@@ -1064,10 +1064,10 @@ This device driver has been raised to beta stage;=
 its set of tags should
 be stable now.
=20
 .LI
-New command line option `\-s' to set the base point size.
+New command-line option `\-s' to set the base point size.
=20
 .LI
-New command line option `\-S' to set the split level while generating
+New command-line option `\-S' to set the split level while generating
 multiple files.
 .ULE
 .
@@ -1234,7 +1234,7 @@ groff
=20
 .ULS
 .LI
-The argument of the command line option `\-I' is now also passed to trof=
f
+The argument of the command-line option `\-I' is now also passed to trof=
f
 and grops, specifying a directory to search for files on the command lin=
e,
 files named in `so' and `psbb' requests, and files named in \eX'ps:\~fil=
e'
 and \eX'ps:\~import' escapes.
@@ -1281,7 +1281,7 @@ They are equivalent to `dei' and `ami', respectivel=
y, but the macros
 are executed with compatibility mode off (similar to `de1' and `am1').
=20
 .LI
-New command line option `\-I' to specify a directory for files (both
+New command-line option `\-I' to specify a directory for files (both
 those on the command line and those named in `psbb' requests).
 This is also handled by the groff wrapper program.
=20
@@ -1345,7 +1345,7 @@ grops
=20
 .ULS
 .LI
-New command line option `\-I' to specify a directory to search for files
+New command-line option `\-I' to specify a directory to search for files
 on the command line and files named in \eX'ps:\~import' and \eX'ps:\~fil=
e'
 escapes.
 This is also handled by the groff wrapper program.
@@ -1711,12 +1711,12 @@ and others made the man macros more customizable.
=20
 .ULS
 .LI
-New command line options \-rFT, \-rIN, and \-rSN to set the vertical
+New command-line options \-rFT, \-rIN, and \-rSN to set the vertical
 location of the footer line, the body text indentation, and the
 sub-subheading indentation.
=20
 .LI
-New command line option \-rHY (similar to the ms macros) to control
+New command-line option \-rHY (similar to the ms macros) to control
 hyphenation.
=20
 .LI
@@ -1734,7 +1734,7 @@ explicitly specified on the command line.
=20
 .LI
 troff's start-up file `troffrc' now includes `papersize.tmac' to set
-the paper size with the command line option `-dpaper=3D<size>'.
+the paper size with the command-line option `-dpaper=3D<size>'.
=20
 Possible values for `<size>' are the same as the predefined `papersize'
 values in the DESC file (only lowercase; see the groff_font man page)
@@ -1742,7 +1742,7 @@ except \%a7-d7.
 An appended `l' (ell) character denotes landscape orientation.
 Examples: `a4', `c3l', `letterl'.
=20
-Most output drivers need additional command line switches `\-p' and
+Most output drivers need additional command-line switches `\-p' and
 `\-l' to override the default paper length and orientation as set in
 the driver specific DESC file.
=20
@@ -2266,8 +2266,8 @@ groff
=20
 .ULS
 .LI
-The new command line `\-c' disables color output (which is always disabl=
ed
-in compatibility mode).
+The new command-line option `\-c' disables color output (which is always
+disabled in compatibility mode).
 .ULE
 .
 .
@@ -2276,7 +2276,7 @@ Nroff
=20
 .ULS
 .LI
-Two new command line options `\-c' and `\-C'; the former passes `\-c' to
+Two new command-line options `\-c' and `\-C'; the former passes `\-c' to
 grotty (switching to the old output scheme); the latter passes `\-C' to
 groff (enabling compatibility mode).
 .ULE
diff --git a/m4/groff.m4 b/m4/groff.m4
index 062573b..87459dc 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -1466,7 +1466,7 @@ AC_DEFUN([GROFF_X11],
    AC_SUBST([XLIBDIRS])])
=20
=20
-# Set up the `--with-appresdir' command line option.
+# Set up the `--with-appresdir' command-line option.
=20
 # Don't quote AS_HELP_STRING!
 AC_DEFUN([GROFF_APPRESDIR_OPTION],
@@ -1516,7 +1516,7 @@ AC_DEFUN([GROFF_APPRESDIR_CHECK],
   To install them into a different directory, say,
   `/etc/X11/app-defaults', add
   `--with-appresdir=3D/etc/X11/app-defaults' to the configure script
-  command line options and rerun it (`prefix' value has no effect on
+  command-line options and rerun it (`prefix' value has no effect on
   a --with-appresdir option).
=20
   If the gxditview resources are installed in a directory that is not
@@ -1531,7 +1531,7 @@ AC_DEFUN([GROFF_APPRESDIR_CHECK],
    fi])
=20
=20
-# Set up the `--with-grofferdir' command line option.
+# Set up the `--with-grofferdir' command-line option.
=20
 AC_DEFUN([GROFF_GROFFERDIR_OPTION],
   [AC_ARG_WITH([grofferdir],
diff --git a/man/groff.7.man b/man/groff.7.man
index b35e1ec..ab0c2e7 100644
--- a/man/groff.7.man
+++ b/man/groff.7.man
@@ -62,7 +62,7 @@ Werner Lemberg
 .  nop \)\\$*
 ..
 .
-.\" --------- command line option ---------
+.\" --------- command-line option ---------
 .
 .de option
 .  Text \f[CB]\\$*
@@ -3660,7 +3660,7 @@ The following string is the only one predefined in =
groff.
 .STRING .T
 The name of the current output device as specified by the
 .option \-T
-command line option.
+command-line option.
 .
 .
 .\" --------------------------------------------------------------------
@@ -3968,7 +3968,7 @@ Current page length.
 .REG .P
 1\~if the current page is being printed, 0\~otherwise (as determined by =
the
 .option \-o
-command line option).
+command-line option).
 .
 .TPx
 .REG .pe
diff --git a/man/groff_diff.7.man b/man/groff_diff.7.man
index a38554c..896e4f9 100644
--- a/man/groff_diff.7.man
+++ b/man/groff_diff.7.man
@@ -1867,7 +1867,7 @@ request except that
 .I file
 is searched for in the same directories as macro files for the
 .B \-m
-command line option.
+command-line option.
 .
 If the file name to be included has the form
 .IB name .tmac
@@ -2220,7 +2220,7 @@ member of the current family corresponding to that =
style.
 .
 The default family can be set with the
 .B \-f
-command line option.
+command-line option.
 .
 The
 .B styles
@@ -2973,7 +2973,7 @@ register.
 Set to\~1 if in safer mode and to\~0 if in unsafe mode (as given with
 the
 .B \-U
-command line option).
+command-line option).
 .
 .TP
 .B \[rs]n[.vpt]
@@ -3127,7 +3127,7 @@ predefines a single (read/write) string-based regis=
ter,
 .BR \[rs]*[.T] ,
 which contains the argument given to the
 .B \-T
-command line option, namely the current output device (for example,
+command-line option, namely the current output device (for example,
 .I latin1
 or
 .IR ascii ).
@@ -3137,7 +3137,7 @@ which is defined to be\~1 if
 .B troff
 is called with the
 .B \-T
-command line option, and zero otherwise.
+command-line option, and zero otherwise.
 .
 This behaviour is different to UNIX troff.
 .
@@ -3685,7 +3685,7 @@ or for other implementations of roff in a consisten=
t way.
 .P
 Compatibility mode can be turned on with the
 .B \-C
-command line option, and turned on or off with the
+command-line option, and turned on or off with the
 .B .cp
 request.
 .
diff --git a/man/groff_tmac.5.man b/man/groff_tmac.5.man
index fc5c123..7e25cbc 100644
--- a/man/groff_tmac.5.man
+++ b/man/groff_tmac.5.man
@@ -368,7 +368,7 @@ Examples:
 .BR letterl .
 .
 .IP
-Most output drivers need additional command line switches
+Most output drivers need additional command-line switches
 .B \-p
 and
 .B \-l
@@ -615,7 +615,7 @@ was called
 in the documentation, although a more suitable name would be
 .IR doc .
 For, when omitting the space between the option and its argument, the
-command line option for activating this package reads
+command-line option for activating this package reads
 .BR \-mdoc .
 .
 .
@@ -1187,7 +1187,7 @@ The search sequence for macro files is (in that ord=
er):
 .IP \(bu
 the directories specified with troff/groff's
 .B \-M
-command line option
+command-line option
 .
 .IP \(bu
 the directories given in the
@@ -1197,7 +1197,7 @@ environment variable
 .IP \(bu
 the current directory (only if in unsafe mode, which is enabled by the
 .B \-U
-command line switch)
+command-line switch)
 .
 .IP \(bu
 the home directory
diff --git a/man/roff.7.man b/man/roff.7.man
index ef101c9..27edbe0 100644
--- a/man/roff.7.man
+++ b/man/roff.7.man
@@ -484,7 +484,7 @@ For example, the \f[CR]GNU\f[]
 .I roff
 implementation
 .BR groff (@MAN1EXT@)
-provides command line options to avoid the long command pipes of
+provides command-line options to avoid the long command pipes of
 classical
 .IR troff ;
 a program
@@ -492,7 +492,7 @@ a program
 tries to guess from the document which arguments should be used for a
 run of
 .BR groff ;
-people who do not like specifying command line options should try the
+people who do not like specifying command-line options should try the
 .BR groffer (@MAN1EXT@)
 program for graphically displaying
 .I groff
@@ -814,7 +814,7 @@ in
 .
 .P
 A macro package that is to be used in a document can be announced to
-the formatter by the command line option
+the formatter by the command-line option
 .BR \-m ,
 see
 .BR troff (@MAN1EXT@),
diff --git a/src/devices/grodvi/grodvi.1.man b/src/devices/grodvi/grodvi.=
1.man
index 65369dd..46f3320 100644
--- a/src/devices/grodvi/grodvi.1.man
+++ b/src/devices/grodvi/grodvi.1.man
@@ -66,7 +66,7 @@ the original English.
 .IR files \|.\|.\|.\&
 ]
 .PP
-It is possible to have whitespace between a command line option and its
+It is possible to have whitespace between a command-line option and its
 parameter.
 .
 .
diff --git a/src/devices/grolbp/grolbp.1.man b/src/devices/grolbp/grolbp.=
1.man
index 34eaba8..fd47a35 100644
--- a/src/devices/grolbp/grolbp.1.man
+++ b/src/devices/grolbp/grolbp.1.man
@@ -217,9 +217,9 @@ Elite | ER | EB | EI |
 .
 The paper size can be set in the
 .B DESC
-file or with command line options to
+file or with command-line options to
 .BR grolbp .
-If the paper size is specified both ways, the command line options take
+If the paper size is specified both ways, the command-line options take
 precedence over the contents of the
 .B DESC
 file (this applies to the page orientation too).
@@ -271,7 +271,7 @@ or
 .BR landscape )
 can be set in the
 .B DESC
-file or with command line options.
+file or with command-line options.
 .
 It is also case insensitive.
 .
@@ -293,7 +293,7 @@ file is used.
 .
 .
 .PP
-To set the page orientation with command line options you can use the
+To set the page orientation with command-line options you can use the
 .B \-o
 or
 .B \-\-orientation
diff --git a/src/devices/grolbp/lbp.cpp b/src/devices/grolbp/lbp.cpp
index fbd1bbf..f8d5c0f 100644
--- a/src/devices/grolbp/lbp.cpp
+++ b/src/devices/grolbp/lbp.cpp
@@ -585,7 +585,7 @@ static void handle_unknown_desc_command(const char *c=
ommand, const char *arg,
 {
   // orientation command
   if (strcasecmp(command, "orientation") =3D=3D 0) {
-    // We give priority to command line options
+    // We give priority to command-line options
     if (orientation > 0)
       return;
     if (arg =3D=3D 0)
diff --git a/src/devices/grolj4/grolj4.1.man b/src/devices/grolj4/grolj4.=
1.man
index eaf7be6..9694885 100644
--- a/src/devices/grolj4/grolj4.1.man
+++ b/src/devices/grolj4/grolj4.1.man
@@ -90,7 +90,7 @@ commands.
 .SH OPTIONS
 .\" --------------------------------------------------------------------
 .
-It is possible to have whitespace between a command line option and its
+It is possible to have whitespace between a command-line option and its
 parameter.
 .
 .TP
diff --git a/src/devices/gropdf/gropdf.1.man b/src/devices/gropdf/gropdf.=
1.man
index 5a6e05a..dc00999 100644
--- a/src/devices/gropdf/gropdf.1.man
+++ b/src/devices/gropdf/gropdf.1.man
@@ -58,7 +58,7 @@ the original English.
 .
 .
 .LP
-It is possible to have whitespace between a command line option and its
+It is possible to have whitespace between a command-line option and its
 parameter.
 .
 .
diff --git a/src/devices/grops/grops.1.man b/src/devices/grops/grops.1.ma=
n
index e31185d..3e3b81d 100644
--- a/src/devices/grops/grops.1.man
+++ b/src/devices/grops/grops.1.man
@@ -119,7 +119,7 @@ below for a guide how to install fonts for
 .SH OPTIONS
 .\" --------------------------------------------------------------------
 .
-It is possible to have whitespace between a command line option and its
+It is possible to have whitespace between a command-line option and its
 parameter.
 .
 .
@@ -1373,7 +1373,7 @@ directory.
 To use them, make sure that
 .B grops
 finds the fonts before the default system fonts (with the same names):
-Either add command line option
+Either add command-line option
 .B \-F
 to
 .B grops
diff --git a/src/devices/xditview/TODO b/src/devices/xditview/TODO
index 98bbbad..0b5b140 100644
--- a/src/devices/xditview/TODO
+++ b/src/devices/xditview/TODO
@@ -1,7 +1,7 @@
 Open the main window with the correct width and height, depending on
 both the selected device and the paper dimensions.
=20
-Add a command line option to specify the paper dimensions (similar to
+Add a command-line option to specify the paper dimensions (similar to
 other groff devices).
=20
 Better error handling.
diff --git a/src/devices/xditview/gxditview.1.man b/src/devices/xditview/=
gxditview.1.man
index 5beff08..7fc8b4d 100644
--- a/src/devices/xditview/gxditview.1.man
+++ b/src/devices/xditview/gxditview.1.man
@@ -284,7 +284,7 @@ of the virtual page displayed by
 .
 The
 .B \%gxditview
-program accepts all of the standard X\~Toolkit command line options
+program accepts all of the standard X\~Toolkit command-line options
 along with the additional options listed below:
 .
 .TP 8
@@ -347,7 +347,7 @@ This can be either a filename, or a command starting =
with
 .
 .
 .PP
-The following standard X\~Toolkit command line arguments are commonly
+The following standard X\~Toolkit command-line arguments are commonly
 used with
 .BR \%gxditview :
 .
diff --git a/src/preproc/eqn/eqn.1.man b/src/preproc/eqn/eqn.1.man
index 076fd43..af4b890 100644
--- a/src/preproc/eqn/eqn.1.man
+++ b/src/preproc/eqn/eqn.1.man
@@ -125,7 +125,7 @@ it does not support low-resolution, typewriter-like d=
evices
 .\" --------------------------------------------------------------------
 .
 .LP
-It is possible to have whitespace between a command line option and its
+It is possible to have whitespace between a command-line option and its
 parameter.
 .
 .TP
diff --git a/src/preproc/grn/grn.1.man b/src/preproc/grn/grn.1.man
index 4802428..c7bb5e7 100644
--- a/src/preproc/grn/grn.1.man
+++ b/src/preproc/grn/grn.1.man
@@ -209,7 +209,7 @@ Print the version number.
 .
 .
 .PP
-It is possible to have whitespace between a command line option and its
+It is possible to have whitespace between a command-line option and its
 parameter.
 .
 .
diff --git a/src/preproc/html/pre-html.cpp b/src/preproc/html/pre-html.cp=
p
index 5a954bf..9ba0988 100644
--- a/src/preproc/html/pre-html.cpp
+++ b/src/preproc/html/pre-html.cpp
@@ -1557,7 +1557,7 @@ static void usage(FILE *stream)
     "it is part of the groff pipeline to produce HTML output.\n"
     "\n"
     "If there is ever the need to call it manually (e.g., for\n"
-    "debugging purposes), add command line option `-V' while calling\n"
+    "debugging purposes), add command-line option `-V' while calling\n"
     "the `groff' program to see which arguments are passed to it.\n"
     "\n");
 }
diff --git a/src/preproc/pic/TODO b/src/preproc/pic/TODO
index a1d7554..875d417 100644
--- a/src/preproc/pic/TODO
+++ b/src/preproc/pic/TODO
@@ -32,4 +32,4 @@ in pic.  Possibly something similar to T{ and T} in tbl=
.
 Option to provide macro backtraces.
=20
 Have a path that is searched by `copy' statement.  Set by environment
-variable or command line option.
+variable or command-line option.
diff --git a/src/preproc/preconv/preconv.1.man b/src/preproc/preconv/prec=
onv.1.man
index 5e3b875..379f7da 100644
--- a/src/preproc/preconv/preconv.1.man
+++ b/src/preproc/preconv/preconv.1.man
@@ -52,7 +52,7 @@ the original English.
 .PP
 It is possible to have whitespace between the
 .B \-e
-command line option and its parameter.
+command-line option and its parameter.
 .
 .
 .\" --------------------------------------------------------------------
diff --git a/src/preproc/preconv/preconv.cpp b/src/preproc/preconv/precon=
v.cpp
index 35e22ed..403ac36 100644
--- a/src/preproc/preconv/preconv.cpp
+++ b/src/preproc/preconv/preconv.cpp
@@ -1213,7 +1213,7 @@ main(int argc, char **argv)
     { "version", no_argument, 0, 'v' },
     { NULL, 0, 0, 0 }
   };
-  // Parse the command line options.
+  // Parse the command-line options.
   while ((opt =3D getopt_long(argc, argv,
 			    "dD:e:hrv", long_options, NULL)) !=3D EOF)
     switch (opt) {
diff --git a/src/preproc/refer/refer.1.man b/src/preproc/refer/refer.1.ma=
n
index cc430af..21c085e 100644
--- a/src/preproc/refer/refer.1.man
+++ b/src/preproc/refer/refer.1.man
@@ -203,7 +203,7 @@ preprocessed by a command such as
 .SH OPTIONS
 .\" --------------------------------------------------------------------
 .
-It is possible to have whitespace between a command line option and its
+It is possible to have whitespace between a command-line option and its
 parameter.
 .
 .
diff --git a/src/preproc/soelim/soelim.1.man b/src/preproc/soelim/soelim.=
1.man
index c5ec64c..338bd7c 100644
--- a/src/preproc/soelim/soelim.1.man
+++ b/src/preproc/soelim/soelim.1.man
@@ -44,7 +44,7 @@ the original English.
 .PP
 It is possible to have whitespace between the
 .B \-I
-command line option and its parameter.
+command-line option and its parameter.
 .
 .
 .\" --------------------------------------------------------------------
diff --git a/src/roff/groff/groff.1.man b/src/roff/groff/groff.1.man
index 62fb40e..c6f1b87 100644
--- a/src/roff/groff/groff.1.man
+++ b/src/roff/groff/groff.1.man
@@ -140,7 +140,7 @@ The
 .B groff
 program allows control of the whole
 .I groff
-system by command line options.
+system by command-line options.
 .
 This is a great simplification in comparison to the classical case (whic=
h
 uses pipes only).
@@ -153,7 +153,7 @@ uses pipes only).
 The command line is parsed according to the usual \f[CR]GNU\f[]
 convention.
 .
-The whitespace between a command line option and its argument is
+The whitespace between a command-line option and its argument is
 optional.
 .
 Options can be grouped behind a single \[oq]\-\[cq] (minus character).
@@ -832,7 +832,7 @@ The
 paper size, giving the actual dimensions of the paper sheets, is
 controlled by output devices like
 .BR grops
-with the command line options
+with the command-line options
 .B \-p
 and
 .BR \-l .
@@ -842,7 +842,7 @@ See
 and the man pages of the output devices for more details.
 .
 .B groff
-uses the command line option
+uses the command-line option
 .B \-P
 to pass options to output devices; for example, the following selects
 A4 paper in landscape orientation for the PS device:
@@ -863,7 +863,7 @@ program is a wrapper around the
 .BR @g@troff (@MAN1EXT@)
 program.
 .
-It allows one to specify the preprocessors by command line options and
+It allows one to specify the preprocessors by command-line options and
 automatically runs the postprocessor that is appropriate for the
 selected device.
 .
@@ -1097,7 +1097,7 @@ as well as the
 .I groff
 extensions.
 .
-The command line option
+The command-line option
 .B \-C
 switches
 .B @g@troff
@@ -1482,7 +1482,7 @@ preprocessor to select the encoding of input files.
 .
 Setting this option implies
 .BR groff 's
-command line option
+command-line option
 .B \-k
 (this is,
 .B groff
@@ -1497,7 +1497,7 @@ without arguments.
 .
 An explicit
 .B \-K
-command line option overrides the value of
+command-line option overrides the value of
 .EnvVar GROFF_ENCODING .
 .
 See
diff --git a/src/roff/nroff/nroff.1.man b/src/roff/nroff/nroff.1.man
index fb4fb5c..aea1070 100644
--- a/src/roff/nroff/nroff.1.man
+++ b/src/roff/nroff/nroff.1.man
@@ -84,7 +84,7 @@ If neither the
 .B GROFF_TYPESETTER
 environment variable nor the
 .B \-T
-command line option (which overrides the environment variable)
+command-line option (which overrides the environment variable)
 specifies a (valid) device,
 .B @g@nroff
 checks the current locale to select a default output device.
diff --git a/src/roff/troff/troff.1.man b/src/roff/troff/troff.1.man
index 2877f3d..f928cd0 100644
--- a/src/roff/troff/troff.1.man
+++ b/src/roff/troff/troff.1.man
@@ -82,7 +82,7 @@ appropriate order and with the appropriate options.
 .SH OPTIONS
 .\" --------------------------------------------------------------------
 .
-It is possible to have whitespace between a command line option and
+It is possible to have whitespace between a command-line option and
 its parameter.
 .
 .TP \w'\-dname=3Ds'u+2n
@@ -194,7 +194,7 @@ instead.
 .
 It will be first searched for in directories given with the
 .B \-M
-command line option, then in directories given in the
+command-line option, then in directories given in the
 .B GROFF_TMAC_PATH
 environment variable, then in the current directory (only if in unsafe
 mode), the home directory, @SYSTEMMACRODIR@, @LOCALMACRODIR@, and
@@ -609,7 +609,7 @@ option is given).
 .
 Use the
 .B \-M
-command line option or the
+command-line option or the
 .B GROFF_TMAC_PATH
 environment variable to add these directories to the search path if
 necessary.
diff --git a/src/utils/afmtodit/afmtodit.1.man b/src/utils/afmtodit/afmto=
dit.1.man
index 6df5fc7..f670576 100644
--- a/src/utils/afmtodit/afmtodit.1.man
+++ b/src/utils/afmtodit/afmtodit.1.man
@@ -65,7 +65,7 @@ the original English.
 .
 .
 .LP
-The whitespace between a command line option and its argument is optiona=
l.
+The whitespace between a command-line option and its argument is optiona=
l.
 .
 .
 .\" --------------------------------------------------------------------
diff --git a/src/utils/indxbib/indxbib.1.man b/src/utils/indxbib/indxbib.=
1.man
index f764aa1..2dfffd0 100644
--- a/src/utils/indxbib/indxbib.1.man
+++ b/src/utils/indxbib/indxbib.1.man
@@ -118,7 +118,7 @@ and will be used in verifying records found using the=
 index.
 .SH OPTIONS
 .\" --------------------------------------------------------------------
 .
-It is possible to have whitespace between a command line option and its
+It is possible to have whitespace between a command-line option and its
 parameter.
 .
 .TP
diff --git a/src/utils/lkbib/lkbib.1.man b/src/utils/lkbib/lkbib.1.man
index 997b72e..7919935 100644
--- a/src/utils/lkbib/lkbib.1.man
+++ b/src/utils/lkbib/lkbib.1.man
@@ -92,7 +92,7 @@ each index can cover multiple databases.
 .SH OPTIONS
 .\" --------------------------------------------------------------------
 .
-It is possible to have whitespace between a command line option and its
+It is possible to have whitespace between a command-line option and its
 parameter.
 .
 .
diff --git a/src/utils/lookbib/lookbib.1.man b/src/utils/lookbib/lookbib.=
1.man
index 4be4168..0540c36 100644
--- a/src/utils/lookbib/lookbib.1.man
+++ b/src/utils/lookbib/lookbib.1.man
@@ -72,7 +72,7 @@ each index can cover multiple databases.
 .SH OPTIONS
 .\" --------------------------------------------------------------------
 .
-It is possible to have whitespace between a command line option and its
+It is possible to have whitespace between a command-line option and its
 parameter.
 .
 .TP
diff --git a/src/utils/tfmtodit/tfmtodit.1.man b/src/utils/tfmtodit/tfmto=
dit.1.man
index 620c4a6..90ff722 100644
--- a/src/utils/tfmtodit/tfmtodit.1.man
+++ b/src/utils/tfmtodit/tfmtodit.1.man
@@ -190,7 +190,7 @@ is true.
 .SH OPTIONS
 .\" --------------------------------------------------------------------
 .
-It is possible to have whitespace between a command line option and its
+It is possible to have whitespace between a command-line option and its
 parameter.
 .
 .TP
diff --git a/src/utils/xtotroff/xtotroff.1.man b/src/utils/xtotroff/xtotr=
off.1.man
index 39fd7b5..28d7d1d 100644
--- a/src/utils/xtotroff/xtotroff.1.man
+++ b/src/utils/xtotroff/xtotroff.1.man
@@ -89,7 +89,7 @@ aborts.
 .SH OPTIONS
 .\" --------------------------------------------------------------------
 .
-It is possible to have whitespace between a command line option and its
+It is possible to have whitespace between a command-line option and its
 parameter.
 .
 .TP
diff --git a/tmac/a4.tmac b/tmac/a4.tmac
index 1abc21e..a456e79 100644
--- a/tmac/a4.tmac
+++ b/tmac/a4.tmac
@@ -5,7 +5,7 @@
 .\" Set up groff for A4 paper.  Must be called before any other macro
 .\" package.
 .\"
-.\" Some output drivers need an additional command line switch `-p' to
+.\" Some output drivers need an additional command-line switch `-p' to
 .\" override the default paper length set in the driver specific DESC
 .\" file.
 .\"
diff --git a/tmac/doc.tmac-u b/tmac/doc.tmac-u
index 8b7ad4c..47ae2dc 100644
--- a/tmac/doc.tmac-u
+++ b/tmac/doc.tmac-u
@@ -573,7 +573,7 @@
 .
 .
 .\" NS Ar user macro
-.\" NS   command line `argument' macro: `.Ar [args ...]'
+.\" NS   command-line `argument' macro: `.Ar [args ...]'
 .\" NS
 .\" NS modifies:
 .\" NS   doc-arg-ptr
diff --git a/tmac/groff_man.7.man b/tmac/groff_man.7.man
index 5e7b775..753fcf0 100644
--- a/tmac/groff_man.7.man
+++ b/tmac/groff_man.7.man
@@ -90,7 +90,7 @@ package.
 .
 The
 .B man
-macros understand the following command line options (which define
+macros understand the following command-line options (which define
 various registers).
 .
 .
@@ -1277,7 +1277,7 @@ like the Unicode U+02DC small tilde.
 Minus sign.
 .
 Also use this to display syntax elements that require the ASCII
-hyphen-minus character, for example command line options and C
+hyphen-minus character, for example command-line options and C
 language operators.
 .
 The unesacped \(oq\-\(cq input character is not appropriate for
diff --git a/tmac/groff_mdoc.7.man b/tmac/groff_mdoc.7.man
index 5968d0b..cadb693 100644
--- a/tmac/groff_mdoc.7.man
+++ b/tmac/groff_mdoc.7.man
@@ -96,7 +96,7 @@ The manual domain is defined as macros that are a subse=
t of the day to day
 informal language used to describe commands, routines and related
 .Ux
 files.
-Macros in the manual domain handle command names, command line arguments=
 and
+Macros in the manual domain handle command names, command-line arguments=
 and
 options, function names, function parameters, pathnames, variables, cros=
s
 references to other manual pages, and so on.
 These domain items have value for both the author and the future user of=
 the
@@ -1054,7 +1054,7 @@ from the example above might be referred to as
 .Em operands
 or
 .Em file arguments .
-Some command line argument lists are quite long:
+Some command-line argument lists are quite long:
 .
 .Bd -ragged
 .Bl -tag -width ".Nm make" -offset indent -compact
@@ -1389,7 +1389,7 @@ The default width is 15n.
 .
 The
 .Ql .Fl
-macro handles command line flags.
+macro handles command-line flags.
 It prepends a dash,
 .Ql \- ,
 to the flag.
@@ -3249,7 +3249,7 @@ accepts currently is
 .Fl words
 (this is also the default if no option is given) which is useful for
 preventing line breaks in the middle of options.
-In the example for the make command line arguments (see
+In the example for the make command-line arguments (see
 .Sx What's in a Name ) ,
 the keep prevented
 .Xr nroff
diff --git a/tmac/groff_trace.7.man b/tmac/groff_trace.7.man
index 6b75e59..0295f42 100644
--- a/tmac/groff_trace.7.man
+++ b/tmac/groff_trace.7.man
@@ -70,7 +70,7 @@ This greatly eases to track down an error in some macro=
.
 .
 .P
 This tracing process is activated by specifying the groff or troff
-command line option
+command-line option
 .BR \-m\ trace .
 .
 This works also with the
@@ -85,7 +85,7 @@ Only macros that are defined after this line are traced=
.
 .
 .
 .P
-If command line option
+If the command-line option
 .B \-r\ trace-full=3D1
 is given (or if this register is set in the document), number and
 string register assignments together with some other requests are
@@ -207,8 +207,8 @@ Example:
 .RE
 .
 .P
-Here, the tracing is activated within the document, not by a command
-line option.
+Here, the tracing is activated within the document, not by a
+command-line option.
 .
 As tracing was not active when macro
 .I before
diff --git a/tmac/papersize.tmac b/tmac/papersize.tmac
index ea2ba05..0ecb0b9 100644
--- a/tmac/papersize.tmac
+++ b/tmac/papersize.tmac
@@ -13,7 +13,7 @@
 .\" (ell) character denotes landscape orientation.  Examples: `a4', `c3l=
',
 .\" `letterl'.
 .\"
-.\" Most output drivers need additional command line switches `-p' and
+.\" Most output drivers need additional command-line switches `-p' and
 .\" `-l' to override the default paper length and orientation as set in
 .\" the driver specific DESC file.
 .\"
diff --git a/tmac/s.tmac b/tmac/s.tmac
index c78c8ef..ee37f4b 100644
--- a/tmac/s.tmac
+++ b/tmac/s.tmac
@@ -1024,7 +1024,7 @@ along with this program. If not, see <http://www.gn=
u.org/licenses/>.
 .\" Paragraph-level formatting.
 .\" Load time initialization.
 .de par@load-init
-.\" PS and VS might have been set on the command-line
+.\" PS and VS might have been set on the command line
 .if !rPS .nr PS 10
 .if !rLL .nr LL 6i
 .ll \\n[LL]u
diff --git a/tmac/trace.tmac b/tmac/trace.tmac
index 63885bd..927c9df 100644
--- a/tmac/trace.tmac
+++ b/tmac/trace.tmac
@@ -34,7 +34,7 @@
 .\" To limit side effects, only macros are traced by default, together
 .\" with some requests like `.return' which don't take (user) arguments.
 .\" If you want more tracing, especially of number and string register
-.\" assignments, add the `-r trace-full=3D1' command line option.
+.\" assignments, add the `-r trace-full=3D1' command-line option.
 .
 .
 .\" Regarding the usage of `.do': All lines of macros which should


From MAILER-DAEMON Sun Oct 22 16:31:03 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1e6Mtj-0006Jt-EP
	for mharc-groff-commit@gnu.org; Sun, 22 Oct 2017 16:31:03 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:52472)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6Mtg-0006IC-Mv
	for groff-commit@gnu.org; Sun, 22 Oct 2017 16:31:01 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6Mtg-0002B6-2f
	for groff-commit@gnu.org; Sun, 22 Oct 2017 16:31:00 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:55987)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6Mtf-0002Au-VA
	for groff-commit@gnu.org; Sun, 22 Oct 2017 16:30:59 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id C4E9020A42; Sun, 22 Oct 2017 16:30:59 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 02/02: groffer(1): Fix comma splice.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: "G. Branden Robinson" <g.branden.robinson@gmail.com>
In-Reply-To: groff@gnu.org
References: <20171022203059.3934.6546@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 736017ceca893a6845b8f82edc310afbca951057
Auto-Submitted: auto-generated
Message-Id: <20171022203059.C4E9020A42@vcs0.savannah.gnu.org>
Date: Sun, 22 Oct 2017 16:30:59 -0400 (EDT)
From: g.branden.robinson@gmail.com (G. Branden Robinson)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit/>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Oct 2017 20:31:01 -0000

gbranden pushed a commit to branch master
in repository groff.

commit 736017ceca893a6845b8f82edc310afbca951057
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Sun Oct 22 16:29:38 2017 -0400

    groffer(1): Fix comma splice.
   =20
    I noticed this one while making other changes, and did not undertake =
a
    comprehensive search for more--a truly daunting task.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 contrib/groffer/groffer.1.man | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/groffer/groffer.1.man b/contrib/groffer/groffer.1.ma=
n
index 378c6fb..c7bb3bf 100644
--- a/contrib/groffer/groffer.1.man
+++ b/contrib/groffer/groffer.1.man
@@ -1859,7 +1859,7 @@ with the same name in the same
 .IR section .
 But the
 .I extension
-is only rarely used, usually it is omitted.
+is only rarely used; usually it is omitted.
 .
 Then the
 .I extensions


From MAILER-DAEMON Sun Oct 22 16:31:03 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1e6Mtj-0006KA-J0
	for mharc-groff-commit@gnu.org; Sun, 22 Oct 2017 16:31:03 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:52477)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6Mtg-0006ID-US
	for groff-commit@gnu.org; Sun, 22 Oct 2017 16:31:01 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6Mtg-0002B5-2I
	for groff-commit@gnu.org; Sun, 22 Oct 2017 16:31:00 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:55985)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6Mtf-0002As-V9
	for groff-commit@gnu.org; Sun, 22 Oct 2017 16:30:59 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id A2E7E20A40; Sun, 22 Oct 2017 16:30:59 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/02: preconv(1): Fix incorrect term.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: "G. Branden Robinson" <g.branden.robinson@gmail.com>
In-Reply-To: groff@gnu.org
References: <20171022203059.3934.6546@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 1daad0a32ef170d43dc9fcdde7169c4ac8c55463
Auto-Submitted: auto-generated
Message-Id: <20171022203059.A2E7E20A40@vcs0.savannah.gnu.org>
Date: Sun, 22 Oct 2017 16:30:59 -0400 (EDT)
From: g.branden.robinson@gmail.com (G. Branden Robinson)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit/>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Oct 2017 20:31:01 -0000

gbranden pushed a commit to branch master
in repository groff.

commit 1daad0a32ef170d43dc9fcdde7169c4ac8c55463
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Sun Oct 22 16:18:23 2017 -0400

    preconv(1): Fix incorrect term.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 src/preproc/preconv/preconv.1.man | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/preproc/preconv/preconv.1.man b/src/preproc/preconv/prec=
onv.1.man
index 379f7da..57a30c0 100644
--- a/src/preproc/preconv/preconv.1.man
+++ b/src/preproc/preconv/preconv.1.man
@@ -182,7 +182,7 @@ On the other hand, value U+FFFE is guaranteed not be =
a Unicode character at
 all.
 .
 This allows detection of the byte order within the data stream (either
-big-endian or lower-endian), and the MIME encodings \%\[oq]UTF-16\[cq]
+big-endian or little-endian), and the MIME encodings \%\[oq]UTF-16\[cq]
 and \%\[oq]UTF-32\[cq] mandate that the data stream starts with U+FEFF.
 .
 Similarly, the data stream encoded as \%\[oq]UTF-8\[cq] might start


From MAILER-DAEMON Sun Oct 22 17:30:29 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1e6NpF-0004D8-KX
	for mharc-groff-commit@gnu.org; Sun, 22 Oct 2017 17:30:29 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:33625)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6NpD-0004CY-CL
	for groff-commit@gnu.org; Sun, 22 Oct 2017 17:30:28 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6NpC-0002i9-BU
	for groff-commit@gnu.org; Sun, 22 Oct 2017 17:30:27 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:56441)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6NpC-0002hx-5M
	for groff-commit@gnu.org; Sun, 22 Oct 2017 17:30:26 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id B71A2208EA; Sun, 22 Oct 2017 17:30:25 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/01: groff(7): Make style fixes to Unicode section.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: "G. Branden Robinson" <g.branden.robinson@gmail.com>
In-Reply-To: groff@gnu.org
References: <20171022213025.25641.68672@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 5eb9d3237021ddff2807701c03cf670de8a88bca
Auto-Submitted: auto-generated
Message-Id: <20171022213025.B71A2208EA@vcs0.savannah.gnu.org>
Date: Sun, 22 Oct 2017 17:30:25 -0400 (EDT)
From: g.branden.robinson@gmail.com (G. Branden Robinson)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit/>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Oct 2017 21:30:28 -0000

gbranden pushed a commit to branch master
in repository groff.

commit 5eb9d3237021ddff2807701c03cf670de8a88bca
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Sun Oct 22 17:26:32 2017 -0400

    groff(7): Make style fixes to Unicode section.
   =20
    * Tighten wording.
    * Write small quantities in running prose as words, not numerals.
    * Use a more conventional term for indicating an immediately-followin=
g
      example.
    * Suppress inter-sentence spacing after "e.g.".
    * Fix comma splice.
    * Generally make the language more idiomatic.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 man/groff.7.man | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/man/groff.7.man b/man/groff.7.man
index ab0c2e7..677bf43 100644
--- a/man/groff.7.man
+++ b/man/groff.7.man
@@ -3567,9 +3567,9 @@ Plus-minus sign
 .SS "Unicode Characters"
 .\" --------------------------------------------------------------------
 .
-There is the extended escape
+The extended escape
 .B u
-that allows the inclusion of all available Unicode characters into some
+allows the inclusion of all available Unicode characters into a
 .I roff
 file.
 .
@@ -3580,11 +3580,11 @@ file.
 is the escape name.
 .
 .I xxxx
-is a hexadecimal number of 4 hex digits, such as
+is a hexadecimal number of four hex digits, such as
 .B 0041
 for the letter
 .BR A ,
-see
+thus
 .BR \e[u0041] .
 .=20
 .
@@ -3594,17 +3594,17 @@ see
 is the escape name.
 .
 .I yyyyy
-is a hexadecimal number of 5 hex digits, such as
+is a hexadecimal number of five hex digits, such as
 .B 2FA1A
-for a Chinese looking character for
+for a Chinese-looking character from the Unicode block
 .IR "CJK Compatibility Ideographs Supplement" ,
-see
+thus
 .BR \e[u2FA1A] .
 .
 .
 .P
-Both hexadecimal collections mean the corresponding Unicode code for a
-character.
+The hexadecimal value indicates the corresponding Unicode code point for
+a character.
 .
 .
 .TP
@@ -3616,19 +3616,22 @@ character.
 and
 .I hex3
 are all Unicode hexadecimal codes (4 or 5 hex digits) that are used
-for overstriking, e.g.
+for overstriking, e.g.\&
 .B \e[u0041_0301]
 is
-.I "A acute"
-.BR \['A] .
+.IR "A acute" ,
+which can also be specified as
+.BR \['A] ;
+see
+.BR groff_char (7).
 .
 .
 .P
-The availability of the Unicode characters depends on the used font.
+The availability of the Unicode characters depends on the font used.
 .
 For text mode, the device
 .B -Tutf8
-is quite complete, for
+is quite complete; for
 .I troff
 modes it might happen that some or many characters will not be
 displayed.


From MAILER-DAEMON Sun Oct 22 18:55:07 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1e6P98-0006kr-Uw
	for mharc-groff-commit@gnu.org; Sun, 22 Oct 2017 18:55:06 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:46152)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6P92-0006jN-IV
	for groff-commit@gnu.org; Sun, 22 Oct 2017 18:55:06 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6P8w-0007hE-Dq
	for groff-commit@gnu.org; Sun, 22 Oct 2017 18:55:00 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:57140)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6P8v-0007gS-UN
	for groff-commit@gnu.org; Sun, 22 Oct 2017 18:54:54 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id 936BA209A7; Sun, 22 Oct 2017 18:54:53 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/01: Use "e.g." correctly in documentation, comments.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: "G. Branden Robinson" <g.branden.robinson@gmail.com>
In-Reply-To: groff@gnu.org
References: <20171022225452.24324.89906@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 7ada398dfcef9645c113bc4356833dc65f876488
Auto-Submitted: auto-generated
Message-Id: <20171022225453.936BA209A7@vcs0.savannah.gnu.org>
Date: Sun, 22 Oct 2017 18:54:52 -0400 (EDT)
From: g.branden.robinson@gmail.com (G. Branden Robinson)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit/>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Oct 2017 22:55:06 -0000

gbranden pushed a commit to branch master
in repository groff.

commit 7ada398dfcef9645c113bc4356833dc65f876488
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Sun Oct 22 18:49:53 2017 -0400

    Use "e.g." correctly in documentation, comments.
   =20
    The Latin phrase "exempli gratia" is abbreviated "e.g." in English, a=
nd
    means "for example", so it gets set off with commas just as the latte=
r
    would.
   =20
    Stay within 80 columns in files that respect that limit.
   =20
    Kill nearby useless trailing whitespace where it was obvious.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 contrib/mom/examples/mom-pdf.mom           |  2 +-
 contrib/mom/momdoc/appendices.html         |  2 +-
 contrib/mom/momdoc/cover.html              |  2 +-
 contrib/mom/momdoc/definitions.html        | 14 ++++----
 contrib/mom/momdoc/docelement.html         | 52 +++++++++++++++---------=
------
 contrib/mom/momdoc/docprocessing.html      | 34 +++++++++----------
 contrib/mom/momdoc/headfootpage.html       | 16 ++++-----
 contrib/mom/momdoc/images.html             |  4 +--
 contrib/mom/momdoc/inlines.html            | 12 +++----
 contrib/mom/momdoc/letters.html            |  4 +--
 contrib/mom/momdoc/rectoverso.html         |  4 +--
 contrib/mom/momdoc/refer.html              | 22 ++++++-------
 contrib/mom/momdoc/tables-of-contents.html |  6 ++--
 contrib/mom/momdoc/typesetting.html        | 16 ++++-----
 contrib/mom/momdoc/using.html              |  2 +-
 contrib/mom/om.tmac-u                      | 12 +++----
 font/devps/generate/Makefile               |  2 +-
 src/preproc/eqn/TODO                       |  2 +-
 src/preproc/pic/pic.ypp                    |  2 +-
 src/preproc/pic/troff.cpp                  |  2 +-
 src/preproc/refer/TODO                     |  2 +-
 src/roff/troff/TODO                        |  4 +--
 src/roff/troff/div.cpp                     |  4 +--
 src/roff/troff/env.cpp                     |  2 +-
 src/roff/troff/input.cpp                   |  4 +--
 tmac/TODO                                  |  2 +-
 tmac/an-old.tmac                           |  2 +-
 27 files changed, 116 insertions(+), 116 deletions(-)

diff --git a/contrib/mom/examples/mom-pdf.mom b/contrib/mom/examples/mom-=
pdf.mom
index 328b1b4..b9388b1 100644
--- a/contrib/mom/examples/mom-pdf.mom
+++ b/contrib/mom/examples/mom-pdf.mom
@@ -605,7 +605,7 @@ is not compatible with
 .PDF_WWW_LINK \
   http://www.schaffter.ca/mom/momdoc/docprocessing.html#printstyle \
   "PRINTSTYLE TYPEWRITE"
-underlining (eg of italics)
+underlining (e.g., of italics)
 .ITEM
 generally produces larger files; these can be reduced by piping
 the output through \[ps2pdf]\*[B]
diff --git a/contrib/mom/momdoc/appendices.html b/contrib/mom/momdoc/appe=
ndices.html
index dc8e566..37e05ff 100644
--- a/contrib/mom/momdoc/appendices.html
+++ b/contrib/mom/momdoc/appendices.html
@@ -637,7 +637,7 @@ of the form
 <span class=3D"pre-in-pp">
   internalname &lt;name&gt;
 </span>
-Usually, the internal name is helpfully descriptive, eg,
+Usually, the internal name is helpfully descriptive, e.g.,
 <br/>
 <span class=3D"pre-in-pp">
   internalname Optima-Bold
diff --git a/contrib/mom/momdoc/cover.html b/contrib/mom/momdoc/cover.htm=
l
index c58684c..9aea902 100644
--- a/contrib/mom/momdoc/cover.html
+++ b/contrib/mom/momdoc/cover.html
@@ -154,7 +154,7 @@ arguments you pass to
 and/or
 <a href=3D"#cover">COVER</a>.
 Provided you have already given mom the appropriate reference macros
-(eg
+(e.g.,
 <a href=3D"docprocessing.html#title">TITLE</a>
 or
 <a href=3D"docprocessing.html#author">AUTHOR</a>),
diff --git a/contrib/mom/momdoc/definitions.html b/contrib/mom/momdoc/def=
initions.html
index 806d69b..97bcf67 100644
--- a/contrib/mom/momdoc/definitions.html
+++ b/contrib/mom/momdoc/definitions.html
@@ -232,7 +232,7 @@ or concept you&#8217;re not familiar with.
   <dd>
   The collective name by which a collection of
   <a href=3D"#font">fonts</a>
-  are known, eg Helvetica, Times Roman, Garamond.
+  are known, e.g., Helvetica, Times Roman, Garamond.
   </dd>
  =20
   <dt id=3D"figurespace">Figure space/Digit space</dt>
@@ -270,7 +270,7 @@ or concept you&#8217;re not familiar with.
   <a href=3D"#shape">shape</a>
   of type within a
   <a href=3D"#family">family</a>,
-  eg light, medium, bold (which are weights), and roman, italic,
+  e.g., light, medium, bold (which are weights), and roman, italic,
   condensed (which are shapes).  By default, groff knows of four
   fonts within its default set of families: R (medium roman), I
   (medium italic), B (bold roman) and BI (bold italic).
@@ -796,7 +796,7 @@ or concept you&#8217;re not familiar with.
  =20
   <p>
   You can enter decimal values for any unit of measure.  Different
-  units may be combined by adding them together (eg 1.5i+2m,
+  units may be combined by adding them together (e.g., 1.5i+2m,
   which gives a measure of 1-1/2 inches plus 2 ems).
   </p>
  =20
@@ -855,7 +855,7 @@ or concept you&#8217;re not familiar with.
   <dd>
   Macros used in
   <a href=3D"docprocessing.html#docprocessing">document processing</a>
-  to control/alter the appearance of document elements (eg
+  to control/alter the appearance of document elements (e.g.,
   headings, quotes, footnotes,
   <a href=3D"#header">headers</a>,
   etc.).
@@ -920,7 +920,7 @@ or concept you&#8217;re not familiar with.
   <a href=3D"#running">running text</a>,
   frequently set off by typographic symbols such as asterisks or
   daggers.  Used to indicate a shift in the content of a document
-  (eg a scene change in a short story).  Also commonly called a
+  (e.g., a scene change in a short story).  Also commonly called a
   scene break or a section break.
   </dd>
  =20
@@ -940,14 +940,14 @@ or concept you&#8217;re not familiar with.
   <dt id=3D"pdfoutline">PDF outline</dt>
   <dd>
   The hierarchically-arranged navigation outline provided by most PDF
-  viewers (eg Okular, Evince), typically in a panel to the left of
+  viewers (e.g., Okular, Evince), typically in a panel to the left of
   the document window, and usually labeled &#8220;Contents&#8221;.
   </dd>
  =20
   <dt id=3D"quote">Quote</dt>
   <dd>
   A quote, to mom, is a line-for-line setting
-  of quoted material (eg poetry, song lyrics, or a snippet of
+  of quoted material (e.g., poetry, song lyrics, or a snippet of
   programming code).  You don&#8217;t have to use
   <a href=3D"typesetting.html#br"><kbd>BR</kbd></a>
   with quotes.
diff --git a/contrib/mom/momdoc/docelement.html b/contrib/mom/momdoc/doce=
lement.html
index cd1ffa2..642e3ab 100644
--- a/contrib/mom/momdoc/docelement.html
+++ b/contrib/mom/momdoc/docelement.html
@@ -665,7 +665,7 @@ Note that mom does not provide widow or orphan contro=
l for
 paragraphs (ie even if only one line of a paragraph fits at the
 bottom of a page, she will set it on that page).  The reason for
 this is that writers of fiction often have single-line paragraphs
-(eg in dialogue).  Groff&#8217;s simplistic orphan control will
+(e.g., in dialogue).  Groff&#8217;s simplistic orphan control will
 break these one-liners&mdash;if they fall at the bottom of the
 page&mdash;to a new page, which is not what you want.
 </p>
@@ -750,7 +750,7 @@ If you wish to change the family for regular text par=
agraphs only,
 invoke <kbd>.FAMILY</kbd> immediately after <kbd>.PP</kbd> in every
 paragraph whose family you wish to differ from the prevailing
 document family.  Alternatively, set the family and font for
-paragraphs with PP_FONT, giving it a complete family+font name, eg
+paragraphs with PP_FONT, giving it a complete family+font name, e.g.,
 <br/>
 <span class=3D"pre-in-pp">
   PP_FONT TI
@@ -1124,7 +1124,7 @@ bookmark for
=20
 <p>
 Headings can also be numbered on a per-heading-level basis,
-hierarchically and concatenatively, eg
+hierarchically and concatenatively, e.g.,
 <br/>
 <span class=3D"pre-in-pp">
   1.
@@ -1383,7 +1383,7 @@ appended to it.
=20
 <p class=3D"defaults" style=3D"margin-bottom: 1em">
 <kbd>NEEDS</kbd> lets you reserve the number of lines of text
-required beneath a heading, including fractions thereof (eg
+required beneath a heading, including fractions thereof (e.g.,
 &#8220;1.5&#8221; for one line of text plus half a linespace).
 If a heading falls near the bottom margin and there isn&#8217;t
 sufficient room for both the heading and the reserved space, mom
@@ -1512,7 +1512,7 @@ numbered head element of each collated document).
=20
 <p>
 PREFIX_CHAPTER_NUMBER can be disabled by passing it any argument
-other than a digit (eg <b>OFF, QUIT, END, X</b>, etc), although,
+other than a digit (e.g., <b>OFF, QUIT, END, X</b>, etc), although,
 as noted above, mom will keep, and&mdash;in the case of collated
 documents&mdash;increment the chapter number, allowing you to turn
 prefixing of chapter numbers to numbered head elements off and on
@@ -1824,7 +1824,7 @@ Mom will alert you to this on stderr.
 <p>
 Linebreaks (&#8220;author linebreaks&#8221;, &#8220;section
 breaks&#8221;) are gaps in the vertical flow of running text that
-indicate a shift in content (eg a scene change in story).  They
+indicate a shift in content (e.g., a scene change in story).  They
 are frequently set off by typographic symbols, sometimes whimsical
 in nature.
 </p>
@@ -1884,7 +1884,7 @@ and a vertical adjustment factor.
 </p>
=20
 <p>
-The first argument is any valid groff character (eg <kbd>*</kbd>
+The first argument is any valid groff character (e.g., <kbd>*</kbd>
 [an asterisk], <kbd>\[dg]</kbd> [a dagger], <kbd>\f[ZD]\N'141\fP</kbd>
 [an arbitrary character from Zapf Dingbats], <kbd>\l'4P'</kbd> [a
 4-pica long rule]). Mom sets the character centred on the current
@@ -1988,7 +1988,7 @@ or underlined
 indented from the left margin.  Obviously, she&#8217;s thinking
 &#8220;quotes from poetry or song lyrics&#8221;, but with the
 <a href=3D"#quote-control">QUOTE control macros</a>
-you can change her defaults so QUOTE serves other needs, eg
+you can change her defaults so QUOTE serves other needs, e.g.,
 entering verbatim snippets of programming code, command-line
 instructions, and so on.  (See the
 <a href=3D"#code">CODE</a>
@@ -2101,7 +2101,7 @@ Macro: <b>QUOTE</b> <kbd class=3D"macro-args">[ ADJ=
UST +|-&lt;space&gt; ] | &lt;an
 <p>
 QUOTE is a toggle macro.  To begin a section of quoted text, invoke
 it with no argument, then type in your quote.  When you&#8217;re
-finished, invoke <kbd>.QUOTE</kbd> with any argument (eg <kbd>OFF,
+finished, invoke <kbd>.QUOTE</kbd> with any argument (e.g., <kbd>OFF,
 END, X, Q</kbd>...) to turn it off.  Example:
 <br/>
 <span class=3D"pre-in-pp">
@@ -2322,7 +2322,7 @@ Macro: <b>BLOCKQUOTE</b>  <kbd class=3D"macro-args"=
>[ ADJUST +|-&lt;space&gt; ] |
 BLOCKQUOTE is a toggle macro.  To begin a cited passage, invoke
 the tag with no argument, then type in your blockquote.  When
 you&#8217;re finished, invoke <kbd>.BLOCKQUOTE</kbd> with any
-argument (eg <kbd>OFF, END, X, Q</kbd>...) to turn it off.
+argument (e.g., <kbd>OFF, END, X, Q</kbd>...) to turn it off.
 Example:
 <br/>
 <span class=3D"pre-in-pp">
@@ -2553,7 +2553,7 @@ it as well, invoke <kbd>.CODE</kbd> with the argume=
nt,
 you want a break afterwards, you must supply it manually with
 <a href=3D"typesetting.html#br">BR</a>
 unless what follows immediately is a macro that automatically causes
-a break (eg
+a break (e.g.,
 <a href=3D"#pp">PP</a>).
 </p>
=20
@@ -2581,7 +2581,7 @@ introducing unwanted vertical whitespace.
=20
 <p>
 Passing any argument other than <kbd>BR</kbd>, <kbd>BREAK</kbd> or
-<kbd>SPREAD</kbd> to CODE (eg <kbd>OFF, QUIT, END, X,</kbd> etc.)
+<kbd>SPREAD</kbd> to CODE (e.g., <kbd>OFF, QUIT, END, X,</kbd> etc.)
 turns CODE off and returns the family, font, and smartquotes back to
 their former state.
 </p>
@@ -2820,7 +2820,7 @@ uppercase letters), <kbd>alpha</kbd> (for lowercase=
 letters),
 <p>
 The arguments, <kbd>ROMAN&lt;n&gt;</kbd> and
 <kbd>roman&lt;n&gt;</kbd>, are special.  You must append to them
-a digit (arabic, eg "1" or "9" or "17") saying how many items a
+a digit (arabic, e.g., "1" or "9" or "17") saying how many items a
 particular roman-numeralled LIST is going to have. Mom requires this
 information in order to align roman numerals sensibly, and will
 abort&mdash;with a message &mdash; if you don&#8217;t provide it.
@@ -2988,7 +2988,7 @@ which would produce
 Any single argument to <kbd>LIST</kbd> other than
 <kbd>BULLET</kbd>, <kbd>DASH</kbd>, <kbd>DIGIT</kbd>,
 <kbd>ALPHA</kbd>, <kbd>alpha</kbd>, <kbd>ROMAN&lt;n&gt;</kbd>,
-<kbd>roman&lt;n&gt;</kbd> or <kbd>USER</kbd> (eg
+<kbd>roman&lt;n&gt;</kbd> or <kbd>USER</kbd> (e.g.,
 <kbd>LIST&nbsp;OFF</kbd> or <kbd>LIST&nbsp;BACK</kbd>) takes you out
 of the current list.
 </p>
@@ -3373,7 +3373,7 @@ you must, at a minimum, tell it what line number yo=
u want the
 <a href=3D"definitions.html#outputline">output line</a>
 to have.  The optional arguments <kbd>which lines to number</kbd>
 and <kbd>gutter</kbd> allow you to state which lines should
-be numbered (eg every five or every ten lines), and the gutter to
+be numbered (e.g., every five or every ten lines), and the gutter to
 place between line numbers and
 <a href=3D"definitions.html#running">running text</a>.
 </p>
@@ -3838,7 +3838,7 @@ they&#8217;ll know the entry belongs to the previou=
s page).
 </p>
=20
 <p>
-Very exceptionally, two footnotes may have to be deferred (eg one
+Very exceptionally, two footnotes may have to be deferred (e.g., one
 occurs on the second to last line of a page, and another on the last
 line).  In such a circumstance, mom does not add
 a blank after the second deferred footnote.  If you&#8217;d like a blank
@@ -4317,12 +4317,12 @@ footnotes either by single line numbers, or line =
ranges.  If
 what you want is a single line number, you need only invoke
 <kbd>.FOOTNOTE</kbd>, <i>without the terminating</i> <kbd>\c</kbd>,
 at the appropriate place in running text.  Input lines after the
-footnote has been terminated (eg with <kbd>.FOOTNOTE OFF</kbd>)
+footnote has been terminated (e.g., with <kbd>.FOOTNOTE OFF</kbd>)
 must begin at the left margin.
 </p>
=20
 <p>
-If you want a range of line numbers (eg&nbsp;[5-11]&nbsp;),
+If you want a range of line numbers (e.g.,&nbsp;[5-11]&nbsp;),
 insert, directly into the first line of the range you want,
 the <a href=3D"definitions.html#inlines">inline escape</a>,
 <kbd>\*[FN_MARK]</kbd>.  For the terminating line number of the
@@ -4692,7 +4692,7 @@ is removed.
 By default, mom starts the endnotes page with a bold, centred head,
 &#8220;ENDNOTES&#8221;.  Subsequently, for each section in a
 <a href=3D"rectoverso.html#collate-intro">collated</a>
-document (eg chapters in a book), she identifies the section in bold
+document (e.g., chapters in a book), she identifies the section in bold
 type, flush left and underscored, followed by one-half linespace.
 Endnotes pertaining to the section are output underneath, identified
 by superscript numbers.  The text of the endnotes themselves is
@@ -5068,7 +5068,7 @@ Macro: <b>ENDNOTE_SPACING</b> <kbd class=3D"macro-a=
rgs">&lt;space to insert betwee
=20
 <p>
 If you'd like some whitespace between endnotes, just invoke
-ENDNOTE_SPACING with the amount of space you want, eg
+ENDNOTE_SPACING with the amount of space you want, e.g.,
 <br/>
 <span class=3D"pre-in-pp">
   .ENDNOTE_SPACING 6p
@@ -5522,7 +5522,7 @@ Invoked without an argument, <kbd>.ENDNOTES_HEADER_=
UNDERSCORE</kbd>
 will place a single rule underneath the endnotes page title.  Invoked
 with the argument, <kbd>DOUBLE</kbd>, ENDNOTES_HEADER_UNDERSCORE will
 double-underscore the title.  Invoked with any other non-numeric
-argument, (eg <kbd>OFF, NO, X</kbd>, etc.) the macro disables
+argument, (e.g., <kbd>OFF, NO, X</kbd>, etc.) the macro disables
 underscoring of the title.
 </p>
=20
@@ -5683,7 +5683,7 @@ endnotes either by single line numbers or by line r=
anges.  If
 what you want is a single line number, you need only invoke
 <kbd>.ENDNOTE</kbd> at the appropriate place in running
 text <i>without the terminating</i> <kbd>\c</kbd>.  Input lines
-after the endnote has been terminated (eg with <kbd>.ENDNOTE
+after the endnote has been terminated (e.g., with <kbd>.ENDNOTE
 OFF</kbd>) must begin at the left margin.
 </p>
=20
@@ -5697,7 +5697,7 @@ nothing to prevent you from doing so.)
 </p>
=20
 <p id=3D"en-mark">
-If you want a range of line numbers (eg&nbsp;[5-11]&nbsp;),
+If you want a range of line numbers (e.g.,&nbsp;[5-11]&nbsp;),
 insert, directly into the first line of the range you want, the
 <a href=3D"definitions.html#inlines">inline escape</a>,
 <kbd>\*[EN-MARK]</kbd>.  For the terminating line number of the
@@ -5774,7 +5774,7 @@ If you need less space (the total number of endnote=
s is less than 10) or
 more (the total number of endnotes is greater than 99), use the
 macro,
 <a href=3D"docelement.html#endnote-numbers-align">ENDNOTE_NUMBERS_ALIGN<=
/a>,
-to set the desired amount of reserved space, eg
+to set the desired amount of reserved space, e.g.,
 <br/>
 <span class=3D"pre-in-pp">
   .ENDNOTE_NUMBERS_ALIGN RIGHT 1
@@ -6153,7 +6153,7 @@ If you forget to do so, mom will issue a warning an=
d abort.
 <p>
 The arguments may be entered in any order, and since the list is
 long, use of the backslash character ( <kbd>\</kbd> ) to put each on
-a separate line is recommended, eg.
+a separate line is recommended, e.g.,
 <br/>
 <span class=3D"pre-in-pp">
   .MN_INIT \
@@ -6463,7 +6463,7 @@ this:
 <span class=3D"pre-in-pp">
     .FINIS_STRING_CAPS OFF
 </span>
-<kbd>OFF</kbd>, above, could be anything, eg <kbd>NO</kbd> or
+<kbd>OFF</kbd>, above, could be anything, e.g., <kbd>NO</kbd> or
 <kbd>X</kbd>.
 </p>
=20
diff --git a/contrib/mom/momdoc/docprocessing.html b/contrib/mom/momdoc/d=
ocprocessing.html
index 6250ca1..54cf30d 100644
--- a/contrib/mom/momdoc/docprocessing.html
+++ b/contrib/mom/momdoc/docprocessing.html
@@ -169,7 +169,7 @@ macros that control how they look and behave.
 Setting up a mom doc is a simple, four-part procedure.  You
 begin by entering metadata about the document itself (title,
 subtitle, author, etc.).  Next, you tell mom what kind of document
-you&#8217;re creating (eg chapter, letter, abstract, etc...) and
+you&#8217;re creating (e.g., chapter, letter, abstract, etc...) and
 what kind of output you want (typeset, typewritten, draft-style,
 etc) &mdash; essentially, templates.  Thirdly, you make as many
 or as few changes to the templates as you wish; in other words,
@@ -199,7 +199,7 @@ documentation, so just in case:
       visually 1-inch
   </li>
   <li>pages are numbered; the number appears centred, at the
-      bottom, surrounded by hyphens ( eg -6- )
+      bottom, surrounded by hyphens ( e.g., -6- )
   </li>
   <li>the first page of a document begins with a
       <a href=3D"definitions.html#docheader">document header</a>
@@ -235,7 +235,7 @@ Mom offers two modes of operation for ensuring flush =
bottom margins:
 shimming and flex-spacing.  Shimming means that mom nudges the
 next line after a significant break in running text back onto the
 <a href=3D"definitions.html#baseline-grid">baseline grid</a>
-(eg, after the insertion of a graphic).  Flex-spacing means that any
+(e.g., after the insertion of a graphic).  Flex-spacing means that any
 vertical whitespace remaining between the end of running text and
 the bottom margin is distributed equally at logical points on the
 page.
@@ -407,7 +407,7 @@ suppresses the SHIM macro, and enables flex-spacing.
 </p>
=20
 <p>
-NO_SHIM with any argument (eg <b>OFF, QUIT, END, X</b>, etc)
+NO_SHIM with any argument (e.g., <b>OFF, QUIT, END, X</b>, etc)
 re-enables shimming if it has been disabled and disables
 flex-spacing.
 </p>
@@ -515,7 +515,7 @@ is a
=20
 <p>
 It is typographically acceptable for there to be space between
-insertions in running text (eg an image) and the bottom margin when
+insertions in running text (e.g., an image) and the bottom margin when
 the next page begins with a paragraph.  If you&#8217;d like to
 nudge the insertion a little closer to the bottom margin&mdash;not
 all the way; that isn&#8217;t possible without pushing it to the
@@ -552,7 +552,7 @@ shimmed.
 </p>
=20
 <p>
-NO_FLEX with any argument (eg <b>OFF, QUIT, END, X</b>, etc)
+NO_FLEX with any argument (e.g., <b>OFF, QUIT, END, X</b>, etc)
 re-enables flex-spacing if it has been disabled.
 </p>
=20
@@ -972,7 +972,7 @@ the title of each article or entitled section), and a=
ppears
 </p>
=20
 <ol style=3D"list-style-type: lower-alpha">
-  <li>as the window title in PDF viewers (eg Okular or Evince)</li>
+  <li>as the window title in PDF viewers (e.g., Okular or Evince)</li>
   <li>in the initial rightmost position of page headers in the document<=
/li>
 </ol>
=20
@@ -1090,7 +1090,7 @@ Macro: <b>AUTHOR</b> <kbd class=3D"macro-args">[COV=
ER | DOC_COVER] &quot;&lt;autho
 </p>
=20
 <p>
-Each author string can hold as many names as you like, eg
+Each author string can hold as many names as you like, e.g.,
 <br/>
 <span class=3D"pre-in-pp" style=3D"margin-bottom: -1em;">
   .AUTHOR "Joe Blow"
@@ -1263,7 +1263,7 @@ page headers.
 <p>
 The style of the chapter title can be altered by
 <a href=3D"docelement.html#docelement-control">control macros</a>,
-eg CHAPTER_TITLE_FAMILY, CHAPTER_TITLE_FONT, etc.  The default
+e.g., CHAPTER_TITLE_FAMILY, CHAPTER_TITLE_FONT, etc.  The default
 family, font and point size are Times Roman, Bold Italic, 4 points
 larger than
 <a href=3D"definitions.html#running">running text</a>.
@@ -1512,7 +1512,7 @@ or
 Style parameters for the copyright line may be
 entered as individual macros or
 <a href=3D"docelement.html#grouping">grouped</a>,
-eg
+e.g.,
 <br/>
 <span class=3D"pre-in-pp">
   .COPYRIGHT_FAMILY H
@@ -1773,7 +1773,7 @@ the page header.
=20
 <p>
 <kbd>NAMED</kbd> takes an additional argument: a name for this
-particular kind of document (eg outline, synopsis, abstract,
+particular kind of document (e.g., outline, synopsis, abstract,
 memorandum), enclosed in double-quotes. <kbd>NAMED</kbd> is
 identical to <kbd>DEFAULT</kbd> except that mom prints the argument
 to <kbd>NAMED</kbd> beneath the
@@ -2314,7 +2314,7 @@ below have the following meanings:
   FAMILY         The family of all type in the document
   PT_SIZE        The point size of type in paragraphs; mom uses
                  this to calculate automatic point size changes
-                 (eg for heads, footnotes, quotes, headers, etc)
+                 (e.g., for heads, footnotes, quotes, headers, etc)
   LS/AUTOLEAD**  The leading used in paragraphs; all leading and
                  spacing of running text is calculated from this
=20
@@ -3465,14 +3465,14 @@ the tops of pages after the first.)
               point size (ie the point size used in paragraphs);
               subsequently disabled after START, except for calls
               to DOC_PT_SIZE
-             =20
+
              &bull;DOC_LEAD before DOC_PT_SIZE cancels the AUTOLEAD
               set before START
=20
              &bull;Invoked after START, remains in effect for all
               subsequent point size changes made with PT_SIZE,
               but does not affect the leading of the document
-              element tags (eg HEADING, PP, QUOTE...), or calls
+              element tags (e.g., HEADING, PP, QUOTE...), or calls
               to DOC_PT_SIZE
=20
   QUAD        &bull;Changes quad for the duration of the
@@ -3769,7 +3769,7 @@ Macro: <b>DOC_FAMILY</b> <kbd class=3D"macro-args">=
&lt;family&gt;</kbd>
       <li><a href=3D"docelement.html#endnote-intro">endnotes pages</a></=
li>
       <li><a href=3D"docelement.html#toc-intro">table of contents</a></l=
i>
   </ul></li>
-  <li>any page elements (eg headers page numbers, footnotes) whose
+  <li>any page elements (e.g., headers page numbers, footnotes) whose
       families you wish to remain at their old values must be
       reset with the appropriate
       <a href=3D"docelement.html#docelement-control">control macros</a>
@@ -3896,7 +3896,7 @@ You need do nothing special to terminate a document=
.  When groff
 finishes processing the last
 <a href=3D"definitions.html#inputline">input line</a>
 of a file, the page is ejected, subject to whatever routines are
-needed to complete it (eg printing footnotes or adding the page
+needed to complete it (e.g., printing footnotes or adding the page
 number).
 </p>
=20
@@ -3910,7 +3910,7 @@ page at the end of the formatted document.
=20
 <p>
 The situation is rare, generally occurring only when some additional
-macro is required after the input text, eg to exit a
+macro is required after the input text, e.g., to exit a
 <a href=3D"docelement.html#list-intro">list</a>
 or terminate a
 <a href=3D"docelement.html#quote">quote</a>.
diff --git a/contrib/mom/momdoc/headfootpage.html b/contrib/mom/momdoc/he=
adfootpage.html
index 2ef2bf4..2763fb1 100644
--- a/contrib/mom/momdoc/headfootpage.html
+++ b/contrib/mom/momdoc/headfootpage.html
@@ -426,7 +426,7 @@ Macro: <b>HEADERS</b> <kbd class=3D"macro-args">toggl=
e</kbd>
 <a href=3D"definitions.html#header">Page headers</a>
 are on by default.  If you don&#8217;t want them, turn them off by
 invoking <kbd>.HEADERS</kbd> with any argument (<b>OFF, QUIT,
-END, X...</b>), eg
+END, X...</b>), e.g.,
 <br/>
 <span class=3D"pre-in-pp">
     .HEADERS OFF
@@ -472,7 +472,7 @@ Macro: <b>FOOTERS</b> <kbd class=3D"macro-args">toggl=
e</kbd>
 are off by default.  If you want them instead of
 <a href=3D"definitions.html#header">headers</a>
 (you can&#8217;t have both), turn them on by invoking
-<kbd>.FOOTERS</kbd> without an argument, eg
+<kbd>.FOOTERS</kbd> without an argument, e.g.,
 <br/>
 <span class=3D"pre-in-pp">
     .FOOTERS
@@ -539,7 +539,7 @@ to headers/footers) can be designed to your own speci=
fications.
     </ul></li>
     <li><a href=3D"#hdrftr-right">HEADER_RIGHT</a></li>
     <li><a href=3D"#reserved-strings">Using mom&#8217;s reserved strings=
 in header/footer definitions</a>
-        (eg <kbd>\E*[$TITLE]</kbd> when you want
+        (e.g., <kbd>\E*[$TITLE]</kbd> when you want
         the title, <kbd>\E*[$AUTHOR]</kbd> when you want the author, etc=
.)
     </li>
     <li><a href=3D"#page-number-symbol">Replacing header-left, centre or=
 right with the page number</a></li>
@@ -1043,7 +1043,7 @@ or as defined by you with the
 simply invoke this macro (using the appropriate position) with no
 argument.  If you wish to turn capitalization off (say, for the
 header-right string that mom capitalizes by default), invoke the
-macro with any argument (eg <kbd>OFF, QUIT, END, X</kbd>...).
+macro with any argument (e.g., <kbd>OFF, QUIT, END, X</kbd>...).
 </p>
=20
 <p>
@@ -1061,7 +1061,7 @@ HEADER_&lt;POSITION&gt;_SMALLCAPS is a
 If you want any part of headers to be set in smallcaps, simply
 invoke this macro (using the appropriate position) with no argument.
 If you wish to turn the smallcaps off, invoke the macro with any
-argument (eg <kbd>OFF, QUIT, END, X</kbd>...).
+argument (e.g., <kbd>OFF, QUIT, END, X</kbd>...).
 </p>
=20
 <p>
@@ -1415,7 +1415,7 @@ Macro: <b>HEADER_RULE</b> <kbd class=3D"macro-args"=
>toggle</kbd>
 By default, mom prints a header separator rule underneath headers
 (or above footers). If you don&#8217;t want the rule, turn it off by
 invoking <kbd>.HEADER_RULE</kbd> with any argument (<kbd>OFF, QUIT,
-END, X...</kbd>), eg
+END, X...</kbd>), e.g.,
 <br/>
 <span class=3D"pre-in-pp">
   .HEADER_RULE OFF
@@ -1898,7 +1898,7 @@ to the style shown above to keep things manageable.
 <p>
 If you want to disable having both headers and footers on the same
 page, invoke <kbd>.HEADERS_AND_FOOTERS</kbd> with any argument
-you want (eg <kbd>OFF, QUIT, END, X...</kbd>). Mom will restore
+you want (e.g., <kbd>OFF, QUIT, END, X...</kbd>). Mom will restore
 her default behaviour of setting automatically generated page
 headers, with the page number, centered, at the bottom of the
 page.  If you would prefer footers instead of headers after turning
@@ -2018,7 +2018,7 @@ Macro: <b>PAGINATE</b> <kbd class=3D"macro-args">to=
ggle</kbd>
 By default, mom paginates documents (in the bottom margin).  If
 you&#8217;d prefer she not paginate, turn pagination off by invoking
 <kbd>.PAGINATE</kbd> with any argument (<kbd>OFF, NO, QUIT, END,
-X...</kbd>), eg
+X...</kbd>), e.g.,
 <br/>
 <span class=3D"pre-in-pp">
   .PAGINATE NO=20
diff --git a/contrib/mom/momdoc/images.html b/contrib/mom/momdoc/images.h=
tml
index 54c7ee3..7a2fe9e 100644
--- a/contrib/mom/momdoc/images.html
+++ b/contrib/mom/momdoc/images.html
@@ -786,7 +786,7 @@ Floats use
 <a href=3D"definitions.html#filled">no-fill mode</a>,
 with each input line beginning at the left margin.  If this is not
 what you want, you must specify the preferred horizontal alignment
-<i>within the float</i> (eg
+<i>within the float</i> (e.g.,
 <a href=3D"typesetting.html#lrc">CENTER</a>
 or
 <a href=3D"typesetting.html#lrc">RIGHT</a>).
@@ -972,7 +972,7 @@ before <kbd>.START</kbd>.
 <p>
 If
 <a href=3D"#autolabel">autolabelling</a>
-is enabled, eg <kbd>.AUTOLABEL_IMAGES</kbd> (List
+is enabled, e.g., <kbd>.AUTOLABEL_IMAGES</kbd> (List
 of Figures) or <kbd>.AUTOLABEL_PIC</kbd> (also List of Figures),
 the prefix is stripped from the label when it appears in
 the List.  Thus, if you have invoked <kbd>.AUTOLABEL_PIC</kbd>,
diff --git a/contrib/mom/momdoc/inlines.html b/contrib/mom/momdoc/inlines=
.html
index f8d93b1..bf2dcca 100644
--- a/contrib/mom/momdoc/inlines.html
+++ b/contrib/mom/momdoc/inlines.html
@@ -211,7 +211,7 @@ and/or
 HEADERS or FOOTERS, or in the strings passed to
 <a href=3D"headfootpage.html#headers-and-footers">HEADERS_AND_FOOTERS</a=
>,
 you must enter the inlines beginning with <kbd>\E*</kbd>
-rather than just <kbd>\*</kbd>, eg <kbd>\E*[BD]</kbd>.
+rather than just <kbd>\*</kbd>, e.g., <kbd>\E*[BD]</kbd>.
 </p>
 </div>
=20
@@ -418,7 +418,7 @@ HEADERS or FOOTERS, or in the strings passed to
 you <i>must</i> use the forms <kbd>\E*[BU&lt;n&gt;]</kbd>
 and <kbd>\E*[FU&lt;n&gt;]</kbd> (ie with no space), and enter the
 inline beginning with <kbd>\E*</kbd> rather than just <kbd>\*</kbd>,
-eg <kbd>\E*[BU4]</kbd>.
+e.g., <kbd>\E*[BU4]</kbd>.
 </p>
 =20
 <p class=3D"tip-bottom">
@@ -501,7 +501,7 @@ HEADERS or FOOTERS, or in the strings passed to
 you <i>must</i> use the forms <kbd>\E*[BP&lt;n&gt;]</kbd>
 and <kbd>\E*[FP&lt;n&gt;]</kbd> (ie with no space), and enter the
 inline beginning with <kbd>\E*</kbd> rather than just <kbd>\*</kbd>,
-eg <kbd>\E*[BP.75]</kbd>.
+e.g., <kbd>\E*[BP.75]</kbd>.
 </p>
 </div>
=20
@@ -569,7 +569,7 @@ HEADERS or FOOTERS, or in the strings passed to
 you <i>must</i> use the forms <kbd>\E*[ALD&lt;n&gt;]</kbd>
 and <kbd>\E*[RLD&lt;n&gt;]</kbd> (ie with no space), and enter the
 inline beginning with <kbd>\E*</kbd> rather than just <kbd>\*</kbd>,
-eg <kbd>\E*[ALD.5]</kbd>.
+e.g., <kbd>\E*[ALD.5]</kbd>.
 </p>
 </div>
=20
@@ -600,7 +600,7 @@ document entry for EL, you'd use <kbd>\*[B]</kbd> lik=
e this:
=20
 <h3 id=3D"tb-plus-mom" class=3D"docs">Call the next sequential tab witho=
ut advancing on the page</h3>
 <p>
-Sometimes, you want mom to move to the next tab in sequence (eg
+Sometimes, you want mom to move to the next tab in sequence (e.g.,
 from TAB 1 to TAB 2, or TAB 8 to TAB 9) without mom advancing on the
 page.  (See the NOTE
 <a href=3D"typesetting.html#note-tn">here</a>
@@ -914,7 +914,7 @@ used <kbd>\v</kbd> with the minus sign) or too low (i=
f you used
 <p>
 In the context of mom, the string width inline
 <kbd>\w'&lt;string&gt;'</kbd> primarily serves to let you establish the
-horizontal measure of something (eg indents) based on the length
+horizontal measure of something (e.g., indents) based on the length
 of a bit of text.  For example, if you want a left indent the length
 of the word &#8220;Examples:&#8221; plus a space, you can set it with
 the <kbd>\w</kbd> inline escape:
diff --git a/contrib/mom/momdoc/letters.html b/contrib/mom/momdoc/letters=
.html
index 0531534..a837c06 100644
--- a/contrib/mom/momdoc/letters.html
+++ b/contrib/mom/momdoc/letters.html
@@ -109,7 +109,7 @@ After the START macro, you enter headers pertinent to=
 your letter:
 the date, the addressee (in business correspondence, typically both
 name and address), the addresser (that&#8217;s you; in business
 correspondence, typically both name and address), and a greeting
-(in full, eg &#8220;Dear Mr. Smith,&#8221; or &#8220;Dear
+(in full, e.g., &#8220;Dear Mr. Smith,&#8221; or &#8220;Dear
 Mr. Smith:&#8221;).
 </p>
=20
@@ -486,7 +486,7 @@ Macro: <b>CLOSING</b>
=20
 <p>
 Invoke <kbd>.CLOSING</kbd> on a line by itself after the body of
-the letter, with the closing you&#8217;d like (eg &#8220;Yours
+the letter, with the closing you&#8217;d like (e.g., &#8220;Yours
 truly,&#8221;) underneath, like this:
 <br/>
 <span class=3D"pre-in-pp">
diff --git a/contrib/mom/momdoc/rectoverso.html b/contrib/mom/momdoc/rect=
overso.html
index 9a8ffba..112e6ef 100644
--- a/contrib/mom/momdoc/rectoverso.html
+++ b/contrib/mom/momdoc/rectoverso.html
@@ -219,7 +219,7 @@ together.  You need only concatenate chapters into a =
single file
 (most likely with the <kbd>cat</kbd> command), put <kbd>.COLLATE</kbd> a=
t the end of each
 concatenated chapter, follow it with the
 <a href=3D"docprocessing.html#reference-macros">reference macros</a>
-(metadata) needed for the new chapter, eg
+(metadata) needed for the new chapter, e.g.,
 <a href=3D"docprocessing.html#chapter">CHAPTER</a>
 or
 <a href=3D"docprocessing.html#chapter-string">CHAPTER_STRING</a>,
@@ -301,7 +301,7 @@ that require their own titles, looks like this:
 <span class=3D"tip">Tip:</span>
 If the last line of text before <kbd>.COLLATE</kbd>
 falls too close to the bottom margin, or if the line is followed
-by a macro likely to cause a linebreak (eg <kbd>.LIST OFF</kbd> or
+by a macro likely to cause a linebreak (e.g., <kbd>.LIST OFF</kbd> or
 <kbd>.IQ</kbd>), mom may output a superfluous blank page before
 the start of the following document.
 </p>
diff --git a/contrib/mom/momdoc/refer.html b/contrib/mom/momdoc/refer.htm=
l
index ef90caf..aa509e0 100644
--- a/contrib/mom/momdoc/refer.html
+++ b/contrib/mom/momdoc/refer.html
@@ -172,7 +172,7 @@ are separated from each other by a single, blank line=
.  The records
 themselves are composed of single lines (&#8220;fields&#8221;) with
 no blank lines between them.  Each field begins with a percent
 sign and a single letter (the &quot;field identifier&quot;)
-eg <kbd>%A</kbd> or <kbd>%T</kbd>.  The letter identifies
+e.g., <kbd>%A</kbd> or <kbd>%T</kbd>.  The letter identifies
 what part of a bibliographic entry the field refers to: Author,
 Title, Publisher, Date, etc.  After the field identifier comes
 a single space, followed by the information appropriate to
@@ -253,7 +253,7 @@ database &lt;full path to database&gt;
 </div>
 <p style=3D"margin-top: .5em; font-size: 95%; line-height: 120%;">
 <kbd>&lt;full&nbsp;path&nbsp;to&nbsp;the&nbsp;database&gt;</kbd>
-means the full path including the filename, eg
+means the full path including the filename, e.g.,
 <kbd>/home/user/refer/my-database-file</kbd>.
 </p>
=20
@@ -282,7 +282,7 @@ database &lt;full path to database&gt;
 </div>
 <p style=3D"margin-top: .5em; font-size: 95%; line-height: 120%;">
 <kbd>&lt;full&nbsp;path&nbsp;to&nbsp;the&nbsp;database&gt;</kbd>
-means the full path including the filename, eg
+means the full path including the filename, e.g.,
 <kbd>/home/user/refer/my-database-file</kbd>.
 </p>
=20
@@ -313,7 +313,7 @@ database &lt;full path to database&gt;
=20
 <p style=3D"margin-top: .5em; font-size: 95%; line-height: 120%;">
 <kbd>&lt;full&nbsp;path&nbsp;to&nbsp;the&nbsp;database&gt;</kbd>
-means the full path including the filename, eg
+means the full path including the filename, e.g.,
 <kbd>/home/user/refer/my-database</kbd>.
 </p>
=20
@@ -752,7 +752,7 @@ are very few rules, and those there are make sense.  =
In a nutshell:
       escapes <kbd>\*[IT]</kbd> and <kbd>\*[PREV]</kbd>; if the italiciz=
ed
       portion concludes the field, omit <kbd>\*[PREV]</kbd></li>
   <li>if you require characters with accents, ligatures or special
-      symbols, use groff&#8217;s &#8220;named&#8221; glyphs (eg.
+      symbols, use groff&#8217;s &#8220;named&#8221; glyphs (e.g.,
       <kbd>\['e]</kbd> for <kbd>=C3=A9</kbd>); a full list can be found =
in
       <kbd>man groff_char</kbd></li>
 </ul>
@@ -763,11 +763,11 @@ are very few rules, and those there are make sense.=
  In a nutshell:
 <span class=3D"pre">
 <a class=3D"quick" href=3D"#A">%A</a> author           &ndash; records m=
ay contain multiple authors,
                       one per line
-<a class=3D"quick" href=3D"#Q">%Q</a> non-human author &ndash; corporate=
 author, eg. National Geographic;
+<a class=3D"quick" href=3D"#Q">%Q</a> non-human author &ndash; corporate=
 author, e.g., National Geographic;
                       may also be used for exceptional reference types
 <a class=3D"quick" href=3D"#m">%m</a> multiple authors &ndash; whenever =
"et al." is desirable
 <a class=3D"quick" href=3D"#i">%i</a> idem             &ndash; multiple =
works by the same author
-<a class=3D"quick" href=3D"#p">%p</a> post-author      &ndash; post-auth=
or information (eg appendix,
+<a class=3D"quick" href=3D"#p">%p</a> post-author      &ndash; post-auth=
or information (e.g., appendix,
                       foreword, letter)
 %T title            &ndash; primary title (of a book) or the
                       title of an article (within a scholarly
@@ -788,7 +788,7 @@ are very few rules, and those there are make sense.  =
In a nutshell:
     newspaper
 %J journal          &ndash; when %T contains the title of an article
 %e edition          &ndash; number or name of an edition
-                      (eg Second, 2nd, Collector's, etc.)
+                      (e.g., Second, 2nd, Collector's, etc.)
 %S series           &ndash; series name of books or journals
 %V volume           &ndash; volume number (of books)
 %N journal number   &ndash; journal or magazine number
@@ -805,7 +805,7 @@ are very few rules, and those there are make sense.  =
In a nutshell:
 <a class=3D"quick" href=3D"#n">%n</a> annotation       &ndash; annotatio=
n to the reference
 %s site name        &ndash; for internet references, the website name
 %c content          &ndash; for internet references, the source of
-                      the material (eg. Web or Email); for websites,
+                      the material (e.g., Web or Email); for websites,
                       the content, if unclear
 %o organization     &ndash; for internet sites, the organization, group
                       or sponsor of the site
@@ -930,7 +930,7 @@ like this:
=20
 <p>
 Use this only if the author and the editor are not one in the same,
-eg
+e.g.,
 <br/>
 <span class=3D"pre-in-pp">
   %A Geoffrey Chaucer
@@ -2030,7 +2030,7 @@ Invoked without an argument,
 underneath the bibliography&#8217;s first-page title.  Invoked with the
 argument, <kbd>DOUBLE</kbd>, BIBLIOGRAPHY_STRING_UNDERSCORE will
 double-underscore the title.  Invoked with any other non-numeric
-argument, (eg <kbd>OFF, NO, X</kbd>, etc.) the macro disables
+argument, (e.g., <kbd>OFF, NO, X</kbd>, etc.) the macro disables
 underlining of the title.
 </p>
=20
diff --git a/contrib/mom/momdoc/tables-of-contents.html b/contrib/mom/mom=
doc/tables-of-contents.html
index 0f872e1..2f907e1 100644
--- a/contrib/mom/momdoc/tables-of-contents.html
+++ b/contrib/mom/momdoc/tables-of-contents.html
@@ -298,7 +298,7 @@ invoke <kbd>.TOC</kbd> with <kbd>INCLUDE_TITLE</kbd>.
 <span class=3D"note">Note:</span>
 If the last line of text in a document, before <kbd>.TOC</kbd>,
 falls too close to the bottom margin, or if the line is followed
-by a macro likely to cause a linebreak (eg <kbd>.LIST OFF</kbd> or
+by a macro likely to cause a linebreak (e.g., <kbd>.LIST OFF</kbd> or
 <kbd>.IQ</kbd>), mom may output a superfluous blank page before the
 Table of Contents.
 </p>
@@ -351,7 +351,7 @@ themselves (overall family, headers/footers, paginati=
on, etc).
     <li><a href=3D"#paginate-toc">PAGINATE_TOC</a> &ndash; turn table of=
 contents pagination on or off</li>
     <li><a href=3D"#toc-pagenum-style">TOC_PAGENUM_STYLE</a> &ndash; tab=
le of contents page numbering style</li>
   </ul></li>
-  <li><a href=3D"#toc-header">Header string (eg &#8220;Contents&#8221;) =
and style</a>
+  <li><a href=3D"#toc-header">Header string (e.g., &#8220;Contents&#8221=
;) and style</a>
   <ul style=3D"margin-left: -.5em;">
     <li><a href=3D"#toc-header-string">Changing the header string</a></l=
i>
     <li><a href=3D"#toc-header-v-pos">Header string vertical placement</=
a></li>
@@ -654,7 +654,7 @@ documents) and headings as they appear in the table o=
f contents:
         Head level 3
           ...
 </span>
-The style for title entries (eg chapter numbers or titles) and
+The style for title entries (e.g., chapter numbers or titles) and
 heading levels is controlled by
 <a href=3D"#toc-title-style">TOC_TITLE_STYLE </a>
 and
diff --git a/contrib/mom/momdoc/typesetting.html b/contrib/mom/momdoc/typ=
esetting.html
index 7f5c9d4..315def4 100644
--- a/contrib/mom/momdoc/typesetting.html
+++ b/contrib/mom/momdoc/typesetting.html
@@ -236,7 +236,7 @@ or
 or
 <a href=3D"#page">PAGE</a>),
 you must include <kbd>-P-p&lt;papersize&gt;</kbd> on whichever
-command line you use, eg
+command line you use, e.g.,
 <br/>
 <span class=3D"pre-in-pp">
   pdfmom -Tps -mom -P-plegal
@@ -504,7 +504,7 @@ and right margin, like this:
 That way, you don&#8217;t have to worry about calculating the line
 length.  On the other hand, if you know the line length for a patch
 of type should be 17 picas and 3 points, entering the line length
-with LL is much easier than calculating the right margin, eg
+with LL is much easier than calculating the right margin, e.g.,
 <br/>
 <span class=3D"pre-in-pp">
   .LL 17P+3p
@@ -1106,7 +1106,7 @@ is measured in points.  Therefore, to change the ty=
pe size to, say,
 <span class=3D"pre-in-pp">
   .PT_SIZE 11
 </span>
-Point sizes may be fractional (eg  10.25 or 12.5).
+Point sizes may be fractional (e.g., 10.25 or 12.5).
 </p>
=20
 <p>
@@ -1170,7 +1170,7 @@ Macro: <b>LS</b> <kbd class=3D"macro-args">&lt;dist=
ance between lines&gt;</kbd>
 <p>
 LS (Line Space) takes one argument: the distance you want, typically
 in points, from baseline to baseline of type.  The argument may be
-fractional (eg 12.25 or 14.5).  Like PT_SIZE, LS does not require
+fractional (e.g., 12.25 or 14.5).  Like PT_SIZE, LS does not require
 a unit of measure, since
 <a href=3D"definitions.html#leading">leading</a>
 is most often given in points.  Therefore, to set the linespace to
@@ -1241,7 +1241,7 @@ requests automatically update the linespacing by th=
e autolead amount.
 Used in this way, AUTOLEAD does not require a unit of measure;
 points is assumed.  However, you may use an alternate unit of
 measure by appending it to the argument.  The argument may be a
-decimal fraction (eg .5 or 2.75).
+decimal fraction (e.g., .5 or 2.75).
 </p>
=20
 <p>
@@ -2170,7 +2170,7 @@ explicit hyphens (ie the actual hyphen character) d=
o not.
=20
 <p>
 HY MARGIN sets the amount of room allowed at the end of a line
-before hyphenation is tripped (eg if there&#8217;s only 6 points
+before hyphenation is tripped (e.g., if there&#8217;s only 6 points
 left at the end of a line, groff won&#8217;t try to hyphenate the
 next word).  HY MARGIN only applies if you&#8217;re using
 <a href=3D"#quad">QUAD</a>,
@@ -2494,7 +2494,7 @@ Macro: <b>KERN</b> <kbd class=3D"macro-args">toggle=
</kbd>
 <p>
 By itself (ie with no argument), KERN turns automatic pairwise
 <a href=3D"definitions.html#kern">kerning</a>
-on.  With any argument (eg OFF, Q, X), pairwise kerning is turned
+on.  With any argument (e.g., OFF, Q, X), pairwise kerning is turned
 off.
 </p>
=20
@@ -3791,7 +3791,7 @@ string tab markers.
 </span>
 String tab 1 begins at the start of the line and ends after the word
 &#8220;time&#8221;.  String tab 2 starts at &#8220;good&#8221; and
-ends after &#8220;men&#8221;.  Inline escapes (eg font or point
+ends after &#8220;men&#8221;.  Inline escapes (e.g., font or point
 size changes, or horizontal movements, including
 <a href=3D"goodies.html#pad">padding</a>)
 are taken into account when mom determines the position and length
diff --git a/contrib/mom/momdoc/using.html b/contrib/mom/momdoc/using.htm=
l
index 67a34e9..ea179bd 100644
--- a/contrib/mom/momdoc/using.html
+++ b/contrib/mom/momdoc/using.html
@@ -154,7 +154,7 @@ flyer for your lost dog, the following apply.
   <li>
     <a href=3D"definitions.html#stringargument">String arguments</a>,
     in the sense of this manual, must be surrounded by double-quotes
-    (eg <kbd>"text"</kbd>).  Multiple
+    (e.g., <kbd>"text"</kbd>).  Multiple
     string arguments are separated from each other by spaces (with
     each argument surrounded by double-quotes).
     <br/>
diff --git a/contrib/mom/om.tmac-u b/contrib/mom/om.tmac-u
index b92ff75..055ddfe 100644
--- a/contrib/mom/om.tmac-u
+++ b/contrib/mom/om.tmac-u
@@ -5001,7 +5001,7 @@ y\R'#DESCENDER \\n[.cdp]'
 \# TYPE-STYLE CONTROL MACROS
 \# -------------------------
 \# The control macros for family, font, size, color and quad are
-\# here grouped together.  Each (eg _FAMILY) uses the calling alias
+\# here grouped together.  Each (e.g., _FAMILY) uses the calling alias
 \# to determine the document element to which the style parameter
 \# applies.  Defaults for all these guys are set in DEFAULTS, and
 \# listed in the "Control Macros" section of the documentation
@@ -5181,7 +5181,7 @@ y\R'#DESCENDER \\n[.cdp]'
 .       substring c1-c5 0 4  \" Grab first five letters of the alias
 .    \}
 .\"  If none of the following, convert the substring of the
-.\"  calling alias, ie \*[ELEMENT], into the parameter string, eg
+.\"  calling alias, ie \*[ELEMENT], into the parameter string, e.g.,
 .\"  $TITLE_FAM, assign arg, and set register.
 .    if !'\\*[c1-c5]'BIBLI' \
 .    if !'\\*[c1-c5]'BLOCK' \
@@ -14364,7 +14364,7 @@ E\\R'#CAP_HEIGHT \\n[.cht]'
 \!.     if \\\\n[.vpt]=3D0 .vpt
 \!.     ne 3
 .       vs \\n[#EN_LEAD]u
-.\" Print identifying doc title (eg Chapter n)
+.\" Print identifying doc title (e.g., Chapter n)
 .       if \\n[#EN_NUMBER]=3D1 \{\
 .          if \\n[#PRINT_STYLE]=3D1 .TYPEWRITER
 .          if \\n[#PRINT_STYLE]=3D2 \{\
@@ -21179,7 +21179,7 @@ does not fit on page \\n[pgnum]\\*[col-num].
 .if '\\*[eval*[A]'.' \
 .   if !'\\*[$REF_STYLE]'NOTE' .chop [A
 .\" Per MLA, NOTE should not use idem, therefore if %i contains other th=
an
-.\" idem (eg. ed., trans.), transpose it to after author's name
+.\" idem (e.g., ed., trans.), transpose it to after author's name
 .ie '\\*[$REF_STYLE]'NOTE' \{\
 .   ie !'\\*[idem]'' .ref*field A "" "" ", \\*[idem]"
 .   el .ref*field A
@@ -21224,7 +21224,7 @@ does not fit on page \\n[pgnum]\\*[col-num].
 .\}
 .ref*field m ,
 ..
-\# %p Post-author string (eg. Preface, Foreword, etc)
+\# %p Post-author string (e.g., Preface, Foreword, etc)
 .de ref*add-p
 .\" Convert first letter to uppercase, per MLA, if BIBLIO
 .if '\\*[$REF_STYLE]'BIBLIO' \{\
@@ -21557,7 +21557,7 @@ does not fit on page \\n[pgnum]\\*[col-num].
 .ie '\\*[$REF_STYLE]'NOTE' ref*field G ,
 .el .ref*field G . " "
 ..
-\# %O Other (info that goes after %T [or %B] but is hard to categorize; =
eg a dissertation)
+\# %O Other (info that goes after %T [or %B] but is hard to categorize; =
e.g., a dissertation)
 .de ref*add-O
 .ds eval*[O \\*([O
 .substring eval*[O -1
diff --git a/font/devps/generate/Makefile b/font/devps/generate/Makefile
index 2cf67d2..2b75cce 100644
--- a/font/devps/generate/Makefile
+++ b/font/devps/generate/Makefile
@@ -27,7 +27,7 @@
 SHELL =3D /bin/sh
=20
 # Directory containing AFM files.  Must not be current directory.
-# Either long names (eg Times-Roman.afm) or short names (eg timesr.afm)
+# Either long names (e.g., Times-Roman.afm) or short names (e.g., timesr=
.afm)
 # may be used. See the afmname script.
 afmdir=3D/usr/local/lib/afm
=20
diff --git a/src/preproc/eqn/TODO b/src/preproc/eqn/TODO
index 210d0ab..2a22183 100644
--- a/src/preproc/eqn/TODO
+++ b/src/preproc/eqn/TODO
@@ -17,7 +17,7 @@ Consider whether there should be extra space at the sid=
e of piles.
=20
 Provide scriptstyle displaystyle etc.
=20
-Provide a nicer matrix syntax, eg
+Provide a nicer matrix syntax, e.g.,
 matrix ccc {
 a then b then c above
 e then f then g above
diff --git a/src/preproc/pic/pic.ypp b/src/preproc/pic/pic.ypp
index 8decce3..7343aa7 100644
--- a/src/preproc/pic/pic.ypp
+++ b/src/preproc/pic/pic.ypp
@@ -219,7 +219,7 @@ box "foo" above ljust =3D=3D box ("foo" above ljust)
=20
 %left LEFT RIGHT
 /* Give attributes that take an optional expression a higher
-precedence than left and right, so that eg `line chop left'
+precedence than left and right, so that, e.g., `line chop left'
 parses properly. */
 %left CHOP SOLID DASHED DOTTED UP DOWN FILL COLORED OUTLINED
 %left XSLANTED YSLANTED
diff --git a/src/preproc/pic/troff.cpp b/src/preproc/pic/troff.cpp
index e7bf413..32ca015 100644
--- a/src/preproc/pic/troff.cpp
+++ b/src/preproc/pic/troff.cpp
@@ -421,7 +421,7 @@ static const char *choose_delimiter(const char *text)
 void troff_output::text(const position &center, text_piece *v, int n,
 			double ang)
 {
-  line_thickness(BAD_THICKNESS); // the text might use lines (eg in equa=
tions)
+  line_thickness(BAD_THICKNESS); // text might use lines (e.g., in equat=
ions)
   int rotate_flag =3D 0;
   if (driver_extension_flag && ang !=3D 0.0) {
     rotate_flag =3D 1;
diff --git a/src/preproc/refer/TODO b/src/preproc/refer/TODO
index 5bbd9bf..e0fe4bf 100644
--- a/src/preproc/refer/TODO
+++ b/src/preproc/refer/TODO
@@ -17,7 +17,7 @@ back to filenames.
 Rename join-authors to join-fields.  Have a separate label-join-fields
 command used by @ and #.
=20
-Have some sort of quantifier: eg $.n#A means execute `$.n' for each
+Have some sort of quantifier: e.g., $.n#A means execute `$.n' for each
 instance of an A field, setting $ to that field, and then join the
 results using the join-authors command.
=20
diff --git a/src/roff/troff/TODO b/src/roff/troff/TODO
index bc4c829..2c36ab1 100644
--- a/src/roff/troff/TODO
+++ b/src/roff/troff/TODO
@@ -73,11 +73,11 @@ Request to set character slant.
 Provide some way to upcase or downcase strings.
=20
 Support non-uniformly scalable fonts. Perhaps associate a suffix with
-a particular range of sizes.  eg
+a particular range of sizes.  E.g.,
   sizesuffix .display 14-512
 Then is you ask for R at pointsize 16, groff will first look for
 R.display and then R.  Probably necessary to be able to specify a
-separate unitwidth for each sizesuffix (eg. for X).
+separate unitwidth for each sizesuffix (e.g., uuu for X).
=20
 Make it possible to suppress hyphenation on a word-by-word basis.
 (Perhaps store hyphenation flags in tfont.)
diff --git a/src/roff/troff/div.cpp b/src/roff/troff/div.cpp
index bf62d62..50cede7 100644
--- a/src/roff/troff/div.cpp
+++ b/src/roff/troff/div.cpp
@@ -178,12 +178,12 @@ macro_diversion::macro_diversion(symbol s, int appe=
nd)
 {
 #if 0
   if (append) {
-    /* We don't allow recursive appends eg:
+    /* We don't allow recursive appends, e.g.:
=20
       .da a
       .a
       .di
-     =20
+
       This causes an infinite loop in troff anyway.
       This is because the user could do
=20
diff --git a/src/roff/troff/env.cpp b/src/roff/troff/env.cpp
index f242d4e..86d340c 100644
--- a/src/roff/troff/env.cpp
+++ b/src/roff/troff/env.cpp
@@ -777,7 +777,7 @@ environment::environment(const environment *e)
   suppress_next_eol(e->suppress_next_eol),
   seen_break(e->seen_break),
   tabs(e->tabs),
-  name(e->name),		// so that eg `.if "\n[.ev]"0"' works
+  name(e->name),		// so that, e.g., `.if "\n[.ev]"0"' works
   control_char(e->control_char),
   no_break_control_char(e->no_break_control_char),
   hyphen_indicator_char(e->hyphen_indicator_char)
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index 7cc2d91..5e546d9 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -3733,7 +3733,7 @@ void macro_iterator::shift(int n)
   }
 }
=20
-// This gets used by eg .if '\?xxx\?''.
+// This gets used by, e.g., .if '\?xxx\?''.
=20
 int operator=3D=3D(const macro &m1, const macro &m2)
 {
@@ -5595,7 +5595,7 @@ static void skip_alternative()
 	  ;
       }
     /*
-      Note that the level can properly be < 0, eg
+      Note that the level can properly be < 0, e.g.
 =09
 	.if 1 \{\
 	.if 0 \{\
diff --git a/tmac/TODO b/tmac/TODO
index f9fd490..89da313 100644
--- a/tmac/TODO
+++ b/tmac/TODO
@@ -15,7 +15,7 @@ footnote height.)
 Possibly have a place above which the footnote trap must not be
 placed.
=20
-Improved indexing, not using tm, controlled by string variable (eg
+Improved indexing, not using tm, controlled by string variable (e.g.,
 -dIDX=3Dfile.idx).
=20
 When changing from multi-column to narrower columns, we could avoid
diff --git a/tmac/an-old.tmac b/tmac/an-old.tmac
index 1091e3d..22a5e18 100644
--- a/tmac/an-old.tmac
+++ b/tmac/an-old.tmac
@@ -507,7 +507,7 @@
 .  ns
 ..
 .
-.ds an-empty \" this is referenced to avoid looping on eg .RB ( \\ )
+.ds an-empty \" this is referenced to avoid looping on, e.g., .RB ( \\ )
 .
 .de1 RI
 .  if \\n[.$] \{\


From MAILER-DAEMON Sun Oct 22 19:20:01 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1e6PXF-0001Gv-Mi
	for mharc-groff-commit@gnu.org; Sun, 22 Oct 2017 19:20:01 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:53646)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6PXD-0001Ga-2a
	for groff-commit@gnu.org; Sun, 22 Oct 2017 19:20:00 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6PXB-0004TQ-Nt
	for groff-commit@gnu.org; Sun, 22 Oct 2017 19:19:59 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:57339)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6PXB-0004TA-Jo
	for groff-commit@gnu.org; Sun, 22 Oct 2017 19:19:57 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id 63B44209A7; Sun, 22 Oct 2017 19:19:57 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/01: webpage.ps: Fix minor source format issues.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: "G. Branden Robinson" <g.branden.robinson@gmail.com>
In-Reply-To: groff@gnu.org
References: <20171022231956.648.75174@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 956d8a0e74d13f24429a2b6909f3f4b6339f1076
Auto-Submitted: auto-generated
Message-Id: <20171022231957.63B44209A7@vcs0.savannah.gnu.org>
Date: Sun, 22 Oct 2017 19:19:57 -0400 (EDT)
From: g.branden.robinson@gmail.com (G. Branden Robinson)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit/>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Oct 2017 23:20:00 -0000

gbranden pushed a commit to branch master
in repository groff.

commit 956d8a0e74d13f24429a2b6909f3f4b6339f1076
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Sun Oct 22 19:17:06 2017 -0400

    webpage.ps: Fix minor source format issues.
   =20
    * Add linebreaks at the ends of the few sentences that didn't already
      have them.
    * Use character escapes for non-ASCII glyphs in the few places where
      this was not already the case.
   =20
    This is now a plain ASCII file.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 doc/webpage.ms | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/doc/webpage.ms b/doc/webpage.ms
index 98c0ac9..af5e848 100644
--- a/doc/webpage.ms
+++ b/doc/webpage.ms
@@ -134,10 +134,10 @@ Included in this release are implementations of `tr=
off', `pic', `eqn',
 `tbl', `grn', `refer', `\-man', `\-mdoc', `\-mom', and `\-ms' macros, an=
d
 drivers for `PostScript', `PDF', `TeX DVI' format, `HP LaserJet\~4'
 printers, `Canon CAPSL' printers, `HTML' and `XHTML' formats (beta statu=
s),
-and typewriter-like devices.  Also included is a modified version of the
-Berkeley `\-me' macros, the enhanced version `gxditview' of the X11
-`xditview' previewer, and an implementation of the `\-mm' macros contrib=
uted
-by J\[:o]rgen H\[:a]gg.
+and typewriter-like devices.
+Also included is a modified version of the Berkeley `\-me' macros, the
+enhanced version `gxditview' of the X11 `xditview' previewer, and an
+implementation of the `\-mm' macros contributed by J\[:o]rgen H\[:a]gg.
=20
 See the file `INSTALL' for installation instructions on how to install f=
rom
 a release.
@@ -726,9 +726,9 @@ Pic now supports up to 32 macro arguments (and up to =
16 on EBCDIC
 platforms).
=20
 .LI
-Heinz-J=EF=BF=BDrgen =EF=BF=BDrtel contributed code for two new keywords=
, `xslanted' and
-`yslanted', which can change the shape of boxes into arbitrary
-parallelograms.
+Heinz-J\[:u]rgen \[:O]rtel contributed code for two new keywords,
+`xslanted' and `yslanted', which can change the shape of boxes into
+arbitrary parallelograms.
 .ULE
 .
 .
@@ -897,7 +897,7 @@ This package currently works with `\-Tps' only.
 \-mandoc now supports multiple man pages (in either man or mdoc format).
=20
 .LI
-Fabrice M=EF=BF=BDnard contributed locales support.
+Fabrice M\['e]nard contributed locales support.
 In particular, it is now possible to get French localization of the main
 macro packages (\-ms, \-mm, \-me, and \-mom, but not \-man and \-mdoc
 which are localized differently) by appending `-mfr' to the list of macr=
o
@@ -1030,8 +1030,8 @@ The following macros aren't new but haven't been do=
cumented previously:
 .in
=20
 .LI
-The following keywords have been extended.  Again, this isn't new but
-hasn't been documented previously:
+The following keywords have been extended.
+Again, this isn't new but hasn't been documented previously:
=20
 .in 2m
 .ft B
@@ -1634,8 +1634,8 @@ The glyphs \e[*e] and \e[+e] have been exchanged to=
 be in sync with
 all other devices.
=20
 .LI
-The glyph \e[~=3D] is now called \e[|=3D].  Similar to other devices, \e=
[~=3D]
-is now another name for glyph \e[~~].
+The glyph \e[~=3D] is now called \e[|=3D].
+Similar to other devices, \e[~=3D] is now another name for glyph \e[~~].
 .ULE
 .
 .
@@ -1855,9 +1855,9 @@ papersize /etc/papersize a4
=20
 .LI
 A local font directory has been prepended to the default font path; it
-defaults to /usr/local/share/groff/site-font.  Similar to the normal
-font searching process, files must be placed into a dev\f[I]XXX\f[]
-subdirectory, e.g.
+defaults to /usr/local/share/groff/site-font.
+Similar to the normal font searching process, files must be placed into
+a dev\f[I]XXX\f[] subdirectory, e.g.
=20
 .in 2m
 .ft C
@@ -2078,7 +2078,8 @@ a
 .fi
 .in
=20
-The result is `x\~a'.  Using `tr', the result would be `x\~x'.
+The result is `x\~a'.
+Using `tr', the result would be `x\~x'.
=20
 .LI
 The request `pvs' isn't new, but hasn't been documented before.
@@ -2164,8 +2165,9 @@ A new macro `Ex' has been added to the mdoc macro p=
ackage to document an
 exit status.
=20
 .LI
-`troff.man' has been split.  Differences to UNIX troff are now documente=
d
-in the new man page `groff_diff.man'.
+`troff.man' has been split.
+Differences to UNIX troff are now documented in the new man page
+`groff_diff.man'.
=20
 .LI
 The PSPIC macro has been extended to work with DVI output (`pspic.tmac' =
is


From MAILER-DAEMON Sun Oct 22 19:34:38 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1e6PlO-0006By-IF
	for mharc-groff-commit@gnu.org; Sun, 22 Oct 2017 19:34:38 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:38777)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6Pkm-00068N-9P
	for groff-commit@gnu.org; Sun, 22 Oct 2017 19:34:37 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6Pjh-00056E-Rv
	for groff-commit@gnu.org; Sun, 22 Oct 2017 19:34:00 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:57458)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6Pjh-00055K-2L
	for groff-commit@gnu.org; Sun, 22 Oct 2017 19:32:53 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id B1CCA20989; Sun, 22 Oct 2017 19:32:52 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/01: Fix doubled words "the" and "to".
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: "G. Branden Robinson" <g.branden.robinson@gmail.com>
In-Reply-To: groff@gnu.org
References: <20171022233251.5718.60396@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 529857da03ef68eeb9b11dd94b219df168c29de7
Auto-Submitted: auto-generated
Message-Id: <20171022233252.B1CCA20989@vcs0.savannah.gnu.org>
Date: Sun, 22 Oct 2017 19:32:52 -0400 (EDT)
From: g.branden.robinson@gmail.com (G. Branden Robinson)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit/>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Oct 2017 23:34:37 -0000

gbranden pushed a commit to branch master
in repository groff.

commit 529857da03ef68eeb9b11dd94b219df168c29de7
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Sun Oct 22 19:31:19 2017 -0400

    Fix doubled words "the" and "to".
   =20
    Based on (but expanded from) a report by Bjarni Ingi Gislason
    <bjarniig@rhi.hi.is>.
   =20
    Fixes Savannah #51078.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 Makefile.am                          | 2 +-
 TESTS                                | 2 +-
 contrib/mom/examples/sample_docs.mom | 2 +-
 contrib/mom/momdoc/images.html       | 2 +-
 contrib/mom/momdoc/inlines.html      | 2 +-
 contrib/mom/om.tmac-u                | 8 ++++----
 contrib/pdfmark/pdfmark.tmac         | 2 +-
 src/include/font.h                   | 2 +-
 src/preproc/eqn/over.cpp             | 2 +-
 src/preproc/grn/hgraph.cpp           | 4 ++--
 src/preproc/refer/TODO               | 2 +-
 src/utils/hpftodit/hpftodit.cpp      | 2 +-
 12 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 9055036..4b4b414 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -457,7 +457,7 @@ man7dir=3D$(manroot)/man$(man7ext)
 #				(Reiser) preprocessor
 # ARRAY_DELETE_NEEDS_SIZE	if your C++ doesn't understand `delete []'
 #
-# PAGE=3DA4			if the the printer's page size is A4
+# PAGE=3DA4			if the printer's page size is A4
 # GHOSTSCRIPT=3Dgs		the name (and directory if required) of the
 #				ghostscript program
=20
diff --git a/TESTS b/TESTS
index a7104f3..d9dd644 100644
--- a/TESTS
+++ b/TESTS
@@ -42,7 +42,7 @@ Tests
   mkdir -p ~/tmp/automake
   make install DESTDIR=3D~/tmp/automake
=20
--> Comparison with the tree installed by the the reference version
+-> Comparison with the tree installed by the reference version
=20
   make uninstall DESTDIR=3D~/tmp/automake
=20
diff --git a/contrib/mom/examples/sample_docs.mom b/contrib/mom/examples/=
sample_docs.mom
index 79ff594..97e9524 100644
--- a/contrib/mom/examples/sample_docs.mom
+++ b/contrib/mom/examples/sample_docs.mom
@@ -15,7 +15,7 @@
 \#
 \# Since the text throughout is greeked, and groff doesn't know how
 \# to hyphenate all that pseudo-latinate nonsense, I've inserted
-\# discretionary hyphens (\%) into a large number of the the words.
+\# discretionary hyphens (\%) into a large number of the words.
 \# Normally, this isn't necessary.
 \#
 \# The PRINTSTYLE is TYPESET.  If you'd like to see what mom does
diff --git a/contrib/mom/momdoc/images.html b/contrib/mom/momdoc/images.h=
tml
index 7a2fe9e..f98c570 100644
--- a/contrib/mom/momdoc/images.html
+++ b/contrib/mom/momdoc/images.html
@@ -2564,7 +2564,7 @@ the indent and line length of the blockquote.
 Floating labels and captions attached to <b>FLOAT</b>s are always
 quadded over the prevailing document line length, and require the
 <kbd>INDENT</kbd> argument if you want to align them with the left
-and/or right edges the the float&#8217;s contents.
+and/or right edges of the float&#8217;s contents.
 </p>
=20
 <h4 class=3D"docs">INDENT</h4>
diff --git a/contrib/mom/momdoc/inlines.html b/contrib/mom/momdoc/inlines=
.html
index bf2dcca..a46913e 100644
--- a/contrib/mom/momdoc/inlines.html
+++ b/contrib/mom/momdoc/inlines.html
@@ -203,7 +203,7 @@ current document element tag.
 Additionally, if you&#8217;re designing your own
 <a href=3D"headfootpage.html#headfootpage-intro">HEADERS or FOOTERS</a>
 and want to use mom&#8217;s inline escapes for changing fonts as
-part of the the left, centre and/or right strings, or in the strings
+part of the left, centre and/or right strings, or in the strings
 for
 <a href=3D"headfootpage.html#hdrftr-rectoverso">recto</a>
 and/or
diff --git a/contrib/mom/om.tmac-u b/contrib/mom/om.tmac-u
index 055ddfe..ef4ccb6 100644
--- a/contrib/mom/om.tmac-u
+++ b/contrib/mom/om.tmac-u
@@ -1578,7 +1578,7 @@ end
 \# Setting up string tabs is a two-step procedure.  First, the user
 \# enters an input line in which s/he wants to mark off string tabs.
 \# The beginning of a tab is marked with \*[STn], where "n" is
-\# the desired number of the tab.  The end of the the tab is marked
+\# the desired number of the tab.  The end of the tab is marked
 \# with \*[STnX].  All ST's must have a matching STX.  String tabs
 \# may be nested.
 \#
@@ -12033,7 +12033,7 @@ Shimming must be disabled with NO_SHIM before usi=
ng FLEX.
 \#   position.  TYPEWRITE treats spacing the same way in all circumstanc=
e
 \#   (viz. an extra line space).  TYPESET puts in only half
 \#   line spaces if the entire quote plus 1 line of body under the quote
-\#   fits on the the page; otherwise it puts in a full extra blank
+\#   fits on the page; otherwise it puts in a full extra blank
 \#   line.  (This is to ensure the page remains bottom aligned).
 \#
 .MAC DO_QUOTE END
@@ -13046,7 +13046,7 @@ E\\R'#CAP_HEIGHT \\n[.cht]'
 .\" or EPIGRAPH isn't yet adjusted at this point, the last word on the
 .\" line may *seem* to belong to the final line of the page, but will,
 .\" in fact, become the first word of the subsequent page.  In such
-.\" circumstances, we want the the footnote to be treated as a "moved"
+.\" circumstances, we want the footnote to be treated as a "moved"
 .\" diversion footnote.
 .          if \\n[.k]>\\n[.l] .nr #DIVER_FN 1
 .          if r #DIVER_FN \{\
@@ -15176,7 +15176,7 @@ E\\R'#CAP_HEIGHT \\n[.cht]'
 \#   Turns capitalization or smallcaps style of the toc title string
 \#   on or off.
 \# *Notes:
-\#   Users may want the the toc title string to be in
+\#   Users may want the toc title string to be in
 \#   caps, but the page header to be in lower case.  If the
 \#   argument to TOC_HEADER_STRING is in lower case and
 \#   TOC_HEADER_CAPS is turned on, this is exactly what will
diff --git a/contrib/pdfmark/pdfmark.tmac b/contrib/pdfmark/pdfmark.tmac
index a6c5900..0651f84 100644
--- a/contrib/pdfmark/pdfmark.tmac
+++ b/contrib/pdfmark/pdfmark.tmac
@@ -1821,7 +1821,7 @@ inspiration has come from discussion on the groff m=
ailing list
 .      pdf*href.mark.emit 2
 .      \"
 .      \" Now, adjust the vertical "hot-spot" mapping reference,
-.      \" to identify the correct position for the the last line of
+.      \" to identify the correct position for the last line of
 .      \" text, over which the "hot-spot" extends.
 .      \"
 .      nr pdf:ury \\n[pdf:lly.end]-\\*[PDFHREF.HEIGHT]
diff --git a/src/include/font.h b/src/include/font.h
index 155651a..beff652 100644
--- a/src/include/font.h
+++ b/src/include/font.h
@@ -33,7 +33,7 @@ typedef void (*FONT_COMMAND_HANDLER)(const char *,	// c=
ommand
 //     `charNNN' denoting a single `char' in the input character set,
 //     `uXXXX' denoting a Unicode character,
 //
-//   - those with a number, referring to the the font-dependent glyph wi=
th
+//   - those with a number, referring to the font-dependent glyph with
 //     the given number.
=20
 // The statically allocated information about a glyph.
diff --git a/src/preproc/eqn/over.cpp b/src/preproc/eqn/over.cpp
index 339e453..75c8364 100644
--- a/src/preproc/eqn/over.cpp
+++ b/src/preproc/eqn/over.cpp
@@ -151,7 +151,7 @@ void over_box::output()
     printf("\\h'\\n[" WIDTH_FORMAT "]u-\\n[" WIDTH_FORMAT "]u/2u'",
 	   uid, den->uid);
=20
-    // print the the denominator
+    // print the denominator
     den->output();
=20
   #ifdef USE_Z
diff --git a/src/preproc/grn/hgraph.cpp b/src/preproc/grn/hgraph.cpp
index 0120895..7fcd843 100644
--- a/src/preproc/grn/hgraph.cpp
+++ b/src/preproc/grn/hgraph.cpp
@@ -801,7 +801,7 @@ Paramaterize(int x[],
  | Routine:	PeriodicSpline (h, z, dz, d2z, d3z, npoints)
  |
  | Results:	This routine solves for the cubic polynomial to fit a spline
- |		curve to the the points specified by the list of values.=20
+ |		curve to the points specified by the list of values.
  |		The Curve generated is periodic.  The algorithms for this
  |		curve are from the `Spline Curve Techniques' paper cited
  |		above.
@@ -874,7 +874,7 @@ PeriodicSpline(double h[],	/* paramaterization  */
  | Routine:	NaturalEndSpline (h, z, dz, d2z, d3z, npoints)
  |
  | Results:	This routine solves for the cubic polynomial to fit a spline
- |		curve the the points specified by the list of values.  The
+ |		curve the points specified by the list of values.  The
  |		alogrithms for this curve are from the `Spline Curve
  |		Techniques' paper cited above.
  *----------------------------------------------------------------------=
------*/
diff --git a/src/preproc/refer/TODO b/src/preproc/refer/TODO
index e0fe4bf..d39c99b 100644
--- a/src/preproc/refer/TODO
+++ b/src/preproc/refer/TODO
@@ -92,7 +92,7 @@ Provide a way to execute a command using a command-line=
 option.
=20
 Option to set the label-spec as a command-line option (-L).
=20
-Command to to specify which fields can occur multiple times:
+Command to specify which fields can occur multiple times:
 multiple AE
=20
 Command to specify how various fields sort:
diff --git a/src/utils/hpftodit/hpftodit.cpp b/src/utils/hpftodit/hpftodi=
t.cpp
index 069608d..38a6aed 100644
--- a/src/utils/hpftodit/hpftodit.cpp
+++ b/src/utils/hpftodit/hpftodit.cpp
@@ -938,7 +938,7 @@ output_charset(const int tfm_type)
 	     && charcode_name_table[charcode]) {
       char *name =3D charcode_name_table[charcode]->name;
       // don't warn about Unicode or unnamed glyphs
-      //  that aren't in the the TFM file
+      //  that aren't in the TFM file
       if (tfm_type =3D=3D UNICODE && !quiet_flag && !equal(name, UNNAMED=
)
 	  && !is_uname(name)) {
 	fprintf(stderr, "%s: warning: symbol U+%04X (%s",


From MAILER-DAEMON Sun Oct 22 20:07:32 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1e6QHE-0001XG-IU
	for mharc-groff-commit@gnu.org; Sun, 22 Oct 2017 20:07:32 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:45900)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6QHC-0001Wt-1E
	for groff-commit@gnu.org; Sun, 22 Oct 2017 20:07:30 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6QHA-0002oc-W4
	for groff-commit@gnu.org; Sun, 22 Oct 2017 20:07:29 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:57733)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e6QHA-0002oS-S4
	for groff-commit@gnu.org; Sun, 22 Oct 2017 20:07:28 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id D5668209A7; Sun, 22 Oct 2017 20:07:27 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/01: refer-mm.tmac: Protect full stop in abbreviation.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: "G. Branden Robinson" <g.branden.robinson@gmail.com>
In-Reply-To: groff@gnu.org
References: <20171023000726.18557.37419@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 44a73be7b4aee28a01d37a645df6449d0d2a14e5
Auto-Submitted: auto-generated
Message-Id: <20171023000727.D5668209A7@vcs0.savannah.gnu.org>
Date: Sun, 22 Oct 2017 20:07:27 -0400 (EDT)
From: g.branden.robinson@gmail.com (G. Branden Robinson)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit/>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Oct 2017 00:07:31 -0000

gbranden pushed a commit to branch master
in repository groff.

commit 44a73be7b4aee28a01d37a645df6449d0d2a14e5
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Sun Oct 22 20:06:33 2017 -0400

    refer-mm.tmac: Protect full stop in abbreviation.
   =20
    Fixes Savannah #51611.
   =20
    Signed-off-by: Bjarni Ingi Gislason <bjarniig@rhi.hi.is>
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 contrib/mm/refer-mm.tmac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/mm/refer-mm.tmac b/contrib/mm/refer-mm.tmac
index 0b84848..c50dcf7 100644
--- a/contrib/mm/refer-mm.tmac
+++ b/contrib/mm/refer-mm.tmac
@@ -59,7 +59,7 @@
 .ds ref*spec!A     ",  " "
 .ds ref*spec!B     """ " " "in \fI" ""    "\fP"
 .ds ref*spec!D     """ " " "("      ")"
-.ds ref*spec!E     ",  " " "ed. "
+.ds ref*spec!E     ",  " " "ed.\& "
 .ds ref*spec!G     """ " " "("      ")"
 .ds ref*spec!J     ",  " " "\fI"    ""    "\fP"
 .ds ref*spec!N     """ "(" ""       ")"


From MAILER-DAEMON Thu Oct 26 04:10:31 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1e7dFG-0006pF-Qe
	for mharc-groff-commit@gnu.org; Thu, 26 Oct 2017 04:10:30 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:52915)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e7dFE-0006oN-3I
	for groff-commit@gnu.org; Thu, 26 Oct 2017 04:10:29 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e7dF9-0003Ss-Jf
	for groff-commit@gnu.org; Thu, 26 Oct 2017 04:10:28 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:53052)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e7dF9-0003SR-EE
	for groff-commit@gnu.org; Thu, 26 Oct 2017 04:10:23 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id 217FE206A2; Thu, 26 Oct 2017 04:10:23 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/01: Expand portable escape section of groff_man(7).
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: "G. Branden Robinson" <g.branden.robinson@gmail.com>
In-Reply-To: groff@gnu.org
References: <20171026081022.10737.60703@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: e59d0b4b9810539e359d0037e8e1751b68f76167
Auto-Submitted: auto-generated
Message-Id: <20171026081023.217FE206A2@vcs0.savannah.gnu.org>
Date: Thu, 26 Oct 2017 04:10:22 -0400 (EDT)
From: g.branden.robinson@gmail.com (G. Branden Robinson)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit/>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Oct 2017 08:10:29 -0000

gbranden pushed a commit to branch master
in repository groff.

commit e59d0b4b9810539e359d0037e8e1751b68f76167
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Thu Oct 26 02:50:29 2017 -0400

    Expand portable escape section of groff_man(7).
   =20
    Make some additional minor wording changes.
   =20
    * Fix misspelling of English singular "apostrophe" as "apostroph" [si=
c].
    * Recast "one single word" (redundant) as "a single word".
    * Stop referring to troff-to-HTML processors as "increasingly common"=
;
      that may have been true 20 years ago but may not be today.
    * Characterize troff-to-HTML processors as doing transformation rathe=
r
      than rendering, to further suggest the lack of precision involved.
   =20
    * Indent examples with .RS/.IP/.EX/.EE/.RE for consistency with other
      examples in this man page, in favor of mixed-level .sp/.EX/.EE/.sp
      requests.
    * \ :
      + Explain explicit double-quotes in document.
      + Provide example.
    * Document \[oq] and \[cq] escapes.
    * Document \[lq] and \[rq] escapes.
    * Add mnemonics for \[dq], \[em], and \[en].
    * Add mnemonic for \[rs] (en passant).
    * Slightly soften the language about what isn't portable about using
      .TP and \c when the rendering system isn't even identified.
---
 tmac/groff_man.7.man | 108 +++++++++++++++++++++++++++++++++++++--------=
------
 1 file changed, 79 insertions(+), 29 deletions(-)

diff --git a/tmac/groff_man.7.man b/tmac/groff_man.7.man
index 753fcf0..ade3999 100644
--- a/tmac/groff_man.7.man
+++ b/tmac/groff_man.7.man
@@ -1152,8 +1152,7 @@ info pages for a complete reference of all requests=
.
 .
 .PP
 Note, however, that using raw troff requests is likely to make your
-page render poorly on the (increasingly common) class of viewers that
-render it to HTML.
+page render poorly on the class of viewers that transform it to HTML.
 .
 Troff requests make implicit assumptions about things like character
 and page sizes that may break in an HTML environment; also, many of
@@ -1207,44 +1206,85 @@ even in manual pages and usually do not cause por=
tability problems:
 .RB \(dq \e\  \(dq
 Unpaddable non-breaking space character.
 .
+(The double-quotes are to make the presence of the space character
+clear in this document, and are not necessary in the input file.)
+.
+Useful for preventing breaking between a numerical quantity and its
+corresponding unit(s), for instance:
+.
+.RS
+.IP
+.EX
+There are 2.54\e\ cm in an inch, 1,024\e\ bytes in 1\e\ kiB.
+.EE
+.RE
+.
 .TP
 .B \e&
 Zero-width space.
 .
-Used for different kinds of escaping, for example after abbreviations
-that occur at the end of an input line to prevent misinterpretation
-of the final dot as a full stop ending a sentence, or before an
-apostroph or dot at the beginning of a text input line to prevent
-misinterpretation as a macro line, for example:
-.sp
+Can be used to (1)\~suppress recognition of end-of-sentence punctuation
+sequences at the end of an input line, and (2)\~suppress recognition of
+a dot or apostrophe at the beginning of a line as a troff request.
+.
+.RS
+.IP
 .EX
-The
-\&.B .gcolor
-request supports several color names, e.g.\e&
-\e&'green', by default.
+Using a boot argument of
+\e&'sound=3D0' will disable the sound driver entirely, according to J.\e=
&
+Alfred Prufrock.
 .EE
+.RE
 .
 .TP
 .B \e(aq
-ASCII apostroph.
+ASCII apostrophe.
 .
 Useful for syntax elements of programming languages because some
 output devices might replace unescaped apostrophes with right single
 quotation marks.
 .
 .TP
+.B \e(oq
+Opening single quotation mark.
+.
+.TQ
+.B \e(cq
+Closing single quotation mark.
+.
+.IP
+Use these for paired directional single quotes, \(oqlike this\(cq.
+.
+.TP
 .B \e(dq
+ASCII double-quote.
+.
 Sometimes needed on macro lines to prevent the interpretation of the
 ASCII quotation mark character \(oq\(dq\(cq as the beginning or end
 of a macro argument.
 .
 .TP
+.B \e(lq
+Left double quotation mark.
+.
+.TQ
+.B \e(rq
+Right double quotation mark.
+.
+.IP
+Use these for paired directional double quotes, \(lqlike this\(rq.
+.
+.TP
 .B \e(em
+Em-dash.
+.
 Used as a punctuation mark for an interruption in a sentence\(emlike
 in this one.
 .
 .TP
 .B \e(en
+En-dash.
+.
 Used to separate the two ends of a range, in particular between
 numbers, for example: the digits 1\(en9.
 .
@@ -1285,29 +1325,33 @@ these cases because it may render as a hyphen on =
some output devices.
 .
 .TP
 .B \ec
-If this escape sequence occurs at the end of an input line, no
-white space is inserted between the last glyph resulting from this
-and the first glyph resulting from the next input line.
+.
+If this escape sequence occurs at the end of an input line, no white
+space is inserted between the last glyph on it and the first glyph
+resulting from the next input line.
 .
 This is occasionally useful when three different fonts are needed
-in one single word, for example:
-.sp
+in a single word, for example:
+.
+.RS
+.IP
 .EX
 \&.BR "dd if" =3D\ec
 \&.I file
 .EE
-.sp
-Alternatively, and with likely better portability, the
+.RE
+.
+.IP
+Alternatively, and perhaps with better portability, the
 .B \ef
-font escape sequence can be used, see below.
+font escape sequence can be used; see below.
 .sp
 Attempting to use
 .B \ec
 to include the output from more than one macro line into the head of a
 .B .TP
-macro is non-portable and will misrender with groff-1.22.3,
-mandoc-1.14.1, older versions of these programs, and with other
-formatters.
+macro will misrender with groff-1.22.3, mandoc-1.14.1, older versions of
+these programs, and perhaps with some other formatters.
 .
 .TP
 .B \ee
@@ -1318,6 +1362,7 @@ It works reliably as long as the
 request is not used, which should never happen in manual pages, and
 it is slightly more portable than the more exact
 .B \e(rs
+(\[lq]reverse solidus\[rq])
 escape sequence.
 .
 .TP
@@ -1327,16 +1372,21 @@ respectively.
 .
 This is needed when three different fonts are required on a single
 input line, for example:
-.sp
+.
+.RS
+.IP
 .EX
 \&.TP
 \efBif\efP=3D\efIfile\efP
 .EE
-.sp
-It can also be used if three different fonts are needed in one
-single word.  It is likely more portable than
+.RE
+.
+.IP
+It can also be used if three different fonts are needed in a
+single word.
+It may be more portable than
 .BR \ec .
-.sp
+.IP
 As long as only two fonts are needed, using font alternation
 macros like
 .B .BR


From MAILER-DAEMON Fri Oct 27 22:37:59 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1e8H0Z-0003UY-IJ
	for mharc-groff-commit@gnu.org; Fri, 27 Oct 2017 22:37:59 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:47832)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e8H0Y-0003UQ-2T
	for groff-commit@gnu.org; Fri, 27 Oct 2017 22:37:58 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e8H0X-0003gY-47
	for groff-commit@gnu.org; Fri, 27 Oct 2017 22:37:58 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:48642)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e8H0X-0003gK-08
	for groff-commit@gnu.org; Fri, 27 Oct 2017 22:37:57 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id 73B8A2098E; Fri, 27 Oct 2017 22:37:56 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/01: groff_man(7): Fix style in char escape examples.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: "G. Branden Robinson" <g.branden.robinson@gmail.com>
In-Reply-To: groff@gnu.org
References: <20171028023755.18081.41809@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 2881e4536281def8e3057d41718f362cb2cf542d
Auto-Submitted: auto-generated
Message-Id: <20171028023756.73B8A2098E@vcs0.savannah.gnu.org>
Date: Fri, 27 Oct 2017 22:37:56 -0400 (EDT)
From: g.branden.robinson@gmail.com (G. Branden Robinson)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit/>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Oct 2017 02:37:59 -0000

gbranden pushed a commit to branch master
in repository groff.

commit 2881e4536281def8e3057d41718f362cb2cf542d
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Fri Oct 27 22:36:18 2017 -0400

    groff_man(7): Fix style in char escape examples.
   =20
    * Fix grammar in "\ " example.
    * Recast \& example to fit within page margins.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 tmac/groff_man.7.man | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tmac/groff_man.7.man b/tmac/groff_man.7.man
index ade3999..8ccd23b 100644
--- a/tmac/groff_man.7.man
+++ b/tmac/groff_man.7.man
@@ -1215,7 +1215,7 @@ corresponding unit(s), for instance:
 .RS
 .IP
 .EX
-There are 2.54\e\ cm in an inch, 1,024\e\ bytes in 1\e\ kiB.
+There are 2.54\e\ cm in an inch, and 1,024\e\ bytes in 1\e\ kiB.
 .EE
 .RE
 .
@@ -1231,7 +1231,7 @@ a dot or apostrophe at the beginning of a line as a=
 troff request.
 .IP
 .EX
 Using a boot argument of
-\e&'sound=3D0' will disable the sound driver entirely, according to J.\e=
&
+\e&'sound=3D0' disables the sound driver, according to J.\e&
 Alfred Prufrock.
 .EE
 .RE


From MAILER-DAEMON Sat Oct 28 17:15:40 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1e8YSC-00056r-4I
	for mharc-groff-commit@gnu.org; Sat, 28 Oct 2017 17:15:40 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:47836)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e8YSA-00056k-57
	for groff-commit@gnu.org; Sat, 28 Oct 2017 17:15:38 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e8YS9-0002Gm-A4
	for groff-commit@gnu.org; Sat, 28 Oct 2017 17:15:38 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:60023)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e8YS9-0002GS-6T
	for groff-commit@gnu.org; Sat, 28 Oct 2017 17:15:37 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id F0B0420417; Sat, 28 Oct 2017 17:15:36 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/01: groff_ms(7): Add a period after "et al".
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: "G. Branden Robinson" <g.branden.robinson@gmail.com>
In-Reply-To: groff@gnu.org
References: <20171028211536.6391.47932@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 4b63ec762e40ab03bb34a166740b7b387961effa
Auto-Submitted: auto-generated
Message-Id: <20171028211536.F0B0420417@vcs0.savannah.gnu.org>
Date: Sat, 28 Oct 2017 17:15:36 -0400 (EDT)
From: g.branden.robinson@gmail.com (G. Branden Robinson)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit/>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Oct 2017 21:15:38 -0000

gbranden pushed a commit to branch master
in repository groff.

commit 4b63ec762e40ab03bb34a166740b7b387961effa
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Sat Oct 28 17:13:31 2017 -0400

    groff_ms(7): Add a period after "et al".
   =20
    The Latin "et al." gets a period because "al" is an abbreviation for
    "alli".
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 tmac/groff_ms.7.man | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tmac/groff_ms.7.man b/tmac/groff_ms.7.man
index ac25a84..8942e00 100644
--- a/tmac/groff_ms.7.man
+++ b/tmac/groff_ms.7.man
@@ -30,7 +30,7 @@ the original English.
 ..
 .
 .de au
-Original manual page by James Clark et al, rewritten by
+Original manual page by James Clark et al., rewritten by
 .MT lkollar@despammed.com
 Larry Kollar
 .ME .


From MAILER-DAEMON Sat Oct 28 18:09:11 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1e8ZHz-0005g9-5h
	for mharc-groff-commit@gnu.org; Sat, 28 Oct 2017 18:09:11 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:59352)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e8ZHx-0005g2-I2
	for groff-commit@gnu.org; Sat, 28 Oct 2017 18:09:10 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e8ZHw-0006qk-QM
	for groff-commit@gnu.org; Sat, 28 Oct 2017 18:09:09 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:60478)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e8ZHw-0006qW-Mf
	for groff-commit@gnu.org; Sat, 28 Oct 2017 18:09:08 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id 8F1F8212D6; Sat, 28 Oct 2017 18:09:08 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 02/02: NEWS: Fix UTF-8 sequences in Latin-1 file.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: "G. Branden Robinson" <g.branden.robinson@gmail.com>
In-Reply-To: groff@gnu.org
References: <20171028220906.26078.22904@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 2f4b7ad3b640ec98fa9dc0753e13199ae66639d7
Auto-Submitted: auto-generated
Message-Id: <20171028220908.8F1F8212D6@vcs0.savannah.gnu.org>
Date: Sat, 28 Oct 2017 18:09:08 -0400 (EDT)
From: g.branden.robinson@gmail.com (G. Branden Robinson)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit/>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Oct 2017 22:09:10 -0000

gbranden pushed a commit to branch master
in repository groff.

commit 2f4b7ad3b640ec98fa9dc0753e13199ae66639d7
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Sat Oct 28 18:08:29 2017 -0400

    NEWS: Fix UTF-8 sequences in Latin-1 file.
---
 NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 0085f47..e738e2c 100644
--- a/NEWS
+++ b/NEWS
@@ -48,7 +48,7 @@ Gpinyin
 -------
=20
 o Another preprocessor from Bernd Warken to pretty-print Pinyin syllable=
s
-  like `guo2wang2' as `gu=C3=B3w=C3=A1ng'.
+  like `guo2wang2' as `gu=EF=BF=BDw=EF=BF=BDng'.
=20
=20
 Pdfroff


From MAILER-DAEMON Sat Oct 28 18:09:14 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1e8ZI2-0005hU-92
	for mharc-groff-commit@gnu.org; Sat, 28 Oct 2017 18:09:14 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:59367)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e8ZHy-0005g7-M6
	for groff-commit@gnu.org; Sat, 28 Oct 2017 18:09:12 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e8ZHw-0006qp-R4
	for groff-commit@gnu.org; Sat, 28 Oct 2017 18:09:10 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:60476)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e8ZHw-0006qT-Mb
	for groff-commit@gnu.org; Sat, 28 Oct 2017 18:09:08 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id 6BA4E212D1; Sat, 28 Oct 2017 18:09:07 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/02: Fix or make consistent editor variable settings.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: "G. Branden Robinson" <g.branden.robinson@gmail.com>
In-Reply-To: groff@gnu.org
References: <20171028220906.26078.22904@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: ada516f83b97011c09dc761d2f7373990eab344e
Auto-Submitted: auto-generated
Message-Id: <20171028220908.6BA4E212D1@vcs0.savannah.gnu.org>
Date: Sat, 28 Oct 2017 18:09:07 -0400 (EDT)
From: g.branden.robinson@gmail.com (G. Branden Robinson)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit/>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Oct 2017 22:09:12 -0000

gbranden pushed a commit to branch master
in repository groff.

commit ada516f83b97011c09dc761d2f7373990eab344e
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Sat Oct 28 17:32:30 2017 -0400

    Fix or make consistent editor variable settings.
   =20
    These files' editor settings were either no-ops or caused the editor =
to
    throw warnings on buffer load.
   =20
    Tested with GNU Emacs 24.5.1 and Vim 8.0.707.
   =20
    control/mom/momdoc/*.html:
      * Telling Vim the file encoding no longer seems to be necessary.
      * Forcing the "modified" flag off as a consequence of a transcoding=
 in
        the buffer no longer seems necessary either; opening the Latin-1
        src/devices/grolbp/grolbp.1.man in a UTF-8 environment does not
        set it, for example.
   =20
    contrib/pdfmark/pdfmark.ms:
    contrib/pdfmark/pdfmark.tmac:
    contrib/pdfmark/spdf.tmac:
    tmac/pdf.tmac:
      * Move single-line "-*- nroff -*-" Emacs settings to multi-line
        settings at the end of the file.
   =20
    contrib/mom/om.tmac-u:
      * As above, plus:
      * The declared file encoding was incorrect; in
        3a4907891fe75d93857166344d525e7f1c9c791e, Peter Schaffter changed
        it from Latin-1 to UTF-8.
   =20
    src/devices/grolbp/grolbp.1.man:
      * Move Vim filetype setting to the end of the file and use the corr=
ect
        Vim variable name for this setting.
   =20
    tmac/pdf.tmac:
      * Stop mixing Vim modeline comments with other comment material.
---
 contrib/mom/momdoc/appendices.html         | 1 -
 contrib/mom/momdoc/color.html              | 1 -
 contrib/mom/momdoc/cover.html              | 1 -
 contrib/mom/momdoc/definitions.html        | 1 -
 contrib/mom/momdoc/docelement.html         | 1 -
 contrib/mom/momdoc/docprocessing.html      | 1 -
 contrib/mom/momdoc/goodies.html            | 1 -
 contrib/mom/momdoc/graphical.html          | 1 -
 contrib/mom/momdoc/headfootpage.html       | 1 -
 contrib/mom/momdoc/images.html             | 1 -
 contrib/mom/momdoc/inlines.html            | 1 -
 contrib/mom/momdoc/intro.html              | 1 -
 contrib/mom/momdoc/letters.html            | 1 -
 contrib/mom/momdoc/macrolist.html          | 1 -
 contrib/mom/momdoc/rectoverso.html         | 1 -
 contrib/mom/momdoc/refer.html              | 1 -
 contrib/mom/momdoc/reserved.html           | 1 -
 contrib/mom/momdoc/tables-of-contents.html | 2 --
 contrib/mom/momdoc/toc.html                | 2 --
 contrib/mom/momdoc/typesetting.html        | 1 -
 contrib/mom/momdoc/using.html              | 1 -
 contrib/mom/momdoc/version-2.html          | 1 -
 contrib/mom/om.tmac-u                      | 6 ++++--
 contrib/pdfmark/pdfmark.ms                 | 5 ++++-
 contrib/pdfmark/pdfmark.tmac               | 7 +++++--
 contrib/pdfmark/spdf.tmac                  | 8 +++++---
 src/devices/grolbp/grolbp.1.man            | 3 +--
 tmac/pdf.tmac                              | 9 +++++----
 28 files changed, 24 insertions(+), 38 deletions(-)

diff --git a/contrib/mom/momdoc/appendices.html b/contrib/mom/momdoc/appe=
ndices.html
index 37e05ff..3d197ce 100644
--- a/contrib/mom/momdoc/appendices.html
+++ b/contrib/mom/momdoc/appendices.html
@@ -900,4 +900,3 @@ typeset with mom and groff.
=20
 </body>
 </html>
-<!-- vim: fileencoding=3Dutf-8: nomodified: -->
diff --git a/contrib/mom/momdoc/color.html b/contrib/mom/momdoc/color.htm=
l
index 381517e..4af38e5 100644
--- a/contrib/mom/momdoc/color.html
+++ b/contrib/mom/momdoc/color.html
@@ -504,4 +504,3 @@ in the notes at the end of
=20
 </body>
 </html>
-<!-- vim: fileencoding=3Dutf-8: nomodified: -->
diff --git a/contrib/mom/momdoc/cover.html b/contrib/mom/momdoc/cover.htm=
l
index 9aea902..65c67f3 100644
--- a/contrib/mom/momdoc/cover.html
+++ b/contrib/mom/momdoc/cover.html
@@ -842,4 +842,3 @@ for example
=20
 </body>
 </html>
-<!-- vim: fileencoding=3Dutf-8: nomodified: -->
diff --git a/contrib/mom/momdoc/definitions.html b/contrib/mom/momdoc/def=
initions.html
index 97bcf67..3ac3b28 100644
--- a/contrib/mom/momdoc/definitions.html
+++ b/contrib/mom/momdoc/definitions.html
@@ -992,4 +992,3 @@ or concept you&#8217;re not familiar with.
=20
 </body>
 </html>
-<!-- vim: fileencoding=3Dutf-8: nomodified:-->
diff --git a/contrib/mom/momdoc/docelement.html b/contrib/mom/momdoc/doce=
lement.html
index 642e3ab..5c32883 100644
--- a/contrib/mom/momdoc/docelement.html
+++ b/contrib/mom/momdoc/docelement.html
@@ -6513,4 +6513,3 @@ remove them with
=20
 </body>
 </html>
-<!-- vim: fileencoding=3Dutf-8: nomodified: -->
diff --git a/contrib/mom/momdoc/docprocessing.html b/contrib/mom/momdoc/d=
ocprocessing.html
index 54cf30d..9c4ff30 100644
--- a/contrib/mom/momdoc/docprocessing.html
+++ b/contrib/mom/momdoc/docprocessing.html
@@ -3976,4 +3976,3 @@ a document.
=20
 </body>
 </html>
-<!-- vim: fileencoding=3Dutf-8: nomodified: -->
diff --git a/contrib/mom/momdoc/goodies.html b/contrib/mom/momdoc/goodies=
.html
index 81154e8..63f95a1 100644
--- a/contrib/mom/momdoc/goodies.html
+++ b/contrib/mom/momdoc/goodies.html
@@ -1517,4 +1517,3 @@ and all subsequent superscripts would be raised by =
3 points.
=20
 </body>
 </html>
-<!-- vim: fileencoding=3Dutf-8: nomodified: -->
diff --git a/contrib/mom/momdoc/graphical.html b/contrib/mom/momdoc/graph=
ical.html
index 8d29ba1..059e5ad 100644
--- a/contrib/mom/momdoc/graphical.html
+++ b/contrib/mom/momdoc/graphical.html
@@ -627,4 +627,3 @@ page, either horizontal or vertical.
=20
 </body>
 </html>
-<!-- vim: fileencoding=3Dutf-8: nomodified: -->
diff --git a/contrib/mom/momdoc/headfootpage.html b/contrib/mom/momdoc/he=
adfootpage.html
index 2763fb1..c6ea468 100644
--- a/contrib/mom/momdoc/headfootpage.html
+++ b/contrib/mom/momdoc/headfootpage.html
@@ -2286,4 +2286,3 @@ enabled.
=20
 </body>
 </html>
-<!-- vim: fileencoding=3Dutf-8: nomodified: -->
diff --git a/contrib/mom/momdoc/images.html b/contrib/mom/momdoc/images.h=
tml
index f98c570..301d5bf 100644
--- a/contrib/mom/momdoc/images.html
+++ b/contrib/mom/momdoc/images.html
@@ -2891,4 +2891,3 @@ macro.
=20
 </body>
 </html>
-<!-- vim: fileencoding=3Dutf-8: nomodified: -->
diff --git a/contrib/mom/momdoc/inlines.html b/contrib/mom/momdoc/inlines=
.html
index a46913e..1ea67d3 100644
--- a/contrib/mom/momdoc/inlines.html
+++ b/contrib/mom/momdoc/inlines.html
@@ -1082,4 +1082,3 @@ ligatures and letters unique to various European la=
nguages), consult
=20
 </body>
 </html>
-<!-- vim: fileencoding=3Dutf-8: nomodified: -->
diff --git a/contrib/mom/momdoc/intro.html b/contrib/mom/momdoc/intro.htm=
l
index 11d20b9..03e1f0f 100644
--- a/contrib/mom/momdoc/intro.html
+++ b/contrib/mom/momdoc/intro.html
@@ -494,4 +494,3 @@ quote&#8217;s finished, you have to tell mom it&#8217=
;s done.
=20
 </body>
 </html>
-<!-- vim: fileencoding=3Dutf-8: nomodified: -->
diff --git a/contrib/mom/momdoc/letters.html b/contrib/mom/momdoc/letters=
.html
index a837c06..687c824 100644
--- a/contrib/mom/momdoc/letters.html
+++ b/contrib/mom/momdoc/letters.html
@@ -575,4 +575,3 @@ number at the bottom of multi-page letters, invoke
=20
 </body>
 </html>
-<!-- vim: fileencoding=3Dutf-8: nomodified: -->
diff --git a/contrib/mom/momdoc/macrolist.html b/contrib/mom/momdoc/macro=
list.html
index f36cf74..809f7b8 100644
--- a/contrib/mom/momdoc/macrolist.html
+++ b/contrib/mom/momdoc/macrolist.html
@@ -1447,4 +1447,3 @@ elsewhere in the documentation.
=20
 </body>
 </html>
-<!-- vim: fileencoding=3Dutf-8: nomodified: -->
diff --git a/contrib/mom/momdoc/rectoverso.html b/contrib/mom/momdoc/rect=
overso.html
index 112e6ef..a2e3180 100644
--- a/contrib/mom/momdoc/rectoverso.html
+++ b/contrib/mom/momdoc/rectoverso.html
@@ -354,4 +354,3 @@ above.
=20
 </body>
 </html>
-<!-- vim: fileencoding=3Dutf-8: nomodified: -->
diff --git a/contrib/mom/momdoc/refer.html b/contrib/mom/momdoc/refer.htm=
l
index aa509e0..8d25629 100644
--- a/contrib/mom/momdoc/refer.html
+++ b/contrib/mom/momdoc/refer.html
@@ -2121,4 +2121,3 @@ title.
=20
 </body>
 </html>
-<!-- vim: fileencoding=3Dutf-8: nomodified: -->
diff --git a/contrib/mom/momdoc/reserved.html b/contrib/mom/momdoc/reserv=
ed.html
index 91df415..5ebe4c9 100644
--- a/contrib/mom/momdoc/reserved.html
+++ b/contrib/mom/momdoc/reserved.html
@@ -2740,4 +2740,3 @@ docelement control macros that end in _COLOR.
=20
 </body>
 </html>
-<!-- vim: fileencoding=3Dutf-8: nomodified: -->
diff --git a/contrib/mom/momdoc/tables-of-contents.html b/contrib/mom/mom=
doc/tables-of-contents.html
index 2f907e1..89cbea2 100644
--- a/contrib/mom/momdoc/tables-of-contents.html
+++ b/contrib/mom/momdoc/tables-of-contents.html
@@ -1172,5 +1172,3 @@ or invoked just before
=20
 </body>
 </html>
-<!-- vim: fileencoding=3Dutf-8: nomodified: -->
-
diff --git a/contrib/mom/momdoc/toc.html b/contrib/mom/momdoc/toc.html
index a480895..5d4c0d4 100644
--- a/contrib/mom/momdoc/toc.html
+++ b/contrib/mom/momdoc/toc.html
@@ -454,5 +454,3 @@ FDL in the main directory of the groff source package=
.
=20
 </body>
 </html>
-
-<!-- vim: fileencoding=3Dutf-8: nomodified: -->
diff --git a/contrib/mom/momdoc/typesetting.html b/contrib/mom/momdoc/typ=
esetting.html
index 315def4..b5e455b 100644
--- a/contrib/mom/momdoc/typesetting.html
+++ b/contrib/mom/momdoc/typesetting.html
@@ -4928,4 +4928,3 @@ quits and clears the values for all indent styles a=
t once.
=20
 </body>
 </html>
-<!-- vim: fileencoding=3Dutf-8: nomodified: -->
diff --git a/contrib/mom/momdoc/using.html b/contrib/mom/momdoc/using.htm=
l
index ea179bd..8277a56 100644
--- a/contrib/mom/momdoc/using.html
+++ b/contrib/mom/momdoc/using.html
@@ -311,4 +311,3 @@ reflects whatever changes you save to the mom file.
=20
 </body>
 </html>
-<!-- vim: fileencoding=3Dutf-8: nomodified: -->
diff --git a/contrib/mom/momdoc/version-2.html b/contrib/mom/momdoc/versi=
on-2.html
index 7c566bf..94fe12f 100644
--- a/contrib/mom/momdoc/version-2.html
+++ b/contrib/mom/momdoc/version-2.html
@@ -440,4 +440,3 @@ desired.
=20
 </body>
 </html>
-<!-- vim: fileencoding=3Dutf-8: nomodified: -->
diff --git a/contrib/mom/om.tmac-u b/contrib/mom/om.tmac-u
index ef4ccb6..3db1ea9 100644
--- a/contrib/mom/om.tmac-u
+++ b/contrib/mom/om.tmac-u
@@ -1,4 +1,3 @@
-.\" -*- nroff -*-      om.tmac
 .ig
 Mom -- a typesetting/document-processing macro set for groff.
=20
@@ -22766,4 +22765,7 @@ No room to start \\*[MN-pos] margin note #\\n[MN-=
curr] on page \\n[#P].
 .    \}
 .    el .nop \!.pdfmomclean \\$@
 ..
-\# vim: ft=3Dgroff: encoding=3Dlatin1: fileencoding=3Dlatin1: nomodified=
:
+\# Local Variables:
+\# mode: nroff
+\# End:
+\# vim: filetype=3Dgroff:
diff --git a/contrib/pdfmark/pdfmark.ms b/contrib/pdfmark/pdfmark.ms
index 154030e..0d9d7de 100644
--- a/contrib/pdfmark/pdfmark.ms
+++ b/contrib/pdfmark/pdfmark.ms
@@ -1,4 +1,3 @@
-.\" vim: ft=3Dgroff          -*- nroff -*-
 .ig
 pdfmark.ms
=20
@@ -2562,3 +2561,7 @@ macro.
 .NH 3
 .XN -N import-map -- Deploying a Document Reference Map
 .TC
+.\" Local Variables:
+.\" mode: nroff
+.\" End:
+.\" vim: filetype=3Dgroff:
diff --git a/contrib/pdfmark/pdfmark.tmac b/contrib/pdfmark/pdfmark.tmac
index 0651f84..2a8c56a 100644
--- a/contrib/pdfmark/pdfmark.tmac
+++ b/contrib/pdfmark/pdfmark.tmac
@@ -1,4 +1,3 @@
-.\" -*- nroff -*-
 .ig
=20
 pdfmark.tmac
@@ -1947,4 +1946,8 @@ inspiration has come from discussion on the groff m=
ailing list
 .als pdf*href-W      pdf*href
 .ds  pdf*href-W.link /Action << /Subtype /URI /URI (\\\\*[pdf:href-D]) >=
>
 .\"
-.\" pdfmark.tmac: end of file / vim: ft=3Dgroff
+.\" Local Variables:
+.\" mode: nroff
+.\" End:
+.\" vim: filetype=3Dgroff:
+.\" pdfmark.tmac: end of file
diff --git a/contrib/pdfmark/spdf.tmac b/contrib/pdfmark/spdf.tmac
index 26e9a1a..abc1ea9 100644
--- a/contrib/pdfmark/spdf.tmac
+++ b/contrib/pdfmark/spdf.tmac
@@ -1,4 +1,3 @@
-.\" -*- nroff -*-
 .ig
=20
 spdf.tmac
@@ -220,5 +219,8 @@ The content for this section is not yet available.
 .\" as an addendum to this macro.
 .
 .pdfhref I -PT pg@bottom
-.\"
-.\" spdf.tmac: end of file: vim: ft=3Dgroff
+.\" Local Variables:
+.\" mode: nroff
+.\" End:
+.\" vim: filetype=3Dgroff:
+.\" spdf.tmac: end of file
diff --git a/src/devices/grolbp/grolbp.1.man b/src/devices/grolbp/grolbp.=
1.man
index fd47a35..74891fe 100644
--- a/src/devices/grolbp/grolbp.1.man
+++ b/src/devices/grolbp/grolbp.1.man
@@ -1,7 +1,5 @@
 '\" t
 .\" The above line should force the use of tbl as a preprocessor
-.\" vim: set syntax=3Dnroff :
-.\" The above line should set vim into nroff mode
 .TH GROLBP @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
 .SH NAME
 grolbp \- groff driver for Canon CAPSL printers (LBP-4 and LBP-8 \
@@ -448,3 +446,4 @@ Macros for use with
 .\" Local Variables:
 .\" mode: nroff
 .\" End:
+.\" vim: set filetype=3Dgroff:
diff --git a/tmac/pdf.tmac b/tmac/pdf.tmac
index cae880a..85fc6ae 100644
--- a/tmac/pdf.tmac
+++ b/tmac/pdf.tmac
@@ -1,5 +1,3 @@
-.\" -*- nroff -*-
-.
 .ig
=20
 pdf.tmac
@@ -801,5 +799,8 @@ am solely responsible for any bugs I may have introdu=
ced into this file.
 .de pdfswitchtopage
 .nop \!x X pdf: switchtopage \\$*
 ..
-.\"
-.\" pdf.tmac: end of file / vim: ft=3Dgroff
+.\" Local Variables:
+.\" mode: nroff
+.\" End:
+.\" vim: filetype=3Dgroff:
+.\" pdf.tmac: end of file


From MAILER-DAEMON Sat Oct 28 18:18:27 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1e8ZQx-0006gE-5J
	for mharc-groff-commit@gnu.org; Sat, 28 Oct 2017 18:18:27 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:60126)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e8ZQv-0006fs-9n
	for groff-commit@gnu.org; Sat, 28 Oct 2017 18:18:26 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e8ZQu-0003s5-8J
	for groff-commit@gnu.org; Sat, 28 Oct 2017 18:18:25 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:60574)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e8ZQu-0003rs-4V
	for groff-commit@gnu.org; Sat, 28 Oct 2017 18:18:24 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id B7133212AA; Sat, 28 Oct 2017 18:18:23 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/01: Delete page-local definitions of unused macros.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: "G. Branden Robinson" <g.branden.robinson@gmail.com>
In-Reply-To: groff@gnu.org
References: <20171028221823.29739.33825@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 55ee9e94a6d4a73617b44039ffe9655cd97e26a1
Auto-Submitted: auto-generated
Message-Id: <20171028221823.B7133212AA@vcs0.savannah.gnu.org>
Date: Sat, 28 Oct 2017 18:18:23 -0400 (EDT)
From: g.branden.robinson@gmail.com (G. Branden Robinson)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit/>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Oct 2017 22:18:26 -0000

gbranden pushed a commit to branch master
in repository groff.

commit 55ee9e94a6d4a73617b44039ffe9655cd97e26a1
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Sat Oct 28 18:17:30 2017 -0400

    Delete page-local definitions of unused macros.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 src/devices/grohtml/grohtml.1.man | 6 ------
 src/devices/grolbp/grolbp.1.man   | 7 -------
 src/devices/grolj4/grolj4.1.man   | 6 ------
 src/utils/hpftodit/hpftodit.1.man | 6 ------
 4 files changed, 25 deletions(-)

diff --git a/src/devices/grohtml/grohtml.1.man b/src/devices/grohtml/groh=
tml.1.man
index 14abf9d..e92eb6b 100644
--- a/src/devices/grohtml/grohtml.1.man
+++ b/src/devices/grohtml/grohtml.1.man
@@ -23,12 +23,6 @@ translations approved by the Free Software Foundation =
instead of in
 the original English.
 ..
 .
-.\" Like TP, but if specified indent is more than half
-.\" the current line-length - indent, use the default indent.
-.de Tp
-.  ie \\n(.$=3D0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
-.  el .TP "\\$1"
-..
 .
 .\" --------------------------------------------------------------------
 .SH SYNOPSIS
diff --git a/src/devices/grolbp/grolbp.1.man b/src/devices/grolbp/grolbp.=
1.man
index 74891fe..a58d1b6 100644
--- a/src/devices/grolbp/grolbp.1.man
+++ b/src/devices/grolbp/grolbp.1.man
@@ -37,13 +37,6 @@ program.
 ..
 .
 .
-.\" Like TP, but if specified indent is more than half
-.\" the current line-length - indent, use the default indent.
-.de Tp
-.  ie \\n(.$=3D0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
-.  el .TP "\\$1"
-..
-.
 .\" --------------------------------------------------------------------
 .SH SYNOPSIS
 .\" --------------------------------------------------------------------
diff --git a/src/devices/grolj4/grolj4.1.man b/src/devices/grolj4/grolj4.=
1.man
index 9694885..e388f1d 100644
--- a/src/devices/grolj4/grolj4.1.man
+++ b/src/devices/grolj4/grolj4.1.man
@@ -24,12 +24,6 @@ translations approved by the Free Software Foundation =
instead of in
 the original English.
 ..
 .
-.\" Like TP, but if specified indent is more than half
-.\" the current line-length - indent, use the default indent.
-.de Tp
-. ie \\n(.$=3D0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
-. el .TP "\\$1"
-..
 .
 .\" --------------------------------------------------------------------
 .SH SYNOPSIS
diff --git a/src/utils/hpftodit/hpftodit.1.man b/src/utils/hpftodit/hpfto=
dit.1.man
index 6ba9fd9..8d9b610 100644
--- a/src/utils/hpftodit/hpftodit.1.man
+++ b/src/utils/hpftodit/hpftodit.1.man
@@ -35,12 +35,6 @@ the original English.
 .\" Definitions
 .\" --------------------------------------------------------------------
 .
-.\" Like TP, but if specified indent is more than half
-.\" the current line-length - indent, use the default indent.
-.de Tp
-.ie \\n(.$=3D0:((0\\$1)*2u>(\\n(.lu-\\n(.iu)) .TP
-.el .TP "\\$1"
-..
 .de CW
 .ie \\n(.$>2 \&\\$1\f(CR\\$2\fP\\$3
 .el \&\f(CR\\$1\fP\\$2


From MAILER-DAEMON Sat Oct 28 22:19:15 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1e8dBz-00018k-IA
	for mharc-groff-commit@gnu.org; Sat, 28 Oct 2017 22:19:15 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:58365)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e8dBx-00018X-Dm
	for groff-commit@gnu.org; Sat, 28 Oct 2017 22:19:14 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e8dBw-0007ft-Cc
	for groff-commit@gnu.org; Sat, 28 Oct 2017 22:19:13 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:34458)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e8dBw-0007fO-94
	for groff-commit@gnu.org; Sat, 28 Oct 2017 22:19:12 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id 0C824212D6; Sat, 28 Oct 2017 22:19:11 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 02/02: groff_mm(7): Clarify boundary spaces in Letns.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: "G. Branden Robinson" <g.branden.robinson@gmail.com>
In-Reply-To: groff@gnu.org
References: <20171029021909.18041.69173@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 6bbf7fd115188f63e55e66a468cab6bc5249c6f8
Auto-Submitted: auto-generated
Message-Id: <20171029021911.0C824212D6@vcs0.savannah.gnu.org>
Date: Sat, 28 Oct 2017 22:19:10 -0400 (EDT)
From: g.branden.robinson@gmail.com (G. Branden Robinson)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit/>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 29 Oct 2017 02:19:14 -0000

gbranden pushed a commit to branch master
in repository groff.

commit 6bbf7fd115188f63e55e66a468cab6bc5249c6f8
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Sat Oct 28 22:15:24 2017 -0400

    groff_mm(7): Clarify boundary spaces in Letns.
   =20
    What had been there looked like a truncated cut and paste from the ma=
cro
    file, and somewhat obscure.
   =20
    Also add Vim modeline.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 contrib/mm/groff_mm.7.man | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/contrib/mm/groff_mm.7.man b/contrib/mm/groff_mm.7.man
index 4794828..67a6983 100644
--- a/contrib/mm/groff_mm.7.man
+++ b/contrib/mm/groff_mm.7.man
@@ -3296,8 +3296,8 @@ Letns!11@Copy (without atts.\&) to
 Letns!12@Abstract Only to
 Letns!13@Complete Memorandum to
 Letns!14@CC
-Letns!copy@Copy \[rs]"
-Letns!to@" to
+Letns!copy@Copy \fI(with trailing space)\fP
+Letns!to@ to \fI(note leading space)\fP
 .TE
 .RE
 .
@@ -3987,3 +3987,4 @@ then assigns the argument to the string variable
 .\" mode: nroff
 .\" coding: latin-1
 .\" End:
+.\" vim:set filetype=3Dgroff:


From MAILER-DAEMON Sat Oct 28 22:19:17 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1e8dC1-00019x-HI
	for mharc-groff-commit@gnu.org; Sat, 28 Oct 2017 22:19:17 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:58374)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e8dBy-00018Z-5d
	for groff-commit@gnu.org; Sat, 28 Oct 2017 22:19:15 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e8dBw-0007fy-DH
	for groff-commit@gnu.org; Sat, 28 Oct 2017 22:19:14 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:34456)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e8dBw-0007fJ-96
	for groff-commit@gnu.org; Sat, 28 Oct 2017 22:19:12 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id DD7FA212D1; Sat, 28 Oct 2017 22:19:09 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/02: m.tmac: Fix some formatting and textual issues.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: "G. Branden Robinson" <g.branden.robinson@gmail.com>
In-Reply-To: groff@gnu.org
References: <20171029021909.18041.69173@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 60209c43bbfd7128c5cd47cb41ace7819edab476
Auto-Submitted: auto-generated
Message-Id: <20171029021910.DD7FA212D1@vcs0.savannah.gnu.org>
Date: Sat, 28 Oct 2017 22:19:09 -0400 (EDT)
From: g.branden.robinson@gmail.com (G. Branden Robinson)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit/>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 29 Oct 2017 02:19:16 -0000

gbranden pushed a commit to branch master
in repository groff.

commit 60209c43bbfd7128c5cd47cb41ace7819edab476
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Sat Oct 28 22:13:53 2017 -0400

    m.tmac: Fix some formatting and textual issues.
   =20
      Correct space between sentences
   =20
      Protect a full stop
   =20
      Remove space at the end of lines
   =20
      Correct, extend some spellings
   =20
    Fixes Savannah #51610.
   =20
    Signed-off-by: Bjarni Ingi Gislason <bjarniig@rhi.hi.is>
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 contrib/mm/m.tmac | 52 ++++++++++++++++++++++++++-----------------------=
---
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/contrib/mm/m.tmac b/contrib/mm/m.tmac
index edbc78c..70f896d 100644
--- a/contrib/mm/m.tmac
+++ b/contrib/mm/m.tmac
@@ -16,7 +16,7 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General =
Public License
 for more details.
=20
 You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
=20
 Please send bug reports with examples to bug-groff@gnu.org.
=20
@@ -318,8 +318,8 @@ Index		array!index
 .ds Letns!copy Copy \" space!
 .ds Letns!to " to
 .ds Letns!0 Copy to
-.ds Letns!1 Copy (with att.) to
-.ds Letns!2 Copy (without att.) to
+.ds Letns!1 Copy (with att.\&) to
+.ds Letns!2 Copy (without att.\&) to
 .ds Letns!3 Att.
 .ds Letns!4 Atts.
 .ds Letns!5 Enc.
@@ -327,15 +327,15 @@ Index		array!index
 .ds Letns!7 Under separate cover
 .ds Letns!8 Letter to
 .ds Letns!9 Memorandum to
-.ds Letns!10 Copy (with atts.) to
-.ds Letns!11 Copy (without atts.) to
+.ds Letns!10 Copy (with atts.\&) to
+.ds Letns!11 Copy (without atts.\&) to
 .ds Letns!12 Abstract Only to
 .ds Letns!13 Complete Memorandum to
 .ds Letns!14 CC:
 .\"
 .\" Text printed below the footer. Controlled by @copy_type (C).
 .ds Pg_type!0
-.ds Pg_type!1 OFFICIAL FILE COPY=20
+.ds Pg_type!1 OFFICIAL FILE COPY
 .ds Pg_type!2 DATE FILE COPY
 .ds Pg_type!3 D\ R\ A\ F\ T
 .ds Pg_type!4 D\ R\ A\ F\ T
@@ -946,7 +946,7 @@ in=3D\\n[.i] fi=3D\\n[.u] .d=3D\\n[.d] nl=3D\\n[nl] p=
g=3D\\n[%]
 .als }2 hd*suf-space
 .aln ;3 hd*need
 .\"-------------
-.\" .hd@split varable index name val1 val2 ...
+.\" .hd@split variable index name val1 val2 ...
 .de hd@split
 .if \\$2>(\\n[.$]-3) .@error "\\$3 must have at least \\$2 values (\\*[\=
\$3]).
 .nr hd*sp-tmp \\$2+3
@@ -1025,7 +1025,7 @@ in=3D\\n[.i] fi=3D\\n[.u] .d=3D\\n[.d] nl=3D\\n[nl]=
 pg=3D\\n[%]
 .\" May change hd*mark (}0), hd*suf-space (}2) and hd*need (;3)
 .\" Can also change Hps1/2.
 .if d HX .HX \\n[hd*level] \\n[hd*arg1] "\\$2\\$3"
-.\"--------------------------------------=20
+.\"--------------------------------------
 .\" pre-space
 .ie \\n[hd*level]<=3D\\n[Hps] .SP (u;\\n[Hps2])
 .el .SP (u;\\n[Hps1])
@@ -1062,12 +1062,12 @@ in=3D\\n[.i] fi=3D\\n[.u] .d=3D\\n[.d] nl=3D\\n[n=
l] pg=3D\\n[%]
 .	vs \\*[hd*new-ps]+2
 .\}
 .\"
-.\"---------- user macro HY -------------=20
+.\"---------- user macro HY -------------
 .\"	user macro to reset indents
 .if d HY .HY \\n[hd*level] \\n[hd*arg1] "\\$2\\$3"
 .\" HTML: mark beginning of heading
 .misc@tag NH \\n[hd*level]
-.\"--------------------------------------=20
+.\"--------------------------------------
 .nr hd*mark-size \w@\\*[hd*mark]@
 .if (\\n[hd*level]<=3D\\n[Hc])&\\n[hd*htype] .ce\" center if level<=3DHc
 .\"
@@ -1123,8 +1123,8 @@ in=3D\\n[.i] fi=3D\\n[.u] .d=3D\\n[.d] nl=3D\\n[nl]=
 pg=3D\\n[%]
 .while \\n+[hd*i]<15 .af H\\n[hd*i] \\$[\\n[hd*i]] 1
 ..
 .\"----------------------
-.\" set page-nr, called from header=20
-.\"=20
+.\" set page-nr, called from header
+.\"
 .de hd@set-page
 .\"
 .ie \\n[.$]>0 .nr P \\$1
@@ -1172,7 +1172,7 @@ in=3D\\n[.i] fi=3D\\n[.u] .d=3D\\n[.d] nl=3D\\n[nl]=
 pg=3D\\n[%]
 .\"
 .if \\n[D]>2 .tm pg*foot-trap \\n[@pl]u-(\\n[pg*block-size]u+\\n[ft*note=
-size]u+\\n[pg*foot-margin]u+\\n[pg*footer-size]u+\\n[pg*extra-footer-siz=
e]u) =3D \\n[pg*foot-trap]
 .\"
-.\" last-pos points to the position of the footer and bottom=20
+.\" last-pos points to the position of the footer and bottom
 .\" block below foot-notes.
 .nr pg*last-pos \\n[@pl]u-(\\n[pg*block-size]u+\\n[pg*foot-margin]u+\\n[=
pg*footer-size]u+\\n[pg*extra-footer-size]u)
 .if \\n[D]>2 .tm pg*last-pos \\n[@pl]u-(\\n[pg*block-size]u+\\n[pg*foot-=
margin]u+\\n[pg*footer-size]u+\\n[pg*extra-footer-size]u) =3D \\n[pg*last=
-pos]
@@ -1280,7 +1280,7 @@ in=3D\\n[.i] fi=3D\\n[.u] .d=3D\\n[.d] nl=3D\\n[nl]=
 pg=3D\\n[%]
 .		PX
 .		rs
 .	\}
-.	\" check for pending footnotes=20
+.	\" check for pending footnotes
 .	ft@check-old
 .	\"
 .	\" back to normal text processing
@@ -1290,7 +1290,7 @@ in=3D\\n[.i] fi=3D\\n[.u] .d=3D\\n[.d] nl=3D\\n[nl]=
 pg=3D\\n[%]
 .	\" reset NCOL pointer at each new page.
 .	nr pg*last-ncol 0
 .	\" set multicolumn
-.	\"=20
+.	\"
 .	pg@set-po
 .	\" print floating displays
 .	df@print-float 4
@@ -1298,7 +1298,7 @@ in=3D\\n[.i] fi=3D\\n[.u] .d=3D\\n[.d] nl=3D\\n[nl]=
 pg=3D\\n[%]
 .	ns
 .\}
 .if \\n[pg*top-enabled]<0 .nr pg*top-enabled 1
-.nr hd*cur-bline \\n[nl]	\" .H needs to know if output has occured
+.nr hd*cur-bline \\n[nl]	\" .H needs to know if output has occurred
 .\}
 ..
 .\"---------------------------------------------------------
@@ -1460,7 +1460,7 @@ in=3D\\n[.i] fi=3D\\n[.u] .d=3D\\n[.d] nl=3D\\n[nl]=
 pg=3D\\n[%]
 .ref@eot-print
 ..
 .\"-------------------------
-.\" set top and bottom margins=20
+.\" set top and bottom margins
 .\" -T	sets pg*footer-size and pg*header-size instead
 .de VM
 .ie '\\$1'-T' \{\
@@ -1487,7 +1487,7 @@ in=3D\\n[.i] fi=3D\\n[.u] .d=3D\\n[.d] nl=3D\\n[nl]=
 pg=3D\\n[%]
 .pg@move-trap
 ..
 .\"---------------------
-.\" multicolumn output.=20
+.\" multicolumn output.
 .de pg@set-po
 .if \\n[pg*cols-per-page]>1 \{\
 .	ll \\n[pg*column-size]u
@@ -1718,7 +1718,7 @@ in=3D\\n[.i] fi=3D\\n[.u] .d=3D\\n[.d] nl=3D\\n[nl]=
 pg=3D\\n[%]
 .		nr ds*wide 0
 .		if r ft*df-save \{\
 .			nr Df \\n[ft*df-save]
-.			rm ft*df-save=20
+.			rm ft*df-save
 .		\}
 .	\}
 .	if '\\*[ft*x]'WD' \{\
@@ -2399,7 +2399,7 @@ in=3D\\n[.i] fi=3D\\n[.u] .d=3D\\n[.d] nl=3D\\n[nl]=
 pg=3D\\n[%]
 .SP .5
 ..
 .\" ####### module eq #######################################
-.\"=20
+.\"
 .nr eq*number 0 1
 .ds eq*label
 .de EQ
@@ -2513,7 +2513,7 @@ in=3D\\n[.i] fi=3D\\n[.u] .d=3D\\n[.d] nl=3D\\n[nl]=
 pg=3D\\n[%]
 .	\}
 .\}
 .am toc*list
-.\" .toc@set level headernumber text pagenr
+.\" .toc@set level headernumber text pagenumber
 .toc@set \\$1 "\\$2" "\\$3" \\$4
 \\..
 ..
@@ -2537,7 +2537,7 @@ in=3D\\n[.i] fi=3D\\n[.u] .d=3D\\n[.d] nl=3D\\n[nl]=
 pg=3D\\n[%]
 .in \\n[toc*text]u
 .ti -\\n[toc*hl!\\$1]u
 .\"
-.\" length of headernum space
+.\" length of headernumber space
 .nr toc*i \\n[toc*hl!\\$1]-\w@\\$2@
 .\"
 .ll \\n[@ll]u-\w@\\$4@u-2m
@@ -2569,7 +2569,7 @@ in=3D\\n[.i] fi=3D\\n[.u] .d=3D\\n[.d] nl=3D\\n[nl]=
 pg=3D\\n[%]
 .ll \\n[@ll]u
 ..
 .\"########################### module lix ############################
-.\" LIST OF figures, tables, exhibits and equations=20
+.\" LIST OF figures, tables, exhibits and equations
 .nr lix*fg-nr 0 1
 .nr lix*tb-nr 0 1
 .nr lix*ec-nr 0 1
@@ -2701,7 +2701,7 @@ in=3D\\n[.i] fi=3D\\n[.u] .d=3D\\n[.d] nl=3D\\n[nl]=
 pg=3D\\n[%]
 ..
 .\"------------
 .\" print appended macro
-.\" lix@dsln type pagenumber text headernr
+.\" lix@dsln type pagenumber text headernumber
 .de lix@dsln
 .nr lix*i \\n[lix*wth\\$1]-\w@\\$4@
 .ne 4v
@@ -2900,7 +2900,7 @@ in=3D\\n[.i] fi=3D\\n[.u] .d=3D\\n[.d] nl=3D\\n[nl]=
 pg=3D\\n[%]
 .nr ref*flag 0 1
 ..
 .\"########################### module app ############################
-.\"=20
+.\"
 .nr app*nr 0 1
 .af app*nr A
 .nr app*dnr 0 1
@@ -2946,7 +2946,7 @@ in=3D\\n[.i] fi=3D\\n[.u] .d=3D\\n[.d] nl=3D\\n[nl]=
 pg=3D\\n[%]
 .	\}
 .	ds app*ind \\n+[app*nr]
 .	nr H1 \\n+[app*dnr]
-.	nr H1h \\n[app*dnr]=20
+.	nr H1h \\n[app*dnr]
 .\}
 .\"	clear lower counters
 .nr app*i 1 1


From MAILER-DAEMON Sat Oct 28 23:38:06 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1e8eQI-0000kS-T6
	for mharc-groff-commit@gnu.org; Sat, 28 Oct 2017 23:38:06 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:36575)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e8eQG-0000kL-P7
	for groff-commit@gnu.org; Sat, 28 Oct 2017 23:38:05 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e8eQG-0005M2-1H
	for groff-commit@gnu.org; Sat, 28 Oct 2017 23:38:04 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:35230)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e8eQF-0005Lt-Tc
	for groff-commit@gnu.org; Sat, 28 Oct 2017 23:38:03 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id 8F8AB212D1; Sat, 28 Oct 2017 23:38:03 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/01: contrib/mom/momdoc/definitions.html: Fix wording.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: "G. Branden Robinson" <g.branden.robinson@gmail.com>
In-Reply-To: groff@gnu.org
References: <20171029033802.14147.49620@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: c466c3ff5ef5293d962821c2f77695e8d056f8ec
Auto-Submitted: auto-generated
Message-Id: <20171029033803.8F8AB212D1@vcs0.savannah.gnu.org>
Date: Sat, 28 Oct 2017 23:38:03 -0400 (EDT)
From: g.branden.robinson@gmail.com (G. Branden Robinson)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit/>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 29 Oct 2017 03:38:05 -0000

gbranden pushed a commit to branch master
in repository groff.

commit c466c3ff5ef5293d962821c2f77695e8d056f8ec
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Sat Oct 28 23:36:00 2017 -0400

    contrib/mom/momdoc/definitions.html: Fix wording.
   =20
    * Hypenate "fixed-width" adjective phrase.
    * Fix apparent thinko: "vertical" -> "horizontal".
    * Kill nearby unnecessary whitespace.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 contrib/mom/momdoc/definitions.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/contrib/mom/momdoc/definitions.html b/contrib/mom/momdoc/def=
initions.html
index 3ac3b28..064fa03 100644
--- a/contrib/mom/momdoc/definitions.html
+++ b/contrib/mom/momdoc/definitions.html
@@ -243,11 +243,11 @@ or concept you&#8217;re not familiar with.
   say, columns or numbered lists.  In groff, the figure space is
   entered with <kbd>\0</kbd> (ie a backslash followed by a zero)
   </dd>
- =20
-  <dt id=3D"fixedwidthfont">Fixed width font</dt>
+
+  <dt id=3D"fixedwidthfont">Fixed-width font</dt>
   <dd>
   A family or font in which every character occupies exactly the
-  same amount of vertical space on the line.  Courier is the
+  same amount of horizontal space on the line.  Courier is the
   best-known, if not the most elegant, fixed-width font.
   </dd>
=20
@@ -665,7 +665,7 @@ or concept you&#8217;re not familiar with.
   when the groff device is ps. (&#8220;ps&#8221; means
   &#8220;PostScript&#8221;&mdash;the default device for
   which groff prepares output, and the device for which
-  mom was specifically designed.)
+  mom was originally designed.)
   </dd>
  =20
   <dt id=3D"numericargument">Numeric argument</dt>


From MAILER-DAEMON Sun Oct 29 22:02:54 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1e8zPi-0005fq-JX
	for mharc-groff-commit@gnu.org; Sun, 29 Oct 2017 22:02:54 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:52756)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e8zPc-0005fc-VD
	for groff-commit@gnu.org; Sun, 29 Oct 2017 22:02:52 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e8zPc-0008Q1-1l
	for groff-commit@gnu.org; Sun, 29 Oct 2017 22:02:48 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:48391)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e8zPb-0008Pd-UG
	for groff-commit@gnu.org; Sun, 29 Oct 2017 22:02:47 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id 53DAE21116; Sun, 29 Oct 2017 22:02:47 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/01: groff_man(7): Recast explanation of \& escape.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: "G. Branden Robinson" <g.branden.robinson@gmail.com>
In-Reply-To: groff@gnu.org
References: <20171030020246.25936.48578@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 0be4bf9b071bda5c99fb157c4c9ec9347ef3ea99
Auto-Submitted: auto-generated
Message-Id: <20171030020247.53DAE21116@vcs0.savannah.gnu.org>
Date: Sun, 29 Oct 2017 22:02:47 -0400 (EDT)
From: g.branden.robinson@gmail.com (G. Branden Robinson)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit/>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Oct 2017 02:02:53 -0000

gbranden pushed a commit to branch master
in repository groff.

commit 0be4bf9b071bda5c99fb157c4c9ec9347ef3ea99
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Sun Oct 29 21:58:43 2017 -0400

    groff_man(7): Recast explanation of \& escape.
   =20
    Per suggestion from Ralph Corderoy, remove enumeration.
   =20
    Recast while I was at it, with an eye to further precision, so the
    example can more easily be discarded later if desired.
   =20
    Use the term "roff" in favor of "troff" in this context, per groff(7)=
.
   =20
    Also Add Vim modeline.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 tmac/groff_man.7.man | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tmac/groff_man.7.man b/tmac/groff_man.7.man
index 8ccd23b..4ec6b20 100644
--- a/tmac/groff_man.7.man
+++ b/tmac/groff_man.7.man
@@ -1223,9 +1223,12 @@ There are 2.54\e\ cm in an inch, and 1,024\e\ byte=
s in 1\e\ kiB.
 .B \e&
 Zero-width space.
 .
-Can be used to (1)\~suppress recognition of end-of-sentence punctuation
-sequences at the end of an input line, and (2)\~suppress recognition of
-a dot or apostrophe at the beginning of a line as a troff request.
+Can be used after an end-of-sentence punctuation sequence at the end of
+an input line to prevent its recognition as such, and before a dot or
+apostrophe at the beginning of an input line to prevent its
+interpretation as the beginning of a
+.I roff
+request.
 .
 .RS
 .IP
@@ -1493,3 +1496,4 @@ Local changes and customizations should be put into=
 this file.
 .\" Local Variables:
 .\" mode: nroff
 .\" End:
+.\" vim: set filetype=3Dgroff:


From MAILER-DAEMON Sun Oct 29 22:33:46 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1e8ztZ-0000ej-UM
	for mharc-groff-commit@gnu.org; Sun, 29 Oct 2017 22:33:45 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:56674)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e8ztY-0000dp-A4
	for groff-commit@gnu.org; Sun, 29 Oct 2017 22:33:45 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e8ztX-000786-IG
	for groff-commit@gnu.org; Sun, 29 Oct 2017 22:33:44 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:48689)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e8ztX-00077w-FA
	for groff-commit@gnu.org; Sun, 29 Oct 2017 22:33:43 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id 1EA1420A12; Sun, 29 Oct 2017 22:33:43 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/02: groff_man(7): Further recast explanation of \&.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: "G. Branden Robinson" <g.branden.robinson@gmail.com>
In-Reply-To: groff@gnu.org
References: <20171030023342.4707.3804@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 806866a0fee2f0ef5a6247ff31cf9ff3b913cea8
Auto-Submitted: auto-generated
Message-Id: <20171030023343.1EA1420A12@vcs0.savannah.gnu.org>
Date: Sun, 29 Oct 2017 22:33:42 -0400 (EDT)
From: g.branden.robinson@gmail.com (G. Branden Robinson)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit/>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Oct 2017 02:33:45 -0000

gbranden pushed a commit to branch master
in repository groff.

commit 806866a0fee2f0ef5a6247ff31cf9ff3b913cea8
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Sun Oct 29 22:14:21 2017 -0400

    groff_man(7): Further recast explanation of \&.
   =20
    Also delete example since the escape sequence description is now
    clear and precise enough that the example is no longer necessary.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 tmac/groff_man.7.man | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/tmac/groff_man.7.man b/tmac/groff_man.7.man
index 4ec6b20..c6ce279 100644
--- a/tmac/groff_man.7.man
+++ b/tmac/groff_man.7.man
@@ -1223,22 +1223,13 @@ There are 2.54\e\ cm in an inch, and 1,024\e\ byt=
es in 1\e\ kiB.
 .B \e&
 Zero-width space.
 .
-Can be used after an end-of-sentence punctuation sequence at the end of
-an input line to prevent its recognition as such, and before a dot or
-apostrophe at the beginning of an input line to prevent its
-interpretation as the beginning of a
+Append to an input line to prevent an end-of-sentence punctuation
+sequence from being recognized as such, or insert at the beginning of an
+input line to prevent a dot or apostrophe from being interpreted as the
+beginning of a
 .I roff
 request.
 .
-.RS
-.IP
-.EX
-Using a boot argument of
-\e&'sound=3D0' disables the sound driver, according to J.\e&
-Alfred Prufrock.
-.EE
-.RE
-.
 .TP
 .B \e(aq
 ASCII apostrophe.


From MAILER-DAEMON Sun Oct 29 22:33:48 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1e8ztc-0000gK-27
	for mharc-groff-commit@gnu.org; Sun, 29 Oct 2017 22:33:48 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:56684)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e8ztZ-0000eK-5K
	for groff-commit@gnu.org; Sun, 29 Oct 2017 22:33:46 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e8ztX-000788-I4
	for groff-commit@gnu.org; Sun, 29 Oct 2017 22:33:45 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:48691)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e8ztX-00077x-FF
	for groff-commit@gnu.org; Sun, 29 Oct 2017 22:33:43 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id 4FEC820A14; Sun, 29 Oct 2017 22:33:43 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 02/02: contrib/mom/om.tmac-u: Fix several typos.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: "G. Branden Robinson" <g.branden.robinson@gmail.com>
In-Reply-To: groff@gnu.org
References: <20171030023342.4707.3804@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: d252fa7753f867a522e7500ab456ed97f16f4fba
Auto-Submitted: auto-generated
Message-Id: <20171030023343.4FEC820A14@vcs0.savannah.gnu.org>
Date: Sun, 29 Oct 2017 22:33:43 -0400 (EDT)
From: g.branden.robinson@gmail.com (G. Branden Robinson)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit/>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Oct 2017 02:33:46 -0000

gbranden pushed a commit to branch master
in repository groff.

commit d252fa7753f867a522e7500ab456ed97f16f4fba
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Sun Oct 29 22:31:50 2017 -0400

    contrib/mom/om.tmac-u: Fix several typos.
   =20
    ("Automagically" might have whimsy rather than error, though. --GBR)
   =20
    Signed-off-by: Bjarni Ingi Gislason <bjarniig@rhi.hi.is>
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 contrib/mom/om.tmac-u | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/contrib/mom/om.tmac-u b/contrib/mom/om.tmac-u
index 3db1ea9..fb474a7 100644
--- a/contrib/mom/om.tmac-u
+++ b/contrib/mom/om.tmac-u
@@ -160,7 +160,7 @@ extensions, and float management).
 .sty \n[.fp] UBLI    \"  Ultra Black Italic
 .sty \n[.fp] UBLCD   \"  Ultra Black Condensed
 .sty \n[.fp] UBLCDI  \"  Ultra Black Condensed Italic
-.sty \n[.fp] UBLEX   \"  Ultra Black Exteneded
+.sty \n[.fp] UBLEX   \"  Ultra Black Extended
 .sty \n[.fp] UBLEXI  \"  Ultra Black Extended Italic
 \#
 .sty \n[.fp] SC      \"  Small Caps Roman
@@ -1733,7 +1733,7 @@ end
 \# *Argument:
 \#   <none>
 \# *Function:
-\#   Automagically moves to TAB<n+1> on the same line as the last
+\#   Automatically moves to TAB<n+1> on the same line as the last
 \#   line of the previous tab.
 \# *Notes:
 \#   The \c inline must be appended to the end of input lines when in
@@ -2375,7 +2375,7 @@ end
 \#
 \# PAD
 \# ---
-\# *Argments:
+\# *Arguments:
 \#   "<string of text with padding markers inserted>"
 \#   "<id of bookmark created by .PDF_BOOKMARK>"
 \# *Function:
@@ -3685,7 +3685,7 @@ end
 \#   a trap (when they break the preceding line, they spring the
 \#   trap, and groff won't back up to the line preceding the trap).
 \#   TRAP is a kludge to get EL and TN work properly on last lines.
-\#   The user simply enloses the offending lines in TRAP OFF/TRAP.
+\#   The user simply encloses the offending lines in TRAP OFF/TRAP.
 \#
 .MAC TRAP END
 .    ie '\\$1'' .vpt
@@ -4282,7 +4282,7 @@ y\R'#DESCENDER \\n[.cdp]'
 \#   Instructs TYPEWRITE to treat italics as italics, whether
 \#   invoked via control lines or inline.
 \# *Notes:
-\#   ITALIC_MEANS_ITALIC and UNDERLINE_ITALIC are mututally exclusive,
+\#   ITALIC_MEANS_ITALIC and UNDERLINE_ITALIC are mutually exclusive,
 \#   hence invoking the one automatically turns off the other.
 \#
 .MAC ITALIC_MEANS_ITALIC END
@@ -4306,7 +4306,7 @@ y\R'#DESCENDER \\n[.cdp]'
 \#   Instructs TYPEWRITE to underline italics, whether invoked
 \#   via control lines or inline.
 \# *Notes:
-\#   UNDERLINE_ITALIC and ITALIC_MEANS_ITALIC are mututally exclusive,
+\#   UNDERLINE_ITALIC and ITALIC_MEANS_ITALIC are mutually exclusive,
 \#   hence invoking the one automatically turns off the other.
 \#
 \#   UNDERLINE_ITALIC is the default for TYPEWRITE.
@@ -4337,7 +4337,7 @@ y\R'#DESCENDER \\n[.cdp]'
 \#   italic but didn't have it, ergo the need to tell TYPEWRITE to
 \#   treat \*[SLANT] as italic (i.e. underlined).
 \#
-\#   UNDERLINE_SLANT and SLANT_MEANS_SLANT are mututally exclusive,
+\#   UNDERLINE_SLANT and SLANT_MEANS_SLANT are mutually exclusive,
 \#   hence invoking the one automatically turns off the other.
 \#
 \#   UNDERLINE_SLANT is the default for TYPEWRITE.
@@ -7556,7 +7556,7 @@ $\\*[DOC_]COVERTITLE_\\n+[#\\*[DOC_]COVERTITLE_NUM]=
 \\$\\n[#\\*[DOC_]COVERTITLE_
 \# *Arguments:
 \#   <none>
 \# *Function:
-\#   Macro to start document processiong.  Reads in default document
+\#   Macro to start document processing.  Reads in default document
 \#   style parameters and any parameters the user has changed before
 \#   issuing START.  Using the information gathered in the opening
 \#   macros, prints appropriate title (or chapter #), subtitle,
@@ -8885,7 +8885,7 @@ Shimming must be disabled with NO_SHIM before using=
 FLEX.
 \#
 \#   If the user wants to incorporate the page number into the string,
 \#   \*[PAGE#] must be used.  For example, if the user wants to put
-\#   an elipsis before the page number in the string, s/he should use
+\#   an ellipsis before the page number in the string, s/he should use
 \#   ...\*[PAGE#], not ...#
 \#
 .MAC HDRFTR_LEFT END
@@ -8957,7 +8957,7 @@ Shimming must be disabled with NO_SHIM before using=
 FLEX.
 \#
 \#   If the user wants to incorporate the page number into the string,
 \#   \*[PAGE#] must be used.  For example, if the user wants to put
-\#   an elipsis before the page number in the string, s/he should use
+\#   an ellipsis before the page number in the string, s/he should use
 \#   ...\*[PAGE#], not ...#
 \#
 .MAC HDRFTR_CENTER END
@@ -9047,7 +9047,7 @@ Shimming must be disabled with NO_SHIM before using=
 FLEX.
 \#
 \#   If the user wants to incorporate the page number into the string,
 \#   \*[PAGE#] must be used.  For example, if the user wants to put
-\#   an elipsis before the page number in the string, s/he should use
+\#   an ellipsis before the page number in the string, s/he should use
 \#   ...\*[PAGE#], not ...#
 \#
 .MAC HDRFTR_RIGHT END
@@ -9763,7 +9763,7 @@ Shimming must be disabled with NO_SHIM before using=
 FLEX.
 .    \}
 .    if \\n[#PRINT_STYLE]=3D1 \{\
 .       if \\n[#ENDNOTES]=3D1 \{\
-.\" Single-spaced endotes have a different lead
+.\" Single-spaced endnotes have a different lead
 .          if \\n[#EN_SINGLESPACE] \{\
 .             nr #RESTORE_DOC_LEAD \\n[#DOC_LEAD]
 .             nr #DOC_LEAD \\n[#EN_LEAD]u
@@ -11259,7 +11259,7 @@ Shimming must be disabled with NO_SHIM before usi=
ng FLEX.
 \#   [character] [iterations] [vertical adjustment]
 \# *Function:
 \#   Allows user to specify a line break character and the number
-\#   of times to repeat it horiontally.
+\#   of times to repeat it horizontally.
 \# *Notes:
 \#   Without an argument, LINEBREAK_CHAR will deposit a blank line.
 \#
@@ -13962,7 +13962,7 @@ E\\R'#CAP_HEIGHT \\n[.cht]'
 .
 .ALIAS ENDNOTE_STRING ENDNOTES_HEADER_STRING
 \#
-\# ENDNOTE STRING START POSTION
+\# ENDNOTE STRING START POSITION
 \# ----------------------------
 \# *Argument:
 \#   <distance from page top>
@@ -14883,8 +14883,8 @@ E\\R'#CAP_HEIGHT \\n[.cht]'
 \#   Sets #BIB_LIST to 1 for numbered list style, 0 for plain output
 \# *Notes:
 \#   Technically, user is supposed to enter PLAIN if s/he wants an
-\#   unumbered bibliography, but the el clause says "any arg but
-\#   LIST means unumbered."  Effectively, any arg but LIST produces
+\#   unnumbered bibliography, but the el clause says "any arg but
+\#   LIST means unnumbered."  Effectively, any arg but LIST produces
 \#   a "plain" bibliographic list.
 \#
 \# The 2nd and 3rd args have the same options as the 2nd and 3rd
@@ -21340,7 +21340,7 @@ does not fit on page \\n[pgnum]\\*[col-num].
 .while !'\\*[eval*[E]',' \{\
 .   ds eval*[E \\*([E
 .   substring eval*[E \\n+[position] \\n[position]
-.   if \\n+[counter]>30 .break \" 30 is abitrary
+.   if \\n+[counter]>30 .break \" 30 is arbitrary
 .\}
 .\" Check for " and"
 .if '\\*[eval*[E]',' \{\
@@ -21601,7 +21601,7 @@ does not fit on page \\n[pgnum]\\*[col-num].
 \#
 \# Book reprints
 \# -------------
-\# %d date of publication (the orignal date of publication)
+\# %d date of publication (the original date of publication)
 .de ref*add-d
 .ie '\\*[$REF_STYLE]'NOTE' \{\
 .   ref*field d "" ( ;


From MAILER-DAEMON Sun Oct 29 22:37:16 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1e8zwy-0001MW-BG
	for mharc-groff-commit@gnu.org; Sun, 29 Oct 2017 22:37:16 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:57262)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e8zww-0001MB-0o
	for groff-commit@gnu.org; Sun, 29 Oct 2017 22:37:14 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e8zwv-00016C-5V
	for groff-commit@gnu.org; Sun, 29 Oct 2017 22:37:13 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:48713)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e8zwv-000161-1Q
	for groff-commit@gnu.org; Sun, 29 Oct 2017 22:37:13 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id C2B3620A14; Sun, 29 Oct 2017 22:37:12 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/01: .../mom/om.tmac-u: Fix typo in register reference.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: "G. Branden Robinson" <g.branden.robinson@gmail.com>
In-Reply-To: groff@gnu.org
References: <20171030023712.6036.16565@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: cac64ce760ee939c020dd8c5bd753736de29e3d3
Auto-Submitted: auto-generated
Message-Id: <20171030023712.C2B3620A14@vcs0.savannah.gnu.org>
Date: Sun, 29 Oct 2017 22:37:12 -0400 (EDT)
From: g.branden.robinson@gmail.com (G. Branden Robinson)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit/>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Oct 2017 02:37:15 -0000

gbranden pushed a commit to branch master
in repository groff.

commit cac64ce760ee939c020dd8c5bd753736de29e3d3
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Sun Oct 29 22:34:21 2017 -0400

    .../mom/om.tmac-u: Fix typo in register reference.
   =20
    Fixes the outright bug part of Savannah #51608.
   =20
    Signed-off-by: Bjarni Ingi Gislason <bjarniig@rhi.hi.is>
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 contrib/mom/om.tmac-u | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/mom/om.tmac-u b/contrib/mom/om.tmac-u
index fb474a7..bec27eb 100644
--- a/contrib/mom/om.tmac-u
+++ b/contrib/mom/om.tmac-u
@@ -18866,7 +18866,7 @@ E\\R'#CAP_HEIGHT \\n[.cht]'
 .    if \\n[#NUM_ARGS]=3D1 \{\
 .       rr \\*[label-type]*autolabel
 .       rr \\*[label-type]*label-prfx-set
-.       rr \\*[label-type]*label-suffx-set
+.       rr \\*[label-type]*label-sffx-set
 .    \}
 .    rr \\*[label-type]-label-args
 .END


From MAILER-DAEMON Tue Oct 31 22:29:18 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1e9imM-00021d-EU
	for mharc-groff-commit@gnu.org; Tue, 31 Oct 2017 22:29:18 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:35018)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e9imI-00020o-PV
	for groff-commit@gnu.org; Tue, 31 Oct 2017 22:29:16 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e9imG-0007iC-Iw
	for groff-commit@gnu.org; Tue, 31 Oct 2017 22:29:14 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:33577)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e9imG-0007i1-En
	for groff-commit@gnu.org; Tue, 31 Oct 2017 22:29:12 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id 5C2D72044C; Tue, 31 Oct 2017 22:29:12 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/01: Use \-, not -, in arguments to .MT/.MTO macros.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: "G. Branden Robinson" <g.branden.robinson@gmail.com>
In-Reply-To: groff@gnu.org
References: <20171101022911.4824.20221@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: b501da8808a77345463c22d079a566c147d2bd01
Auto-Submitted: auto-generated
Message-Id: <20171101022912.5C2D72044C@vcs0.savannah.gnu.org>
Date: Tue, 31 Oct 2017 22:29:11 -0400 (EDT)
From: g.branden.robinson@gmail.com (G. Branden Robinson)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit/>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Nov 2017 02:29:16 -0000

gbranden pushed a commit to branch master
in repository groff.

commit b501da8808a77345463c22d079a566c147d2bd01
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Tue Oct 31 22:27:41 2017 -0400

    Use \-, not -, in arguments to .MT/.MTO macros.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 contrib/chem/chem.1.man                       | 2 +-
 contrib/gdiffmk/gdiffmk.1.man                 | 2 +-
 contrib/gperl/gperl.1.man                     | 2 +-
 contrib/groff_filenames/groff_filenames.5.man | 2 +-
 contrib/groffer/groffer.1.man                 | 2 +-
 contrib/groffer/roff2.1.man                   | 2 +-
 contrib/hdtbl/groff_hdtbl.7.man               | 2 +-
 contrib/hdtbl/hdtbl.tmac-u                    | 2 +-
 contrib/mom/groff_mom.7.man                   | 2 +-
 doc/webpage.ms                                | 8 ++++----
 man/ditroff.7.man                             | 2 +-
 man/groff.7.man                               | 4 ++--
 man/groff_char.7.man                          | 2 +-
 man/groff_diff.7.man                          | 2 +-
 man/groff_out.5.man                           | 2 +-
 man/groff_tmac.5.man                          | 2 +-
 man/roff.7.man                                | 2 +-
 src/roff/groff/groff.1.man                    | 6 +++---
 src/roff/grog/grog.1.man                      | 2 +-
 src/roff/troff/troff.1.man                    | 2 +-
 tmac/groff_trace.7.man                        | 2 +-
 tmac/groff_www.7.man                          | 2 +-
 22 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/contrib/chem/chem.1.man b/contrib/chem/chem.1.man
index 8c0d5eb..3cac78b 100644
--- a/contrib/chem/chem.1.man
+++ b/contrib/chem/chem.1.man
@@ -929,7 +929,7 @@ book
 .\" --------------------------------------------------------------------
 .
 Report bugs to the
-.MT bug-groff@\:gnu.org
+.MT bug\-groff@\:gnu.org
 bug-groff mailing list
 .ME .
 .
diff --git a/contrib/gdiffmk/gdiffmk.1.man b/contrib/gdiffmk/gdiffmk.1.ma=
n
index 844a5e7..51c1e00 100644
--- a/contrib/gdiffmk/gdiffmk.1.man
+++ b/contrib/gdiffmk/gdiffmk.1.man
@@ -254,7 +254,7 @@ option.
 .
 .LP
 Report bugs to
-.MT bug-groff@gnu.org
+.MT bug\-groff@gnu.org
 .ME .
 .
 Include a complete, self-contained example that will allow the bug to
diff --git a/contrib/gperl/gperl.1.man b/contrib/gperl/gperl.1.man
index c0b7697..1957386 100644
--- a/contrib/gperl/gperl.1.man
+++ b/contrib/gperl/gperl.1.man
@@ -10,7 +10,7 @@ gperl \- groff preprocessor for Perl parts in roff file=
s
 .
 .de au
 This file was written by
-.MT groff-bernd.warken-72@web.de
+.MT groff\-bernd.warken-72@web.de
 Bernd Warken
 .ME .
 ..
diff --git a/contrib/groff_filenames/groff_filenames.5.man b/contrib/grof=
f_filenames/groff_filenames.5.man
index 126ee96..1769d16 100644
--- a/contrib/groff_filenames/groff_filenames.5.man
+++ b/contrib/groff_filenames/groff_filenames.5.man
@@ -26,7 +26,7 @@ The license text can be found in the internet at
 .
 .de au
 This file was written by
-.MT groff-bernd.warken-72@web.de
+.MT groff\-bernd.warken-72@web.de
 Bernd Warken
 .ME .
 ..
diff --git a/contrib/groffer/groffer.1.man b/contrib/groffer/groffer.1.ma=
n
index c7bb3bf..0242ed4 100644
--- a/contrib/groffer/groffer.1.man
+++ b/contrib/groffer/groffer.1.man
@@ -38,7 +38,7 @@ The license text is available in the internet at
 .
 .de au
 This file was written by
-.MT groff-bernd.warken-72@web.de
+.MT groff\-bernd.warken-72@web.de
 Bernd Warken
 .ME .
 ..
diff --git a/contrib/groffer/roff2.1.man b/contrib/groffer/roff2.1.man
index 257fb05..d43fe37 100644
--- a/contrib/groffer/roff2.1.man
+++ b/contrib/groffer/roff2.1.man
@@ -29,7 +29,7 @@ The license text is available in the internet at
 .
 .de au
 This file was written by
-.MT groff-bernd.warken-72@web.de
+.MT groff\-bernd.warken-72@web.de
 Bernd Warken
 .ME .
 ..
diff --git a/contrib/hdtbl/groff_hdtbl.7.man b/contrib/hdtbl/groff_hdtbl.=
7.man
index 767c7d9..53866bc 100644
--- a/contrib/hdtbl/groff_hdtbl.7.man
+++ b/contrib/hdtbl/groff_hdtbl.7.man
@@ -28,7 +28,7 @@ FDL in the main directory of the groff source package.
 .
 .de au
 This document was written by
-.MT Joachim.Walsdorff@urz.uni-heidelberg.de
+.MT Joachim.Walsdorff@urz.uni\-heidelberg.de
 Joachim Walsdorff
 .ME .
 ..
diff --git a/contrib/hdtbl/hdtbl.tmac-u b/contrib/hdtbl/hdtbl.tmac-u
index 069f9ce..e1b0918 100644
--- a/contrib/hdtbl/hdtbl.tmac-u
+++ b/contrib/hdtbl/hdtbl.tmac-u
@@ -19,7 +19,7 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General =
Public License
 for more details.
=20
 You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
=20
 ..
 .
diff --git a/contrib/mom/groff_mom.7.man b/contrib/mom/groff_mom.7.man
index 881559a..186152a 100644
--- a/contrib/mom/groff_mom.7.man
+++ b/contrib/mom/groff_mom.7.man
@@ -3391,7 +3391,7 @@ after NEWPAGE, like this:
 .\" --------------------------------------------------------------------
 .
 Please send bug reports to the
-.MT bug-groff@gnu.org
+.MT bug\-groff@gnu.org
 groff-bug mailing list
 .ME
 or directly to the authors.
diff --git a/doc/webpage.ms b/doc/webpage.ms
index af5e848..0971bd4 100644
--- a/doc/webpage.ms
+++ b/doc/webpage.ms
@@ -243,7 +243,7 @@ Three mailing lists are available:
=20
 .ULS
 .LI
-.MTO bug-groff@gnu.org bug-groff@gnu.org
+.MTO bug\-groff@gnu.org bug\-groff@gnu.org
 for reporting bugs and following bug reports
=20
 .LI
@@ -251,13 +251,13 @@ for reporting bugs and following bug reports
 for general discussion of groff
=20
 .LI
-.MTO groff-commit@gnu.org groff-commit@gnu.org
+.MTO groff\-commit@gnu.org groff\-commit@gnu.org
 a read-only list showing commits to the git repository
 .ULE
=20
 To subscribe, send a mail to \[la]list\[ra]-request@\[la]domain\[ra]
 (example:
-.MTO groff-request@\:gnu.org groff-request@\:gnu.org
+.MTO groff\-request@\:gnu.org groff\-request@\:gnu.org
 for the `groff' list) with the word `subscribe' in either the
 subject or body of the e-mail (don't include the quotes).
 Alternatively, you may subscribe by visiting the web pages at
@@ -2339,7 +2339,7 @@ Groffer
 .ULS
 .LI
 A new script contributed by
-.MTO groff-bernd.warken-72@web.de "Bernd Warken" .
+.MTO groff\-bernd.warken\-72@web.de "Bernd Warken" .
 It displays groff files and man pages on X and tty, taking care of most
 parameters automatically.
 .ULE
diff --git a/man/ditroff.7.man b/man/ditroff.7.man
index a8304b7..a993b48 100644
--- a/man/ditroff.7.man
+++ b/man/ditroff.7.man
@@ -25,7 +25,7 @@ GNU copyleft site
 ..
 .de au
 It was written by
-.MT groff-bernd.warken-72@\:web.de
+.MT groff\-bernd.warken-72@\:web.de
 Bernd Warken
 .ME
 and is maintained by
diff --git a/man/groff.7.man b/man/groff.7.man
index 677bf43..a1179f1 100644
--- a/man/groff.7.man
+++ b/man/groff.7.man
@@ -31,7 +31,7 @@ available in the internet at
 .
 .de au
 This documentation was written by
-.MT groff-bernd.warken-72@web.de
+.MT groff\-bernd.warken-72@web.de
 Bernd Warken
 .ME
 and is appended and maintained by
@@ -4540,7 +4540,7 @@ on how to invoke this.
 .\" --------------------------------------------------------------------
 .
 Report bugs to the
-.MT bug-groff@gnu.org
+.MT bug\-groff@gnu.org
 groff bug mailing list
 .ME .
 Include a complete, self-contained example that will allow the bug to
diff --git a/man/groff_char.7.man b/man/groff_char.7.man
index b08e6d7..eebf538 100644
--- a/man/groff_char.7.man
+++ b/man/groff_char.7.man
@@ -45,7 +45,7 @@ with additions by
 Werner Lemberg
 .ME
 and
-.MT groff-bernd.warken-72@web.de
+.MT groff\-bernd.warken\-72@web.de
 Bernd Warken
 .ME .
 .
diff --git a/man/groff_diff.7.man b/man/groff_diff.7.man
index 896e4f9..399b445 100644
--- a/man/groff_diff.7.man
+++ b/man/groff_diff.7.man
@@ -44,7 +44,7 @@ was modified by
 Werner Lemberg
 .ME
 and
-.MT groff-bernd.warken-72@web.de
+.MT groff\-bernd.warken\-72@web.de
 Bernd Warken
 .ME .
 ..
diff --git a/man/groff_out.5.man b/man/groff_out.5.man
index 3f2f082..dd2e45c 100644
--- a/man/groff_out.5.man
+++ b/man/groff_out.5.man
@@ -39,7 +39,7 @@ GNU FDL license
 .
 .de au
 In 2001, this document was rewritten from scrach by
-.MT groff-bernd.warken-72@web.de
+.MT groff\-bernd.warken\-72@web.de
 Bernd Warken
 .ME .
 ..
diff --git a/man/groff_tmac.5.man b/man/groff_tmac.5.man
index 7e25cbc..4907a9b 100644
--- a/man/groff_tmac.5.man
+++ b/man/groff_tmac.5.man
@@ -35,7 +35,7 @@ GNU copyleft site
 .
 .de au
 This file was written by
-.MT groff-bernd.warken-72@web.de
+.MT groff\-bernd.warken\-72@web.de
 Bernd Warken
 .ME
 and
diff --git a/man/roff.7.man b/man/roff.7.man
index 27edbe0..e95c43f 100644
--- a/man/roff.7.man
+++ b/man/roff.7.man
@@ -34,7 +34,7 @@ GNU copyleft site
 .
 .de au
 This man-page was written by
-.MT groff-bernd.warken-72@web.de
+.MT groff\-bernd.warken\-72@web.de
 Bernd Warken
 .ME
 and is maintained by
diff --git a/src/roff/groff/groff.1.man b/src/roff/groff/groff.1.man
index c6f1b87..0344248 100644
--- a/src/roff/groff/groff.1.man
+++ b/src/roff/groff/groff.1.man
@@ -1652,7 +1652,7 @@ is not available on \f[CR]ASCII\f[] based operating=
 systems.
 .
 .P
 Report bugs to
-.MT bug-groff@gnu.org
+.MT bug\-groff@gnu.org
 the groff mailing list
 .ME .
 .
@@ -1835,7 +1835,7 @@ Three
 .I groff
 mailing lists are available:
 .IP
-.MT bug-groff@gnu.org
+.MT bug\-groff@gnu.org
 for reporting bugs
 .ME .
 .
@@ -1845,7 +1845,7 @@ for general discussion of
 .IR groff ,
 .ME .
 .IP
-.MT groff-commit@ffii.org
+.MT groff\-commit@ffii.org
 the groff commit list
 .ME ,
 a read-only list showing logs of commitments to the groff repository.
diff --git a/src/roff/grog/grog.1.man b/src/roff/grog/grog.1.man
index 48461a4..9c2a78c 100644
--- a/src/roff/grog/grog.1.man
+++ b/src/roff/grog/grog.1.man
@@ -40,7 +40,7 @@ Werner Lemberg
 .ME .
=20
 Rewritten and put under GPL by
-.MT groff-bernd.warken-72@web.de
+.MT groff\-bernd.warken\-72@web.de
 Bernd Warken
 .ME .
 ..
diff --git a/src/roff/troff/troff.1.man b/src/roff/troff/troff.1.man
index f928cd0..77ffa31 100644
--- a/src/roff/troff/troff.1.man
+++ b/src/roff/troff/troff.1.man
@@ -32,7 +32,7 @@ This file was originally written by James Clark, it was=
 modified by
 Werner Lemberg
 .ME
 and
-.MT groff-bernd.warken-72@web.de
+.MT groff\-bernd.warken\-72@web.de
 Bernd Warken
 .ME .
 ..
diff --git a/tmac/groff_trace.7.man b/tmac/groff_trace.7.man
index 0295f42..5c06c23 100644
--- a/tmac/groff_trace.7.man
+++ b/tmac/groff_trace.7.man
@@ -31,7 +31,7 @@ FDL in the main directory of the groff source package.
 .
 .de au
 Written by
-.MT groff-bernd.warken-72@web.de
+.MT groff\-bernd.warken\-72@web.de
 Bernd Warken
 .ME .
 ..
diff --git a/tmac/groff_www.7.man b/tmac/groff_www.7.man
index c6e1273..6ba9036 100644
--- a/tmac/groff_www.7.man
+++ b/tmac/groff_www.7.man
@@ -689,7 +689,7 @@ information is currently rendered as a PNG image.
 .\" --------------------------------------------------------------------
 .
 Report bugs to the
-.MTO bug-groff@\:gnu.org "Groff Bug Mailing List" .
+.MTO bug\-groff@\:gnu.org "Groff Bug Mailing List" .
 .
 Include a complete, self-contained example that will allow the bug to
 be reproduced, and say which version of groff you are using.


From MAILER-DAEMON Tue Oct 31 22:55:51 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1e9jC3-0004WP-Sz
	for mharc-groff-commit@gnu.org; Tue, 31 Oct 2017 22:55:51 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:39102)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e9jC1-0004Vs-3d
	for groff-commit@gnu.org; Tue, 31 Oct 2017 22:55:50 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e9jC0-00035q-68
	for groff-commit@gnu.org; Tue, 31 Oct 2017 22:55:49 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:33829)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1e9jC0-00035k-2F
	for groff-commit@gnu.org; Tue, 31 Oct 2017 22:55:48 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id B59A620A0A; Tue, 31 Oct 2017 22:55:47 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/01: contrib/hdtbl/hdtbl.tmac-u: Update editor aids.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: "G. Branden Robinson" <g.branden.robinson@gmail.com>
In-Reply-To: groff@gnu.org
References: <20171101025547.14897.33298@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 05ea110d27eb6032610e0ade932b91e4a9fc8ceb
Auto-Submitted: auto-generated
Message-Id: <20171101025547.B59A620A0A@vcs0.savannah.gnu.org>
Date: Tue, 31 Oct 2017 22:55:47 -0400 (EDT)
From: g.branden.robinson@gmail.com (G. Branden Robinson)
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 208.118.235.201
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit/>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Nov 2017 02:55:50 -0000

gbranden pushed a commit to branch master
in repository groff.

commit 05ea110d27eb6032610e0ade932b91e4a9fc8ceb
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Tue Oct 31 22:53:42 2017 -0400

    contrib/hdtbl/hdtbl.tmac-u: Update editor aids.
   =20
    * Move single-line "-*- nroff -*-" Emacs setting to multi-line settin=
gs
      at the end of the file.
    * Add Vim modeline.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 contrib/hdtbl/hdtbl.tmac-u | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/contrib/hdtbl/hdtbl.tmac-u b/contrib/hdtbl/hdtbl.tmac-u
index e1b0918..04305f9 100644
--- a/contrib/hdtbl/hdtbl.tmac-u
+++ b/contrib/hdtbl/hdtbl.tmac-u
@@ -1,4 +1,3 @@
-.\"	-*- nroff -*-
 .ig
=20
 hdtbl.tmac
@@ -1001,3 +1000,7 @@ along with this program.  If not, see <http://www.g=
nu.org/licenses/>.
 ..
 .
 .\" EOF
+.\" Local Variables:
+.\" mode: nroff
+.\" End:
+.\" vim: filetype=3Dgroff:


