From MAILER-DAEMON Thu Apr 12 14:25:47 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1f6gup-0007kX-6z
	for mharc-groff-commit@gnu.org; Thu, 12 Apr 2018 14:25:47 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:51868)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <deri@chuzzlewit.myzen.co.uk>) id 1f6gun-0007jL-7E
	for groff-commit@gnu.org; Thu, 12 Apr 2018 14:25:46 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <deri@chuzzlewit.myzen.co.uk>) id 1f6gum-0000ng-3z
	for groff-commit@gnu.org; Thu, 12 Apr 2018 14:25:45 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:49089)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <deri@chuzzlewit.myzen.co.uk>) id 1f6gul-0000na-Vs
	for groff-commit@gnu.org; Thu, 12 Apr 2018 14:25:44 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 126928)
	id A8D2B2052F; Thu, 12 Apr 2018 14:25:43 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/01: Make PDFPIC behave the same whether -Tps or -Tpdf used.
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: <20180412182542.6933.89603@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 82630588fc32a5d2e00f257bc79cac7493e7e809
Auto-Submitted: auto-generated
Message-Id: <20180412182543.A8D2B2052F@vcs0.savannah.gnu.org>
Date: Thu, 12 Apr 2018 14:25:43 -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: Thu, 12 Apr 2018 18:25:46 -0000

deri pushed a commit to branch master
in repository groff.

commit 82630588fc32a5d2e00f257bc79cac7493e7e809
Author: Deri James <deri@chuzzlewit.myzen.co.uk>
Date:   Thu Apr 12 19:23:25 2018 +0100

    Make PDFPIC behave the same whether -Tps or -Tpdf used.
   =20
    Previously the -Tpdf version did not cause a break nor position
    to the line beneath the imported picture, whilst the -Tps
    version did.
   =20
    * tmac/pdfpic.tmac: Corrected behavior.
   =20
    * NEWS: Explain the change of behaviour and how to reinstate
    the previous behaviour using register PDFPIC_NOSPACE or the
    environment variable GROFF_PDFPIC_NOSPACE.
---
 ChangeLog        | 14 ++++++++++++++
 NEWS             | 27 +++++++++++++++++++++++++++
 tmac/pdfpic.tmac | 10 ++++++++++
 3 files changed, 51 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 8553fbf..5ea92e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2018-04-12  Deri James  <deri@chuzzlewit.myzen.co.uk>
+
+	Make PDFPIC behave the same whether -Tps or -Tpdf used.
+
+	Previously the -Tpdf version did not cause a break nor position
+	to the line beneath the imported picture, whilst the -Tps
+	version did.
+
+	* tmac/pdfpic.tmac: Corrected behavior.
+
+	* NEWS: Explain the change of behaviour and how to reinstate
+	the previous behaviour using register PDFPIC_NOSPACE or the
+	environment variable GROFF_PDFPIC_NOSPACE.
+
 2018-03-27  Bertrand Garrigues <bertrand.garrigues@laposte.net>
=20
 	Define a short version for data installation dir name.
diff --git a/NEWS b/NEWS
index b6a016b..fea449c 100644
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,33 @@ o The `hy' request has been extended.  Value 16 enable=
s hyphenation before
   character.
=20
=20
+PDFPIC
+------
+
+o PDFPIC has now been corrected, so the behaviour is the same whether yo=
u
+  use the postscript or pdf drivers. However, this means that any docume=
nts
+  which were written using the old behaviour will not be rendered correc=
tly
+  if using the pdf driver with the new version.
+
+  The change would mean that documents which relied on the previous beha=
viour
+  are likely to have a gap underneath the image which was not there befo=
re.
+  If you see this effect there are three ways you can restore the previo=
us
+  0behaviour:-
+
+  Add the line ".nr PDFPIC_NOSPACE 1" to the document before the first c=
all
+  to .PDFPIC.
+
+  If it is just a single document which exhibits this behaviour you can =
run
+  groff adding "- rPDFPIC_NOSPACE=3D1" to the command-line.
+
+  If you have many documents which rely on the previous behaviour you ca=
n
+  set an environment variable "export GROFF_PDFPIC_NOSPACE=3D1" which wi=
ll
+  restore the previous behaviour for all runs.
+
+  Note that this change has no effect it you were using .PDFPIC with the
+  postscript driver, only if you used it with the pdf driver.
+
+
 Miscellaneous
 -------------
=20
diff --git a/tmac/pdfpic.tmac b/tmac/pdfpic.tmac
index 3267ea6..c3859bf 100644
--- a/tmac/pdfpic.tmac
+++ b/tmac/pdfpic.tmac
@@ -132,6 +132,16 @@ sed -e 's/Page *size: *\\([[:digit:].]*\\) *x *\\([[=
:digit:].]*\\).*$/\
 .
 \h'\\n[pdf-offset]u'\
 \X'pdf: pdfpic \\$1 -L \\n[pdf-deswid]z \\n[pdf-desht]z'
+.  if !r PDFPIC_NOSPACE \{\
+.    sy echo ".nr PDFPIC_NOSPACE 0$GROFF_PDFPIC_NOSPACE" > /tmp/x\n[$$]
+.    so /tmp/x\n[$$]
+.    sy rm /tmp/x\n[$$]
+.  \}
+.  if \\n[PDFPIC_NOSPACE]=3D=3D0 \{\
+.    br
+.    sp \\n[pdf-desht]u
+.  \}
+..
 ..
 .
 .cp \n[_C]


From MAILER-DAEMON Wed Apr 18 10:38:36 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1f8oEG-0005TW-Gr
	for mharc-groff-commit@gnu.org; Wed, 18 Apr 2018 10:38:36 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:52265)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <schwarze@usta.de>) id 1f8nNN-0001pn-F3
	for groff-commit@gnu.org; Wed, 18 Apr 2018 09:43:58 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <schwarze@usta.de>) id 1f8nNJ-0005nH-8e
	for groff-commit@gnu.org; Wed, 18 Apr 2018 09:43:57 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:50278)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <schwarze@usta.de>) id 1f8nNJ-0005n4-51
	for groff-commit@gnu.org; Wed, 18 Apr 2018 09:43:53 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 133162)
	id 61323204F1; Wed, 18 Apr 2018 09:43:52 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/01: groff_man(7): ".IP", Use "first" instead of "second"
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: Bjarni Ingi Gislason <bjarniig@rhi.hi.is>
In-Reply-To: groff@gnu.org
References: <20180418134351.16365.84430@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 669cc6e46153a28aa71d6ea59cbdf929000d2604
Auto-Submitted: auto-generated
Message-Id: <20180418134352.61323204F1@vcs0.savannah.gnu.org>
Date: Wed, 18 Apr 2018 09:43:52 -0400 (EDT)
From: schwarze@usta.de (Ingo Schwarze)
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-Mailman-Approved-At: Wed, 18 Apr 2018 10:38:32 -0400
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, 18 Apr 2018 13:43:58 -0000

schwarze pushed a commit to branch master
in repository groff.

commit 669cc6e46153a28aa71d6ea59cbdf929000d2604
Author: Bjarni Ingi Gislason <bjarniig@rhi.hi.is>
Date:   Wed Apr 18 02:44:48 2018 +0000

    groff_man(7): ".IP", Use "first" instead of "second"
   =20
    The correct word is used in the file "groff.info-1" (info groff).
---
 tmac/groff_man.7.man | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tmac/groff_man.7.man b/tmac/groff_man.7.man
index a72e955..b85c6b2 100644
--- a/tmac/groff_man.7.man
+++ b/tmac/groff_man.7.man
@@ -338,7 +338,7 @@ to its default values.
 .IP
 To start an indented paragraph with a particular indentation but
 without a designator, use \[oq]""\[cq] (two doublequotes) as the
-second argument.
+first argument.
 .
 .
 .IP


From MAILER-DAEMON Wed Apr 18 16:23:13 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1f8tbl-00041n-P2
	for mharc-groff-commit@gnu.org; Wed, 18 Apr 2018 16:23:13 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:46133)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <schwarze@usta.de>) id 1f8tbj-00041R-CQ
	for groff-commit@gnu.org; Wed, 18 Apr 2018 16:23:12 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <schwarze@usta.de>) id 1f8tbh-0007Zk-W1
	for groff-commit@gnu.org; Wed, 18 Apr 2018 16:23:11 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:55431)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <schwarze@usta.de>) id 1f8tbh-0007ZU-TB
	for groff-commit@gnu.org; Wed, 18 Apr 2018 16:23:09 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 133162)
	id 7D867204F1; Wed, 18 Apr 2018 16:23:09 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/01: pdfpic.tmac: delete excess ".." line
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Reply-To: Ingo Schwarze <schwarze@openbsd.org>
In-Reply-To: groff@gnu.org
References: <20180418202308.16806.49017@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: bf01a970db9b1505fc6c2ceef2ed9050aa6b40d0
Auto-Submitted: auto-generated
Message-Id: <20180418202309.7D867204F1@vcs0.savannah.gnu.org>
Date: Wed, 18 Apr 2018 16:23:09 -0400 (EDT)
From: schwarze@usta.de (Ingo Schwarze)
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, 18 Apr 2018 20:23:12 -0000

schwarze pushed a commit to branch master
in repository groff.

commit bf01a970db9b1505fc6c2ceef2ed9050aa6b40d0
Author: Ingo Schwarze <schwarze@openbsd.org>
Date:   Wed Apr 18 22:18:48 2018 +0200

    pdfpic.tmac: delete excess ".." line
   =20
    It was inadvertently introduced in the previous commit.
    Reported by Bjarni Ingi Gislason.
---
 tmac/pdfpic.tmac | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tmac/pdfpic.tmac b/tmac/pdfpic.tmac
index c3859bf..0400c1c 100644
--- a/tmac/pdfpic.tmac
+++ b/tmac/pdfpic.tmac
@@ -142,7 +142,6 @@ sed -e 's/Page *size: *\\([[:digit:].]*\\) *x *\\([[:=
digit:].]*\\).*$/\
 .    sp \\n[pdf-desht]u
 .  \}
 ..
-..
 .
 .cp \n[_C]
 .


From MAILER-DAEMON Sat Apr 21 06:40:16 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1f9pwG-0001Gs-Sr
	for mharc-groff-commit@gnu.org; Sat, 21 Apr 2018 06:40:16 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:51500)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1f9pwF-0001GV-0A
	for groff-commit@gnu.org; Sat, 21 Apr 2018 06:40:16 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1f9pwD-0003dd-NM
	for groff-commit@gnu.org; Sat, 21 Apr 2018 06:40:15 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:34452)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1f9pwD-0003cc-Js
	for groff-commit@gnu.org; Sat, 21 Apr 2018 06:40:13 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id AC7AB204F6; Sat, 21 Apr 2018 06:40:12 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/01: lj4_font(5): Fix warning.
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: <20180421104012.21768.46646@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 056ad3edaa51d120939dea2755119ca9d5e26985
Auto-Submitted: auto-generated
Message-Id: <20180421104012.AC7AB204F6@vcs0.savannah.gnu.org>
Date: Sat, 21 Apr 2018 06:40: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: Sat, 21 Apr 2018 10:40:16 -0000

gbranden pushed a commit to branch master
in repository groff.

commit 056ad3edaa51d120939dea2755119ca9d5e26985
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Sat Apr 21 06:35:32 2018 -0400

    lj4_font(5): Fix warning.
   =20
    Fix unquoted escape in eqn input by just not using eqn for this fairl=
y
    trivial markup.  Consequently, remove eqn preprocessor hint to man.
   =20
    Introduced by me in a4f9b86065c02f6b2f385c85526a175ab13ae361,
    2017-11-20.  Thanks to Colin Watson for catching this, and to him and
    Bjarni Ingli Gislason for the feedback.
   =20
    Fixes bug https://savannah.gnu.org/bugs/?53316.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 src/devices/grolj4/lj4_font.5.man | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/devices/grolj4/lj4_font.5.man b/src/devices/grolj4/lj4_f=
ont.5.man
index 6e4cf51..7f8e50a 100644
--- a/src/devices/grolj4/lj4_font.5.man
+++ b/src/devices/grolj4/lj4_font.5.man
@@ -1,4 +1,3 @@
-'\" e
 .TH LJ4_FONT @MAN5EXT@ "@MDATE@" "Groff Version @VERSION@"
 .SH NAME
 lj4_font \- groff fonts for use with devlj4
@@ -118,9 +117,7 @@ or any combination
 (e.g.,
 2400 and 3175)
 for which
-.EQ
-res\~\[mu]\~unitwidth =3D 7\|620\|000.
-.EN
+.IR res \~\[tmu]\~ unitwidth \~=3D\~7\|620\|000.
 .
 Although HP PCL\~5 LaserJet printers support an internal resolution of
 7200 units per inch,


From MAILER-DAEMON Sat Apr 21 07:12:06 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1f9qR4-0003Xs-4c
	for mharc-groff-commit@gnu.org; Sat, 21 Apr 2018 07:12:06 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:41980)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1f9qR1-0003XD-V4
	for groff-commit@gnu.org; Sat, 21 Apr 2018 07:12:04 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1f9qR0-0007RT-KW
	for groff-commit@gnu.org; Sat, 21 Apr 2018 07:12:03 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:34750)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1f9qR0-0007RC-Hm
	for groff-commit@gnu.org; Sat, 21 Apr 2018 07:12:02 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id 4CDCB216BE; Sat, 21 Apr 2018 07:12:02 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/01: configure.ac: Fix typo in comment.
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: <20180421111159.2095.68342@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: c549b637a7002337cfa413b4eda7c3dfca8fc4a7
Auto-Submitted: auto-generated
Message-Id: <20180421111202.4CDCB216BE@vcs0.savannah.gnu.org>
Date: Sat, 21 Apr 2018 07:12:00 -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, 21 Apr 2018 11:12:05 -0000

gbranden pushed a commit to branch master
in repository groff.

commit c549b637a7002337cfa413b4eda7c3dfca8fc4a7
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Sat Apr 21 07:10:20 2018 -0400

    configure.ac: Fix typo in comment.
   =20
    Thanks to Bjarni Ingli Gislason for catching this.  It is, after all,=
 an
    autoconf script, not a bass script.
   =20
    Fixes bug https://savannah.gnu.org/bugs/?53673.
   =20
    Signed-off-by: Bjarni Ingi Gislason <bjarniig@rhi.hi.is>
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 152ac91..ff89f11 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ AC_INIT([GNU Troff],
=20
 AC_PREREQ([2.62])
=20
-# Version consisting of exactly MAJOR.MINOR.PATCH, striped of any
+# Version consisting of exactly MAJOR.MINOR.PATCH, stripped of any
 # digit after PATCH.
 AC_SUBST([SHORT_VERSION],
 	m4_bregexp(AC_PACKAGE_VERSION,[^\(\w+\.\w+\.\w+\).*$],[\1]))


From MAILER-DAEMON Sun Apr 22 02:46:10 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1fA8lG-00085x-5j
	for mharc-groff-commit@gnu.org; Sun, 22 Apr 2018 02:46:10 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:47795)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fA8lD-000854-Nz
	for groff-commit@gnu.org; Sun, 22 Apr 2018 02:46:08 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fA8lC-0001t5-Rg
	for groff-commit@gnu.org; Sun, 22 Apr 2018 02:46:07 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:44887)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fA8lC-0001t0-OB
	for groff-commit@gnu.org; Sun, 22 Apr 2018 02:46:06 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id 9405E20417; Sun, 22 Apr 2018 02:46:06 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 03/04: groff_ms(7): Correct apparent factual error.
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: <20180422064605.29713.46511@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: ce142838ee78eb2b247e841ed73fac0e59c55584
Auto-Submitted: auto-generated
Message-Id: <20180422064606.9405E20417@vcs0.savannah.gnu.org>
Date: Sun, 22 Apr 2018 02:46: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 Apr 2018 06:46:08 -0000

gbranden pushed a commit to branch master
in repository groff.

commit ce142838ee78eb2b247e841ed73fac0e59c55584
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Sun Apr 22 02:16:23 2018 -0400

    groff_ms(7): Correct apparent factual error.
   =20
    It doesn't seem to actually be possible to manipulate the document's
    base font face or style via number registers.
   =20
    Also, "document's type" was used pretty confusing given that the term
    "document type" was used to mean something completely different in th=
e
    immediately preceding paragraph.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 tmac/groff_ms.7.man | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tmac/groff_ms.7.man b/tmac/groff_ms.7.man
index 0b0b58a..5f54924 100644
--- a/tmac/groff_ms.7.man
+++ b/tmac/groff_ms.7.man
@@ -105,8 +105,9 @@ are specific to AT&T or Berkeley, and are not support=
ed in
 .TP
 .B "Format and layout"
 By setting number registers,
-you can change your document's type (font and size),
-margins, spacing, headers and footers, and footnotes.
+you can change your document's
+margins, spacing, headers and footers, footnotes,
+and the base point size for the text.
 .
 See
 .I "Document control registers"


From MAILER-DAEMON Sun Apr 22 02:46:10 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1fA8lG-00086M-J6
	for mharc-groff-commit@gnu.org; Sun, 22 Apr 2018 02:46:10 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:47796)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fA8lD-000855-OK
	for groff-commit@gnu.org; Sun, 22 Apr 2018 02:46:08 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fA8lC-0001sp-J1
	for groff-commit@gnu.org; Sun, 22 Apr 2018 02:46:07 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:44884)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fA8lC-0001sX-Fb
	for groff-commit@gnu.org; Sun, 22 Apr 2018 02:46:06 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id 3FBAB20417; Sun, 22 Apr 2018 02:46:06 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/04: groff_{man, me, ms, trace,
	www}(7): Parallelize synopses.
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: <20180422064605.29713.46511@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: db5cf9dfe2e6ee4cc0c1b916abe856a7ccc7d5d4
Auto-Submitted: auto-generated
Message-Id: <20180422064606.3FBAB20417@vcs0.savannah.gnu.org>
Date: Sun, 22 Apr 2018 02:46:05 -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 Apr 2018 06:46:09 -0000

gbranden pushed a commit to branch master
in repository groff.

commit db5cf9dfe2e6ee4cc0c1b916abe856a7ccc7d5d4
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Sun Apr 22 00:05:13 2018 -0400

    groff_{man,me,ms,trace,www}(7): Parallelize synopses.
   =20
    Make synopsis markup consistent between these pages.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 tmac/groff_man.7.man   | 23 ++++++++++++-----------
 tmac/groff_me.7.man    |  9 +++++----
 tmac/groff_ms.7.man    | 29 ++++++++++++-----------------
 tmac/groff_trace.7.man | 11 ++++-------
 tmac/groff_www.7.man   |  8 +++++---
 5 files changed, 38 insertions(+), 42 deletions(-)

diff --git a/tmac/groff_man.7.man b/tmac/groff_man.7.man
index b85c6b2..f786898 100644
--- a/tmac/groff_man.7.man
+++ b/tmac/groff_man.7.man
@@ -34,17 +34,18 @@ groff_man \- GNU roff macro package for formatting ma=
n pages
 .SH SYNOPSIS
 .\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 .
-.SY "groff\ \-man"
-.RI [ options
-.IR .\|.\|.\& ]
-.RI [ files
-.IR .\|.\|.\& ]
-.
-.SY "groff\ \-m\ man"
-.RI [ options
-.IR .\|.\|.\& ]
-.RI [ files
-.IR .\|.\|.\& ]
+.SY "groff \-man"
+.RI [ option
+\&.\|.\|.\&]
+.RI [ input-file
+\&.\|.\|.\&]
+.YS
+.
+.SY "groff \-m man"
+.RI [ option
+\&.\|.\|.\&]
+.RI [ input-file
+\&.\|.\|.\&]
 .YS
 .
 .
diff --git a/tmac/groff_me.7.man b/tmac/groff_me.7.man
index 4e327f5..f971a68 100644
--- a/tmac/groff_me.7.man
+++ b/tmac/groff_me.7.man
@@ -32,18 +32,19 @@ groff_me \- \(lqme\(rq macro package for formatting d=
ocuments with GNU roff
 .SH SYNOPSIS
 .\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 .
-.B "groff \-me"
+.SY "groff \-me"
 .RI [ option
 \&.\|.\|.\&]
 .RI [ input-file
 \&.\|.\|.\&]
-.
-.br
-.B "groff \-m\ me"
+.YS
+.SY "groff \-m me"
 .RI [ option
 \&.\|.\|.\&]
 .RI [ input-file
 \&.\|.\|.\&]
+.YS
+.
 .
 .\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 .SH DESCRIPTION
diff --git a/tmac/groff_ms.7.man b/tmac/groff_ms.7.man
index 106826d..0b0b58a 100644
--- a/tmac/groff_ms.7.man
+++ b/tmac/groff_ms.7.man
@@ -33,23 +33,18 @@ groff_ms \- GNU roff manuscript macro package for for=
matting documents
 .SH SYNOPSIS
 .\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 .
-.B groff
-.B \-ms
-[
-.IR options .\|.\|.\&
-]
-[
-.IR files .\|.\|.\&
-]
-.br
-.B groff
-.B \-m\ ms
-[
-.IR options .\|.\|.\&
-]
-[
-.IR files .\|.\|.\&
-]
+.SY "groff -ms"
+.RI [ option
+\&.\|.\|.\&]
+.RI [ input-file
+\&.\|.\|.\&]
+.YS
+.
+.SY "groff -m ms"
+.RI [ option
+\&.\|.\|.\&]
+.RI [ input-file
+\&.\|.\|.\&]
 .
 .
 .\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
diff --git a/tmac/groff_trace.7.man b/tmac/groff_trace.7.man
index 9425712..b992a46 100644
--- a/tmac/groff_trace.7.man
+++ b/tmac/groff_trace.7.man
@@ -29,18 +29,15 @@ groff_trace \- groff macro package trace.tmac
 .\" called FDL in the main directory of the groff source package.
 .
 .
-.ds Ellipsis .\|.\|.\&\"
-.
-.
 .\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 .SH SYNOPSIS
 .\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 .
 .SY "groff \-m trace"
-.RI [ options
-.IR \*[Ellipsis] ]
-.RI [ files
-.IR \*[Ellipsis] ]
+.RI [ option
+\&.\|.\|.\&]
+.RI [ input-file
+\&.\|.\|.\&]
 .YS
 .
 .
diff --git a/tmac/groff_www.7.man b/tmac/groff_www.7.man
index ba729c3..6a82620 100644
--- a/tmac/groff_www.7.man
+++ b/tmac/groff_www.7.man
@@ -45,9 +45,11 @@ groff_www \- groff macros for authoring web pages
 .SH SYNOPSIS
 .\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 .
-.B "groff \-mwww"
-[ options ]
-file ...
+.SY "groff \-m www"
+.RI [ option
+\&.\|.\|.\&]
+.RI [ input-file
+\&.\|.\|.\&]
 .
 .
 .\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D


From MAILER-DAEMON Sun Apr 22 02:46:10 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1fA8lG-00086c-N2
	for mharc-groff-commit@gnu.org; Sun, 22 Apr 2018 02:46:10 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:47800)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fA8lD-000857-W4
	for groff-commit@gnu.org; Sun, 22 Apr 2018 02:46:09 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fA8lC-0001sv-MP
	for groff-commit@gnu.org; Sun, 22 Apr 2018 02:46:08 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:44885)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fA8lC-0001sm-IS
	for groff-commit@gnu.org; Sun, 22 Apr 2018 02:46:06 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id 68EE820422; Sun, 22 Apr 2018 02:46:06 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 02/04: groff_man(7): Expand command synopsis 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: <20180422064605.29713.46511@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 5599c6decdc82d146b216b7111adfd55fa958294
Auto-Submitted: auto-generated
Message-Id: <20180422064606.68EE820422@vcs0.savannah.gnu.org>
Date: Sun, 22 Apr 2018 02:46: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 Apr 2018 06:46:09 -0000

gbranden pushed a commit to branch master
in repository groff.

commit 5599c6decdc82d146b216b7111adfd55fa958294
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Sun Apr 22 01:51:43 2018 -0400

    groff_man(7): Expand command synopsis section.
   =20
    This section now explains in detail how to write (and read) a
    command synopsis.
   =20
    Also fix some style/markup issues:
    * Mark the second argument to the .OP macro as optional.
    * Escape the hyphens in the command synopsis input example.
    * Guard ellipsis boundaries with zero-width spaces.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 ChangeLog            |   7 +++
 tmac/groff_man.7.man | 131 ++++++++++++++++++++++++++++++++++++++-------=
------
 2 files changed, 104 insertions(+), 34 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5ea92e1..3b7cbed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2018-04-22  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+	groff_man(7): Expand command synopsis section.
+
+	This section now explains in detail how to write (and read) a
+	command synopsis.
+
 2018-04-12  Deri James  <deri@chuzzlewit.myzen.co.uk>
=20
 	Make PDFPIC behave the same whether -Tps or -Tpdf used.
diff --git a/tmac/groff_man.7.man b/tmac/groff_man.7.man
index f786898..e9e64a9 100644
--- a/tmac/groff_man.7.man
+++ b/tmac/groff_man.7.man
@@ -843,18 +843,22 @@ installation.
 .PP
 These macros are a convenience for authors.
 .
+Together, they produce the traditional look of a Unix command synopsis.
+.
 They also assist automated translation tools and help browsers in
 recognizing command synopses and treating them differently from
 running text.
 .
 .
 .TP
-.BI .OP " key value"
-Describe an optional command argument.
+.BI .OP " option-name"\c
+.RI " [" option-argument ]
+Indicate an optional command parameter called
+.IR option-name .
 .
-The arguments of this macro are set surrounded by option braces
-in the default Roman font; the first argument is printed with
-a bold face, while the second argument is typeset as italic.
+If the option takes an argument, specify
+.I option-argument
+using a noun, abbreviation, or hyphenated noun phrase.
 .
 .
 .TP
@@ -865,50 +869,49 @@ Takes a single argument, the name of a command.
 .
 Text following, until closed by
 .BR .YS ,
-is set with a hanging indentation with the width of
+is set with a hanging indentation of the width of
 .I command
 plus a space.
 .
-This produces the traditional look of a Unix command synopsis.
-.
 .
 .TP
 .B .YS
-This macro restores normal indentation at the end of a command
-synopsis.
+End synopsis.
+.
+Restore normal indentation.
 .
 .
 .PP
-Here is a real example:
+For example,
 .
 .
 .IP
 .EX
 \&.SY groff
-\&.OP \e-abcegiklpstzCEGNRSUVXZ
-\&.OP \e-d cs
-\&.OP \e-f fam
-\&.OP \e-F dir
-\&.OP \e-I dir
-\&.OP \e-K arg
-\&.OP \e-L arg
-\&.OP \e-m name
-\&.OP \e-M dir
-\&.OP \e-n num
-\&.OP \e-o list
-\&.OP \e-P arg
-\&.OP \e-r cn
-\&.OP \e-T dev
-\&.OP \e-w name
-\&.OP \e-W name
+\&.OP \e\-abcegiklpstzCEGNRSUVXZ
+\&.OP \e\-d cs
+\&.OP \e\-f fam
+\&.OP \e\-F dir
+\&.OP \e\-I dir
+\&.OP \e\-K arg
+\&.OP \e\-L arg
+\&.OP \e\-m name
+\&.OP \e\-M dir
+\&.OP \e\-n num
+\&.OP \e\-o list
+\&.OP \e\-P arg
+\&.OP \e\-r cn
+\&.OP \e\-T dev
+\&.OP \e\-w name
+\&.OP \e\-W name
 \&.RI [ file
-\&.IR .\e|.\e|. ]
+\e&.\e|.\e|.\e&]
 \&.YS
 .EE
 .
 .
 .PP
-produces the following output:
+produces the following output.
 .
 .
 .RS
@@ -931,18 +934,78 @@ produces the following output:
 .OP \-w name
 .OP \-W name
 .RI [ file
-.IR .\|.\|. ]
+\&.\|.\|.\&]
 .YS
 .RE
 .
 .
 .PP
-If necessary, you might use
+Multiple
+.B .SY/.YS
+blocks can be specified,
+for instance to distinguish differing modes of operation of a complex
+command like
+.BR tar (1);
+each will be separated by a paragraph space.
+.
+If necessary, you can use a
 .B br
-requests to control line breaking.
+request to insert a mandatory line break.
+.
+.
+.PP
+Several features of the above example are of note.
+.
+.
+.IP \(bu
+The command and option names are presented in
+.B boldface
+to cue the user that they should be input literally.
+.
+.
+.IP \(bu
+Option dashes are specified with the \(lq\e\-\(rq escape sequence;
+this is an important practice to make them clearly visible and to
+facilitate cut-and-paste from the rendered man page to a shell prompt or
+text file.
+.
 .
-You can insert plain text as well; this looks like the traditional
-(unornamented) syntax for a required command argument or filename.
+.IP \(bu
+Option arguments and command operands are presented in
+.I italics
+(underlined on some output devices, such as terminals and emulators),
+to cue the user that they must be replaced with appropriate text.
+.
+.
+.IP \(bu
+Symbols that are neither to be typed literally nor simply replaced
+appear in plain (roman) style;
+brackets surround optional arguments,
+and an ellipsis indicates that the previous syntactical element may be
+repeated arbitrarily.
+.
+.
+.IP
+Some man pages use a brace-and-pipe notation such as
+.RB \(lq{ \-\-diff | \-\-compare }\(rq
+to indicate that one and only one of the \(lq|\(rq-separated items
+within the braces must be input.
+.
+If this braced construct were furthermore surrounded by brackets,
+then the meaning is that at most one of the items would be accepted.
+.
+.
+.IP
+Authors of man pages should note the use of the zero-width space
+escape sequence \(lq\e&\(rq on both sides of the ellipsis;
+this is a good practice to avoid surprises in the event the ellipsis
+gets reflowed in your text editor.
+.
+See \(lqPORTABILITY AND TROFF REQUESTS\(rq, below.
+.
+The morbidly curious may consult
+.BR groff (7)
+regarding the narrow-space escape sequence \(lq\e|\(rq.
 .
 .
 .\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D


From MAILER-DAEMON Sun Apr 22 02:46:12 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1fA8lI-00088m-Qh
	for mharc-groff-commit@gnu.org; Sun, 22 Apr 2018 02:46:12 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:47821)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fA8lF-00085c-DG
	for groff-commit@gnu.org; Sun, 22 Apr 2018 02:46:11 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fA8lD-0001tK-25
	for groff-commit@gnu.org; Sun, 22 Apr 2018 02:46:09 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:44889)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fA8lC-0001tE-U8
	for groff-commit@gnu.org; Sun, 22 Apr 2018 02:46:06 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id BF88720417; Sun, 22 Apr 2018 02:46:06 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 04/04: groff_ms(7): Make style fixes.
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: <20180422064605.29713.46511@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: dbfa0b757b920eb6c44a2fd319180f525b138a28
Auto-Submitted: auto-generated
Message-Id: <20180422064606.BF88720417@vcs0.savannah.gnu.org>
Date: Sun, 22 Apr 2018 02:46: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 Apr 2018 06:46:11 -0000

gbranden pushed a commit to branch master
in repository groff.

commit dbfa0b757b920eb6c44a2fd319180f525b138a28
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Sun Apr 22 02:38:52 2018 -0400

    groff_ms(7): Make style fixes.
   =20
    * Escape hyphens used as minus signs or embedded in macro parameters
      (see SN-STYLE, SN-DOT, and SN-NO-DOT).
    * Render option brackets in roman, not bold, in macro descriptions.
    * Use paired directional double quotes to clarify use-versus-mention
      scenarios.
    * Remove spurious \- from the name of the ms macros (they're not the
      "-ms" macros).
    * Fix subject/verb agreement.  Two things do not "denotes" something.
    * Stop captializing a sentence following a colon.
    * Use the Oxford comma.
    * Remove unnecessary commas from dependent clauses.
    * Make minor tweaks to phrasing.
    * Wrap one long line.
   =20
    Based on changes suggested by Bjarni Ingli Gislason.
   =20
    Fixes bug https://savannah.gnu.org/bugs/index.php?53547.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 tmac/groff_ms.7.man | 162 ++++++++++++++++++++++++++++++----------------=
------
 1 file changed, 95 insertions(+), 67 deletions(-)

diff --git a/tmac/groff_ms.7.man b/tmac/groff_ms.7.man
index 5f54924..b6dc65d 100644
--- a/tmac/groff_ms.7.man
+++ b/tmac/groff_ms.7.man
@@ -240,7 +240,7 @@ _
 FL	Footnote length	next footnote	\[rs]n[LL]*5/6
 FI	Footnote indent	next footnote	2n
 FF	Footnote format	next footnote	0
-FPS	Point size	next footnote	\[rs]n[PS]-2
+FPS	Point size	next footnote	\[rs]n[PS]\-2
 FVS	Vert.\& spacing	next footnote	\[rs]n[FPS]+2
 FPD	Para.\& spacing	next footnote	\[rs]n[PD]/2
 _
@@ -272,7 +272,7 @@ Use the following macros to create a cover page for y=
our document
 in the order shown.
 .
 .TP
-.B .RP [no]
+.BR ".RP " [ no ]
 Specifies the report format for your document.
 .
 The report format creates a separate cover page.
@@ -301,7 +301,8 @@ on page\~1 of the document.
 The default is to suppress the header.
 .
 .TP
-.BI ".DA [" xxx ]
+.B .DA\c
+.RI " [" xxx ]
 (optional) Print the current date,
 or the arguments to the macro if any,
 on the title page (if specified)
@@ -311,7 +312,8 @@ This is the default for
 .IR nroff .
 .
 .TP
-.BI ".ND [" xxx ]
+.B .ND\c
+.RI " [" xxx ]
 (optional) Print the current date,
 or the arguments to the macro if any,
 on the title page (if specified)
@@ -344,7 +346,7 @@ Specifies the author's institution.
 You can specify multiple institutions.
 .
 .TP
-.B .AB [no]
+.BR ".AB " [ no ]
 Begins the abstract.
 .
 The default is to print the word
@@ -379,10 +381,11 @@ macro indents all text at both left and right margi=
ns
 by the amount of the register
 .BR QI .
 .
-The effect is identical to the HTML
+The effect is reminiscent of the HTML
 .B <BLOCKQUOTE>
+tag.
 .
-The next paragraph or heading returns margins to normal.
+The next paragraph or heading returns the margins to normal.
 .
 .B QP
 inserts the vertical space specified in register
@@ -406,7 +409,7 @@ and
 .B QE
 insert the inter-paragraph spacing specified in
 .B PD
-and the text is indented on both sides by the amount of
+and the text is indented on both sides by the amount of register
 .BR QI .
 .
 The text between
@@ -422,7 +425,8 @@ or
 .PP
 The
 .B XP
-macro produces an exdented paragraph.
+macro produces an \(lqexdented\(rq paragraph; that is, one with a
+hanging indent.
 .
 The first line of the paragraph begins at
 the left margin,
@@ -488,8 +492,8 @@ macros print headings in
 using the same font family and point size as the body text.
 .
 For output devices which support scalable fonts,
-this behaviour may be modified,
-by defining the document control registers,
+this behaviour may be modified by defining the document control
+registers
 .B GROWPS
 and
 .BR PSINCR .
@@ -580,44 +584,44 @@ is interpreted in
 basic units;
 the
 .I p
-scaling factor should be employed,
-when assigning a value specified in points.
+scaling factor should be employed when assigning a value specified in
+points.
 .
 .IP
 The style used to represent the section number,
 within a numbered heading,
 is controlled by the
-.B SN-STYLE
+.B SN\-STYLE
 string;
 this may be set to either the
-.B SN-DOT
+.B SN\-DOT
 or the
-.B SN-NO-DOT
+.B SN\-NO\-DOT
 style,
 (described below),
 by aliasing
-.B SN-STYLE
+.B SN\-STYLE
 accordingly.
 .
 By default,
-.B SN-STYLE
+.B SN\-STYLE
 is initialised by defining the alias
 .RS
 .nf
 .IP
-\&.als SN-STYLE SN-DOT
+\&.als SN\-STYLE SN\-DOT
 .fi
 .RE
 .IP
 it may be changed to the
-.B SN-NO-DOT
+.B SN\-NO\-DOT
 style,
 if preferred,
 by defining the alternative alias
 .RS
 .nf
 .IP
-\&.als SN-STYLE SN-NO-DOT
+\&.als SN\-STYLE SN\-NO\-DOT
 .fi
 .RE
 .IP
@@ -630,28 +634,28 @@ the new alias is defined.
 After invoking
 .BR .NH ,
 the assigned heading number is available in the strings
-.B SN-DOT
+.B SN\-DOT
 (as it appears in the default formatting style for numbered headings,
 with a terminating period following the number),
 and
-.B SN-NO-DOT
+.B SN\-NO\-DOT
 (with this terminating period omitted).
 .
 The string
 .B SN
 is also defined,
 as an alias for
-.BR SN-DOT ;
+.BR SN\-DOT ;
 if preferred,
 the user may redefine it as an alias for
-.BR SN-NO-DOT ,
+.BR SN\-NO\-DOT ,
 'ne 10
 by including the initialisation:
 .
 .RS
 .nf
 .IP
-\&.als SN SN-NO-DOT
+\&.als SN SN\-NO\-DOT
 .fi
 .RE
 .
@@ -663,8 +667,10 @@ the change becomes effective with the next use of
 the new alias is defined.
 .
 .TP
-.BI .SH\ [ xx ]
+.B .SH\c
+.RI " [" xx ]
 Unnumbered subheading.
+.
 The use of the optional
 .I xx
 argument is a GNU extension,
@@ -713,7 +719,8 @@ macros provide a variety of methods to highlight
 or emphasize text:
 .
 .TP
-.B ".B [\fItxt\fP [\fIpost\fP [\fIpre\fP]]]"
+.B .B\c
+.RI " [" txt " [" post " [" pre ]]]
 Sets its first argument in
 .BR "bold type" .
 .
@@ -739,7 +746,7 @@ For example,
 .
 .IP
 prints
-.RB ( foo ).
+.RB \(lq( foo )\(rq.
 .
 .IP
 If you give this macro no arguments,
@@ -748,7 +755,8 @@ prints all text following in bold until
 the next highlighting, paragraph, or heading macro.
 .
 .TP
-.B ".R [\fItxt\fP [\fIpost\fP [\fIpre\fP]]]"
+.B .R\c
+.RI " [" txt " [" post " [" pre ]]]
 Sets its first argument in
 roman (or regular) type.
 .
@@ -757,7 +765,8 @@ It operates similarly to the
 macro otherwise.
 .
 .TP
-.B ".I [\fItxt\fP [\fIpost\fP [\fIpre\fP]]]"
+.B .I\c
+.RI " [" txt " [" post " [" pre ]]]
 Sets its first argument in
 .IR "italic type" .
 It operates similarly to the
@@ -765,15 +774,17 @@ It operates similarly to the
 macro otherwise.
 .
 .TP
-.B ".CW [\fItxt\fP [\fIpost\fP [\fIpre\fP]]]"
-Sets its first argument in a constant width face.
+.B .CW\c
+.RI " [" txt " [" post " [" pre ]]]
+Sets its first argument in a constant-width face.
 .
 It operates similarly to the
 .B B
 macro otherwise.
 .
 .TP
-.B ".BI [\fItxt\fP [\fIpost\fP [\fIpre\fP]]]"
+.B .BI\c
+.RI " [" txt " [" post " [" pre ]]]
 Sets its first argument in bold italic type.
 .
 It operates similarly to the
@@ -781,14 +792,16 @@ It operates similarly to the
 macro otherwise.
 .
 .TP
-.BI ".BX [" txt ]
+.B .BX\c
+.RI " [" txt ]
 Prints its argument and draws a box around it.
 .
 If you want to box a string that contains spaces,
 use a digit-width space (\[rs]0).
 .
 .TP
-.BI ".UL [" txt " [" post ]]
+.B .UL\c
+.RI " [" txt " [" post ]]
 Prints its first argument with an underline.
 .
 If you specify a second argument,
@@ -870,9 +883,8 @@ macro handles duties for all lists.
 Its syntax is as follows:
 .
 .TP
-.BI ".IP [" marker " [" width ]]
-.
-.IP
+.B .IP\c
+.RI " [" marker " [" width ]]
 The
 .I marker
 is usually a bullet character
@@ -938,7 +950,7 @@ Display macro	Type of display
 With keep	No keep
 _
 \&.DS L	\&.LD	Left-justified.
-\&.DS I [\fIindent\fP]	\&.ID	T{
+\&.DS I [\,\fIindent\/\fP]	\&.ID	T{
 Indented (default indent in the \fBDI\fP register).
 T}
 \&.DS B	\&.BD	T{
@@ -1039,7 +1051,7 @@ Text in the box is automatically placed in a divers=
ion
 .\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 .
 The
-.I \-ms
+.I ms
 macros support the standard
 .I groff
 preprocessors:
@@ -1053,8 +1065,8 @@ Mark text meant for preprocessors by enclosing it
 in pairs of tags as follows:
 .
 .TP
-.BR ".TS [H]" " and " .TE
-Denotes a table, to be processed by the
+.BR .TS " [" H "] and " .TE
+Denote a table to be processed by the
 .I tbl
 preprocessor.
 .
@@ -1075,7 +1087,7 @@ prints the header on the next page as well.
 .
 .TP
 .BR .PS " and " .PE
-Denotes a graphic, to be processed by the
+Denote a graphic to be processed by the
 .I pic
 preprocessor.
 .
@@ -1089,8 +1101,10 @@ or by using a graphics program such as
 .IR xfig .
 .
 .TP
-.BR ".EQ [\fI\,align\/\fP]" " and " .EN
-Denotes an equation, to be processed by the
+.B .EQ\c
+.RI " [" align "] and "\c
+.B .EN
+Denote an equation to be processed by the
 .I eqn
 preprocessor.
 .
@@ -1102,11 +1116,11 @@ argument can be
 or\~\c
 .B I
 to center (the default), left-justify, or indent
-the equation.
+the equation, respectively.
 .
 .TP
 .BR .[ " and " .]
-Denotes a reference, to be processed by the
+Denote a reference to be processed by the
 .I refer
 preprocessor.
 .
@@ -1159,11 +1173,12 @@ register as follows:
 .
 .TP
 0
-Prints the footnote number as a superscript; indents the footnote (defau=
lt).
+Prints the footnote number as a superscript; indents the footnote
+(default).
 .
 .TP
 1
-Prints the number followed by a period (like\~1.\&)
+Prints the number followed by a period (that is,\~\(lq1.\(rq\&)
 and indents the footnote.
 .
 .TP
@@ -1172,10 +1187,11 @@ Like\~1, without an indent.
 .
 .TP
 3
-Like\~1, but prints the footnote number as a hanging paragraph.
+Like\~1, but prints the footnote number as a paragraph with a hanging
+indent.
 .
-.LP
 .RE
+.LP
 You can use footnotes safely within keeps and displays,
 but avoid using numbered footnotes within floating keeps.
 .
@@ -1209,22 +1225,24 @@ Use the strings
 .BR CH ,
 and
 .B RH
-to set the left, center, and right headers; use
+to set the left, center, and right headers.
+Use
 .BR LF ,
 .BR CF ,
 and
 .B RF
 to set the left, center, and right footers.
 .
-This works best for documents that do not distinguish
-between odd and even pages.
+The string-setting approach works best for documents that do not
+distinguish between odd and even pages.
 .
 .IP \(bu
 Use the
 .B OH
 and
 .B EH
-macros to define headers for the odd and even pages; and
+macros to define headers for the odd and even pages,
+and
 .B OF
 and
 .B EF
@@ -1236,16 +1254,25 @@ The syntax for these macros is as follows:
 .RS
 .
 .IP
-.B ".OH '\fIleft\/\fP'\,\fIcenter\/\fP'\,\fIright\/\fP'"
+.BI . XX " \[aq]" left \[aq] center \[aq] right \[aq]
 .RE
 .
 .IP
+where
+.I XX
+is one of the foregoing four macros and each of
+.IR left ,
+.IR center ,
+and
+.I right
+is text of your choice.
+.
 You can replace the quote (\[aq]) marks with any character not
 appearing in the header or footer text.
 .
 .
-.PP
-You can also redefine the
+.IP \(bu
+You can redefine the
 .B PT
 and
 .B BT
@@ -1255,7 +1282,7 @@ the header and footer, respectively.
 The header process also calls the (undefined)
 .B HD
 macro after
-.B PT ;
+.BR PT ;
 you can define this macro if you need additional processing
 after printing the header
 (for example, to draw a line below the header).
@@ -1320,7 +1347,8 @@ Single-column mode.
 Two-column mode.
 .
 .TP
-.BI ".MC [" width " [" gutter ]]
+.B .MC\c
+.RI " [" column-width " [" gutter-width ]]
 Multi-column mode.
 .
 If you specify no arguments, it is equivalent to the
@@ -1328,9 +1356,9 @@ If you specify no arguments, it is equivalent to th=
e
 macro.
 .
 Otherwise,
-.I width
+.I column-width
 is the width of each column and
-.I gutter
+.I gutter-width
 is the space between columns.
 .
 The
@@ -1586,7 +1614,7 @@ macro is evaluated.
 This implies that
 .B PO
 should not be used early in the document, unless it is changed also:
-Remember that accessing an undefined register automatically defines it.
+remember that accessing an undefined register automatically defines it.
 .br
 .ne 23
 .
@@ -1625,8 +1653,8 @@ _
 .
 .PP
 The
-.B \[rs]*-
-string produces an em dash \[em] like this.
+.B \[rs]*\-
+string produces an em dash\[em]like this.
 .
 .
 .PP
@@ -1701,7 +1729,7 @@ produces an n with a tilde over it.
 .SH "NAMING CONVENTIONS"
 .\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 .
-The following conventions are used for names of macros, strings and
+The following conventions are used for names of macros, strings, and
 number registers.
 .
 External names available to documents that use the


From MAILER-DAEMON Mon Apr 23 05:34:40 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1fAXrs-000687-Ad
	for mharc-groff-commit@gnu.org; Mon, 23 Apr 2018 05:34:40 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:40494)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fAXrn-00066D-DC
	for groff-commit@gnu.org; Mon, 23 Apr 2018 05:34:39 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fAXrm-0002YN-KI
	for groff-commit@gnu.org; Mon, 23 Apr 2018 05:34:35 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:35470)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fAXrm-0002YD-HU
	for groff-commit@gnu.org; Mon, 23 Apr 2018 05:34:34 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id 3BA232098A; Mon, 23 Apr 2018 05:34:34 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 02/04: pic2graph: Remove unused variable.
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: <20180423093433.26082.22717@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: b472be1d77204c0ab420ef95e3e5e3772562e328
Auto-Submitted: auto-generated
Message-Id: <20180423093434.3BA232098A@vcs0.savannah.gnu.org>
Date: Mon, 23 Apr 2018 05:34:34 -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 Apr 2018 09:34:39 -0000

gbranden pushed a commit to branch master
in repository groff.

commit b472be1d77204c0ab420ef95e3e5e3772562e328
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Mon Apr 23 03:16:38 2018 -0400

    pic2graph: Remove unused variable.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 contrib/pic2graph/pic2graph.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/contrib/pic2graph/pic2graph.sh b/contrib/pic2graph/pic2graph=
.sh
index 72c5477..fd3c4c9 100644
--- a/contrib/pic2graph/pic2graph.sh
+++ b/contrib/pic2graph/pic2graph.sh
@@ -33,7 +33,6 @@
 # intended as a pic translator; we can live with eqn defaults.=20
 #
 groffpic_opts=3D""
-gs_opts=3D""
 convert_opts=3D""
 format=3D"png"
 eqndelim=3D'$$'


From MAILER-DAEMON Mon Apr 23 05:34:40 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1fAXrs-00068M-EZ
	for mharc-groff-commit@gnu.org; Mon, 23 Apr 2018 05:34:40 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:40519)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fAXro-00066h-Oh
	for groff-commit@gnu.org; Mon, 23 Apr 2018 05:34:39 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fAXrm-0002Yg-Qn
	for groff-commit@gnu.org; Mon, 23 Apr 2018 05:34:36 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:35475)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fAXrm-0002Yc-Nj
	for groff-commit@gnu.org; Mon, 23 Apr 2018 05:34:34 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id 9BBE6204DB; Mon, 23 Apr 2018 05:34:34 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 04/04: pic2graph(1): Make editorial/style changes.
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: <20180423093433.26082.22717@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: fc7903ad23654589472b890b3bf23fef6a377591
Auto-Submitted: auto-generated
Message-Id: <20180423093434.9BBE6204DB@vcs0.savannah.gnu.org>
Date: Mon, 23 Apr 2018 05:34:34 -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 Apr 2018 09:34:39 -0000

gbranden pushed a commit to branch master
in repository groff.

commit fc7903ad23654589472b890b3bf23fef6a377591
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Mon Apr 23 04:48:55 2018 -0400

    pic2graph(1): Make editorial/style changes.
   =20
    Synopsis:
    * Use groff_man(7)'s synopsis macros for the synopsis.
    * Document the presence of --help and --version flags.
    * Make option argument descriptions more descriptive.
   =20
    Description:
    * Don't start the discussion with sentence fragments.
    * Make clear that this tool reads standard input and writes to standa=
rd
      output.
    * Present PNG abbreviation on the first occurrence of its expansion.
    * Render work titles (like the names of software programs) in italics=
,
      except on the first mention of a program which has a supporting man
      page.  The manual section does not need to be stated every time the
      program is mentioned.
    * Remove material singing the praises of the PIC language from this
      man page.  Maybe we can move some of it into pic(1)?
    * The groff convention regarding name of the language appears to be P=
IC
      (full capitalization).  "pic" is the name of a Unix tool implementi=
ng
      the language.  If you want consistency from an authoritative source=
, I
      advise you _not_ to look at CSTR #116--Kernighan is all over the ma=
p,
      using "PIC" in the article title, and "pic" itself (susceptible to
      beginning-of-sentence-capitaliztion) interchangeably to refer to th=
e
      tool and the language specification.  But when you put it in a box,
      it's in full caps again.  :-|
    * Set references to *roff macros in bold.
    * FIXME comment some stuff about old versions of convert using white
      backgrounds by default instead of transparent ones.  This language
      hasn't been touched since 2008 and was probably old even then.
    * Also drop language about passing an argument to convert to force th=
e
      background transparent, since that's the default these days anyway.
    * Note availability of "convert" program from GraphicsMagick as well,
      which has been around a mere 16 years (and is still making releases=
).
    * Clarify what tool is doing the work of cropping the image.
    * Drop paragraph calling out which tools are invoked, and advising th=
e
      user that the programs have to be installed and in the $PATH to wor=
k.
      The cross-references do the work of the former and the latter is Un=
ix
      101 knowledge that does not need to be recapitulated here.
    * Drop references to gs; whether GhostScript is called is up to groff=
.
      pic2graph does not call it directly.
   =20
    Options:
    * Set the term "unsafe" (regarding groff's -U flag) in italics, not
      scare quotes.  The term deserves emphasis and is warranted without
      irony.  Running a PIC file with "sh {>$HOME/PWN3D}" (or worse) in i=
t
      through this tool with the -unsafe option set could be upsetting.
    * Tighten description of -format.
    * Expand description of -eqn since a "delimeter" in the Unix world is
      usually an unpaired single character.  eqn and m4 are exceptions.
    * Document --help and --version flags.
   =20
    Files:
    * Delete section.  This script does not read the eqnrc file, and it's=
 up
      to eqn to do so itself.
   =20
    Environment:
    * Tighten by using groff_man(7)'s .TQ macro to list the variable name=
s
      attempted for a temp directory.
    * Set filespec literals in italics, not bold.  (This is supposed to b=
e
      the convention, but you'll find a lot of man pages not honoring it,
      including some in our own project.)
    * Speaking of conventions, italics are supposed to be used for
      environment variables, too, as I recall, but there's even more chao=
s
      on that front than there is with filespecs.  So I left these alone.
   =20
    See also:
    * A simple list of man page cross-references is not a sentence; lose =
the
      period.
    * Add citation of W. Richard Stevens's "Turning PIC into HTML" articl=
e,
      as it seems to be the source of the recipe Raymond mentions.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 contrib/pic2graph/pic2graph.1.man | 221 +++++++++++++++++++-------------=
------
 1 file changed, 108 insertions(+), 113 deletions(-)

diff --git a/contrib/pic2graph/pic2graph.1.man b/contrib/pic2graph/pic2gr=
aph.1.man
index b9ea5c3..df3cac1 100644
--- a/contrib/pic2graph/pic2graph.1.man
+++ b/contrib/pic2graph/pic2graph.1.man
@@ -14,89 +14,75 @@ pic2graph \- convert a PIC diagram into a cropped ima=
ge
 .SH SYNOPSIS
 .\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 .
-.B pic2graph
-[
-.B \-unsafe
-]
-[
-.BI "\-format " fmt
-]
-[
-.BI "\-eqn " delim
-]
+.SY pic2graph
+.OP \-unsafe
+.OP \-format output-format
+.OP \-eqn delimeters
+.RI [ \%convert-arguments ]
+.YS
+.
+.SY "pic2graph \-\-help"
+.SY "pic2graph \-\-version"
+.YS
 .
 .
 .\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 .SH DESCRIPTION
 .\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 .
-Reads a PIC program as input; produces an image file (by default in
-Portable Network Graphics format) suitable for the Web as output.
+.I pic2graph
+reads a
+.BR @g@pic (@MAN1EXT@)
+program from the standard input and and writes an image file,
+by default in Portable Network Graphics (PNG) format,
+to the standard output.
 .
-Also translates
+It furthermore translates
 .BR @g@eqn (@MAN1EXT@)
 constructs, so it can be used for generating images of mathematical
 formulae.
 .
 .
-.P
-PIC is a rather expressive graphics minilanguage suitable for
-producing box-and-arrow diagrams of the kind frequently used in
-technical papers and textbooks.
-.
-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 PIC descriptions are procedural and object-based, they are
-both compact and easy to modify.
-.
-.
-.P
-The PIC language is fully documented in
-.IR "Making Pictures With GNU PIC" ,
-a document which is part of the
-.BR groff (@MAN1EXT@)
-distribution.
-.
-.
-.P
-Your input PIC code should
+.PP
+The input
+.I PIC
+code should
 .I not
-be wrapped with the \&.PS and \&.PE macros that normally guard it within
+be wrapped with the
+.B \&.PS
+and
+.B \&.PE
+macros that normally guard it within
 .BR groff (@MAN1EXT@)
-macros.
+documents.
 .
 .
-.P
-The output image will be clipped to the smallest possible bounding box
-that contains all the black pixels.
+.\" FIXME: How old?  This text hasn't been touched since 2008 at latest.
+.\" Older versions of
+.\" .I \%convert
+.\" will produce a black-on-white graphic; newer ones may produce a
+.\" black-on-transparent graphic.
 .
-Older versions of
-.BR \%convert (1)
-will produce a black-on-white graphic; newer ones may produce a
-black-on-transparent graphic.
+.PP
+Arguments not recognized by
+.I pic2graph
+are passed to the ImageMagick or GraphicsMagick program
+.BR \%convert (1).
 .
-By specifying command-line options to be passed to
-.BR \%convert (1)
-you can give it a border, force the background transparent, set the
-image's pixel density, or perform other useful transformations.
 .
+By specifying these, you can give your image a border,
+.\" Transparent backgrounds are the default in 2018.
+.\" force the background transparent,
+set the image's pixel density,
+or perform other useful transformations.
 .
-.P
-This program uses
-.BR @g@pic (@MAN1EXT@),
-.BR @g@eqn (@MAN1EXT@),
-.BR groff (@MAN1EXT@),
-.BR gs (1),
-and the ImageMagick
-.BR \%convert (1)
-program.
-These programs must be installed on your system and accessible on your
-$PATH for
-.B pic2graph
-to work.
+.
+.PP
+The output image is clipped using
+.IR convert 's
+.B \-trim
+option to the smallest possible bounding box that contains all the black
+pixels.
 .
 .
 .\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
@@ -106,53 +92,57 @@ to work.
 .TP
 .B \-unsafe
 Run
-.BR @g@pic (@MAN1EXT@)
-and
-.BR groff (@MAN1EXT@)
-in the \(oqunsafe\(cq mode enabling the PIC macro
+.I groff
+in
+.I unsafe
+mode, enabling the
+.I PIC
+command
 .B sh
-to execute arbitrary commands.
+to execute arbitrary Unix shell commands.
+.
+The
+.I groff
+default is to forbid this.
 .
-The default is to forbid this.
 .
 .TP
-.BI "\-format " fmt
-Specify an output format; the default is PNG (Portable Network Graphics)=
.
+.BI "\-format " output-format
+Write the image in
+.IR output-format ,
+which must be understood by
+.IR convert ;
+the default is PNG.
 .
-Any format that
-.BR \%convert (1)
-can emit is supported.
 .
 .TP
-.BI "\-eqn " delim
-Change the fencepost characters that delimit
-.BR @g@eqn (@MAN1EXT@)
-directives
-.RB ( $
-and
-.BR $ ,
-by default).
-.
-This option requires an argument, but an empty string is accepted as a
-directive to disable
-.BR @g@eqn (@MAN1EXT@)
+.BI "\-eqn " delimeters
+Use
+.I delimeters
+as the opening and closing
+characters that delimit
+.I @g@eqn
+directives;
+the default is \(lq$$\(rq.
+.
+The option argument
+.I delimeters
+should be a two-character string,
+but an empty string (\(dq\(dq) is accepted as a directive to disable
+.I @g@eqn
 processing.
 .
 .
-.PP
-Command-line switches and arguments not listed above are passed to
-.BR \%convert (1).
-.
+.TP
+.B \-\-help
+Display a brief usage message and exit.
 .
-.\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
-.SH FILES
-.\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 .
 .TP
-.B @MACRODIR@/eqnrc
-The
-.BR @g@eqn (@MAN1EXT@)
-initialization file.
+.B \-\-version
+Display
+.IR pic2graph 's
+version string and exit.
 .
 .
 .\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
@@ -160,26 +150,25 @@ initialization file.
 .\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 .
 .TP
-.B GROFF_TMPDIR
-The directory in which temporary files will be created.
-.
-If this is not set
-.B pic2graph
-searches the environment variables
-.BR \%TMPDIR ,
-.BR TMP ,
-and
-.B TEMP
-(in that order).
+.B \%GROFF_TMPDIR
+.TQ
+.B \%TMPDIR
+.TQ
+.B \%TMP
+.TQ
+.B \%TEMP
+These environment variables are searched in the given order to determine
+the directory where temporary files will be created.
 .
-Otherwise, temporary files will be created in
-.BR /tmp .
+If none are set,
+.I /tmp
+is used.
 .
 .
 .\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 .SH AUTHORS
 .\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
-.B pic2graph
+.I pic2graph
 was written by
 .MT esr@\:thyrsus.com
 Eric S.\& Raymond
@@ -196,8 +185,14 @@ based on a recipe by W.\& Richard Stevens.
 .BR @g@pic (@MAN1EXT@),
 .BR @g@eqn (@MAN1EXT@),
 .BR groff (@MAN1EXT@),
-.BR gs (1),
-.BR \%convert (1).
+.BR \%convert (1)
+.
+.
+.PP
+W.\& Richard Stevens,
+.UR http://\:www.kohala.com/\:start/\:troff/\:pic2html.html
+.I Turning PIC into HTML
+.UE
 .
 .
 .\" Local Variables:


From MAILER-DAEMON Mon Apr 23 05:34:41 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1fAXrt-0006A1-Kf
	for mharc-groff-commit@gnu.org; Mon, 23 Apr 2018 05:34:41 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:40513)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fAXro-00066d-BL
	for groff-commit@gnu.org; Mon, 23 Apr 2018 05:34:39 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fAXrm-0002YY-Mw
	for groff-commit@gnu.org; Mon, 23 Apr 2018 05:34:36 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:35473)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fAXrm-0002YH-JL
	for groff-commit@gnu.org; Mon, 23 Apr 2018 05:34:34 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id 6ECAB20996; Mon, 23 Apr 2018 05:34:34 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 03/04: pic2graph: Adapt to old convert(1) programs.
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: <20180423093433.26082.22717@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: b60f6b6d0c0a9655d10d32ee6688ac0f45fc3006
Auto-Submitted: auto-generated
Message-Id: <20180423093434.6ECAB20996@vcs0.savannah.gnu.org>
Date: Mon, 23 Apr 2018 05:34:34 -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 Apr 2018 09:34:39 -0000

gbranden pushed a commit to branch master
in repository groff.

commit b60f6b6d0c0a9655d10d32ee6688ac0f45fc3006
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Mon Apr 23 04:14:55 2018 -0400

    pic2graph: Adapt to old convert(1) programs.
   =20
    	* contrib/pic2graph/pic2graph.sh: Grep convert's -help output
    	  for the string "-trim".  If it is not found, the old method
    	  for image trimming documented in pic2graph's man page, "-crop
    	  0x0", is used.  I am motivated by the fact that the warning
    	  about this in our man page is very old (10 years or more), and
    	  I wanted to get rid of it.
   =20
    	  pic2graph emits a warning when performing this fallback, in
    	  the event the ImageMagick and/or GraphicsMagick teams surprise
    	  the world again.
   =20
    	* contrib/pic2graph/pic2graph.1.man: Remove BUGS section, the
    	  entire contents of which was dedicated to convert's change in
    	  behavior.
   =20
    NEWS:
    * Add Emacs fill-column.
    * Add Vim modeline.
    * Wrap the few lines in this file that were longer that 76 columns
      (about 6 out of almost 2,900) and reflow their paragraphs.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 ChangeLog                         | 19 ++++++++++++++++++
 NEWS                              | 42 +++++++++++++++++++++++----------=
------
 contrib/pic2graph/pic2graph.1.man | 26 ------------------------
 contrib/pic2graph/pic2graph.sh    | 13 +++++++++++-
 4 files changed, 56 insertions(+), 44 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3b7cbed..deb71f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2018-04-23  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+	pic2graph: Adapt to old convert(1) programs.
+
+	* contrib/pic2graph/pic2graph.sh: Grep convert's -help output
+	  for the string "-trim".  If it is not found, the old method
+	  for image trimming documented in pic2graph's man page, "-crop
+	  0x0", is used.  I am motivated by the fact that the warning
+	  about this in our man page is very old (10 years or more), and
+	  I wanted to get rid of it.
+
+	  pic2graph emits a warning when performing this fallback, in
+	  the event the ImageMagick and/or GraphicsMagick teams surprise
+	  the world again.
+
+	* contrib/pic2graph/pic2graph.1.man: Remove BUGS section, the
+	  entire contents of which was dedicated to convert's change in
+	  behavior.
+
 2018-04-22  G. Branden Robinson <g.branden.robinson@gmail.com>
=20
 	groff_man(7): Expand command synopsis section.
diff --git a/NEWS b/NEWS
index fea449c..06d868a 100644
--- a/NEWS
+++ b/NEWS
@@ -27,10 +27,10 @@ o PDFPIC has now been corrected, so the behaviour is =
the same whether you
   which were written using the old behaviour will not be rendered correc=
tly
   if using the pdf driver with the new version.
=20
-  The change would mean that documents which relied on the previous beha=
viour
-  are likely to have a gap underneath the image which was not there befo=
re.
-  If you see this effect there are three ways you can restore the previo=
us
-  0behaviour:-
+  The change would mean that documents which relied on the previous
+  behaviour are likely to have a gap underneath the image which was not
+  there before.  If you see this effect there are three ways you can res=
tore
+  the previous 0behaviour:-
=20
   Add the line ".nr PDFPIC_NOSPACE 1" to the document before the first c=
all
   to .PDFPIC.
@@ -50,9 +50,15 @@ Miscellaneous
 -------------
=20
 o New 'configure' option --with-compatibility-wrappers to control how gr=
off
-  compatibility wrappers for vendor-provided non-GNU macro sets are inst=
alled
-  (See: ./configure --help).
+  compatibility wrappers for vendor-provided non-GNU macro sets are
+  installed (See: ./configure --help).
=20
+o pic2graph now attempts to adapt to very old installed versions of the
+  ImageMagick and GraphicsMagick programs "convert".  pic2graph searches=
 the
+  output of convert's "-help" option, and uses "-trim" if that string is
+  found; otherwise, the old "-crop 0x0" method (which produces incompati=
ble
+  results on versions that _do_ support "-trim") is used.  pic2graph emi=
ts a
+  warning to standard error if the search fails and the old method is us=
ed.
=20
 VERSION 1.22.3
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
@@ -1427,8 +1433,8 @@ Eqn2graph
 ---------
=20
 o A new script contributed by Eric S. Raymond <esr@thyrsus.com>.  It
-  converts an EQN diagram into a cropped image.  Since it uses gs and th=
e PNM
-  library, virtually all graphics formats are available for output.
+  converts an EQN diagram into a cropped image.  Since it uses gs and th=
e
+  PNM library, virtually all graphics formats are available for output.
=20
 Groffer
 -------
@@ -2006,9 +2012,9 @@ configure script).
 Documentation
 -------------
=20
-Three new man pages are available: groff_tmac.5 (documenting how troff m=
acros
-are accessed and where they are found), groff.7 (a short reference of th=
e GNU
-roff language), and roff.7 (a general survey on GNU troff).
+Three new man pages are available: groff_tmac.5 (documenting how troff
+macros are accessed and where they are found), groff.7 (a short referenc=
e of
+the GNU roff language), and roff.7 (a general survey on GNU troff).
=20
 Miscellaneous
 -------------
@@ -2030,10 +2036,10 @@ Bug fixes only; no user-visible changes.
 VERSION 1.12
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=20
-Finally, there are new maintainers for groff.  Mailing lists and a devel=
opment
-repository are available also. See the file README for details.  Not all
-reported bugs could be fixed, so please send mails again if something is
-still not working.
+Finally, there are new maintainers for groff.  Mailing lists and a
+development repository are available also. See the file README for detai=
ls.
+Not all reported bugs could be fixed, so please send mails again if
+something is still not working.
=20
 Most of the installation problems should have vanished now (most
 notably the $(tmac_wrap) bug).
@@ -2765,8 +2771,8 @@ containing the hyphenation patterns.
=20
 There is a `\C'xxx'' escape sequence equivalent to `\[xxx]'.
=20
-Characters ", ', ), ], *, \(dg are now initially transparent for the pur=
poses
-of end of sentence recognition.
+Characters ", ', ), ], *, \(dg are now initially transparent for the
+purposes of end of sentence recognition.
=20
 There is an anti-recursion feature in the `char' request, so you can
 say `.char \(bu \s+2\(bu\s-2'.
@@ -2846,5 +2852,7 @@ definitions.
 Local Variables:
 version-control: never
 coding: latin-1
+fill-column: 76
 mode: text
 End:
+# vim: set autoindent textwidth=3D76:
diff --git a/contrib/pic2graph/pic2graph.1.man b/contrib/pic2graph/pic2gr=
aph.1.man
index 42f5ecc..b9ea5c3 100644
--- a/contrib/pic2graph/pic2graph.1.man
+++ b/contrib/pic2graph/pic2graph.1.man
@@ -177,32 +177,6 @@ Otherwise, temporary files will be created in
 .
 .
 .\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
-.SH BUGS
-.\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
-.
-Due to changes in the behavior of ImageMagick
-.BR \%convert (1)
-that are both forward and backward-incompatible,
-mismatches between your
-.B pic2graph
-and
-.BR \%convert (1)
-versions may produce zero-sized or untrimmed output images.
-.
-For this version of
-.B pic2graph
-you will need a version of
-.BR \%convert (1)
-that supports the
-.B \-trim
-option; older versions of
-.B pic2graph
-used
-.BR \-crop\~0x0 ,
-which no longer has trimming behavior.
-.
-.
-.\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 .SH AUTHORS
 .\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 .B pic2graph
diff --git a/contrib/pic2graph/pic2graph.sh b/contrib/pic2graph/pic2graph=
.sh
index fd3c4c9..7773b26 100644
--- a/contrib/pic2graph/pic2graph.sh
+++ b/contrib/pic2graph/pic2graph.sh
@@ -34,6 +34,7 @@
 #
 groffpic_opts=3D""
 convert_opts=3D""
+convert_trim_arg=3D"-trim"
 format=3D"png"
 eqndelim=3D'$$'
=20
@@ -83,6 +84,15 @@ if test -z "$tmp"; then
     { (exit 1); exit 1; }
 fi
=20
+# See if the installed version of convert(1) is new enough to support th=
e -trim
+# option.  Versions that didn't were described as "old" as early as 2008=
.
+is_convert_recent=3D`convert -help | grep -e -trim`
+if test -z "$is_convert_recent"
+then
+    echo "$0: warning: falling back to old '-crop 0x0' trim method" >&2
+    convert_trim_arg=3D"-crop 0x0"
+fi
+
 trap 'exit_status=3D$?; rm -rf $tmp && exit $exit_status' EXIT INT TERM
=20
 # Here goes:
@@ -92,7 +102,8 @@ trap 'exit_status=3D$?; rm -rf $tmp && exit $exit_stat=
us' EXIT INT TERM
 # 4. Use convert(1) to crop the PostScript and turn it into a bitmap.
 (echo ".EQ"; echo $eqndelim; echo ".EN"; echo ".PS"; cat; echo ".PE") | =
\
     groff -e -p $groffpic_opts -Tps -P-pletter > $tmp/pic2graph.ps \
-    && convert -trim $convert_opts $tmp/pic2graph.ps $tmp/pic2graph.$for=
mat \
+    && convert $convert_trim_arg $convert_opts $tmp/pic2graph.ps \
+       $tmp/pic2graph.$format \
     && cat $tmp/pic2graph.$format
=20
 # End


From MAILER-DAEMON Mon Apr 23 05:34:42 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1fAXrt-0006AD-Rd
	for mharc-groff-commit@gnu.org; Mon, 23 Apr 2018 05:34:41 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:40544)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fAXrr-00066y-EI
	for groff-commit@gnu.org; Mon, 23 Apr 2018 05:34:40 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fAXrm-0002YR-Kl
	for groff-commit@gnu.org; Mon, 23 Apr 2018 05:34:38 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:35468)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fAXrm-0002YC-HY
	for groff-commit@gnu.org; Mon, 23 Apr 2018 05:34:34 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id 1A886204DB; Mon, 23 Apr 2018 05:34:34 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/04: pic2graph(1): Stop trying to outsmart .TP macro.
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: <20180423093433.26082.22717@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 5f6b02c22a9d9c3e84fb369b7f4f1310552cc638
Auto-Submitted: auto-generated
Message-Id: <20180423093434.1A886204DB@vcs0.savannah.gnu.org>
Date: Mon, 23 Apr 2018 05:34: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: Mon, 23 Apr 2018 09:34:40 -0000

gbranden pushed a commit to branch master
in repository groff.

commit 5f6b02c22a9d9c3e84fb369b7f4f1310552cc638
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Sun Apr 22 18:15:42 2018 -0400

    pic2graph(1): Stop trying to outsmart .TP macro.
   =20
    Remove gratuitous calculated indent setting.  Most man pages that do
    this trick do it as a way to simulate 2-column output, or a 2-column
    table, but in this case the table would have only one row so there's
    no beautification to be done.
   =20
    This trick causes 'can't break line' warnings if, for instance, the
    ./configure --prefix is longer than the man page author expects.  (Th=
is
    is often the case.)
   =20
    Thanks to Bjarni Ingli Gislason for catching this.
   =20
    Fixes bug https://savannah.gnu.org/bugs/index.php?53715.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 contrib/pic2graph/pic2graph.1.man | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/pic2graph/pic2graph.1.man b/contrib/pic2graph/pic2gr=
aph.1.man
index 784aff5..42f5ecc 100644
--- a/contrib/pic2graph/pic2graph.1.man
+++ b/contrib/pic2graph/pic2graph.1.man
@@ -148,7 +148,7 @@ Command-line switches and arguments not listed above =
are passed to
 .SH FILES
 .\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 .
-.TP \w'\fB@MACRODIR@/eqnrc'u+2n
+.TP
 .B @MACRODIR@/eqnrc
 The
 .BR @g@eqn (@MAN1EXT@)


From MAILER-DAEMON Mon Apr 23 06:09:02 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1fAYP8-0007Co-6y
	for mharc-groff-commit@gnu.org; Mon, 23 Apr 2018 06:09:02 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:58017)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fAYP5-0007Ac-AW
	for groff-commit@gnu.org; Mon, 23 Apr 2018 06:09:00 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fAYOz-0002w2-FD
	for groff-commit@gnu.org; Mon, 23 Apr 2018 06:08:59 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:35689)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fAYOz-0002vp-Av
	for groff-commit@gnu.org; Mon, 23 Apr 2018 06:08:53 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id 22B60204DB; Mon, 23 Apr 2018 06:08:53 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/01: Makefile.am: Correct a comment.
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: <20180423100852.8575.91671@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 3aae1e8939df0e86b3a46318cceb72e0eb774dc8
Auto-Submitted: auto-generated
Message-Id: <20180423100853.22B60204DB@vcs0.savannah.gnu.org>
Date: Mon, 23 Apr 2018 06:08: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: Mon, 23 Apr 2018 10:09:00 -0000

gbranden pushed a commit to branch master
in repository groff.

commit 3aae1e8939df0e86b3a46318cceb72e0eb774dc8
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Mon Apr 23 06:06:33 2018 -0400

    Makefile.am: Correct a comment.
   =20
    Sync comment documenting SHORT_VERSION with reality; evidently at one
    point this was called SHORT_REVISION and did not survive contact with
    the enemy.  Also indicate where it's defined, since it's a groff thin=
g
    and not a feature of gnulib's git-version-gen.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 Makefile.am | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 6a05cca..bfea268 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -634,9 +634,9 @@ endif
 # REVISION is the full revision given by git-version-gen, which can
 # have non-alphanumeric symbols.
 #
-# SHORT_REVISION contains only the number of REVISION before the first
-# '.', e.g. if REVISION is '3.real.434-5aafd' then SHORT_REVISION is
-# '3'.
+# SHORT_VERSION (defined in configure.ac) contains only the number of
+# REVISION before the first '.', e.g. if REVISION is '3.real.434-5aafd'
+# then SHORT_VERSION is '3'.
=20
 MAJOR_VERSION =3D`echo $(VERSION) | sed 's/\([0-9]\+\)\.[0-9]\+.*/\1/'`
 MINOR_VERSION =3D`echo $(VERSION) | sed 's/[0-9]\+\.\([0-9]\+\).*/\1/'`


From MAILER-DAEMON Mon Apr 23 06:25:36 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1fAYfA-0004wv-5k
	for mharc-groff-commit@gnu.org; Mon, 23 Apr 2018 06:25:36 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:39037)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fAYf7-0004wQ-Od
	for groff-commit@gnu.org; Mon, 23 Apr 2018 06:25:34 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fAYf4-0001md-EL
	for groff-commit@gnu.org; Mon, 23 Apr 2018 06:25:33 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:35825)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fAYf4-0001mF-9I
	for groff-commit@gnu.org; Mon, 23 Apr 2018 06:25:30 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id 046BE2098A; Mon, 23 Apr 2018 06:25:29 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/01: Document SHORT_VERSION where it is defined.
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: <20180423102529.17120.27612@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: a6c2217cd0a088b649257b87bea4299cbb1e90dd
Auto-Submitted: auto-generated
Message-Id: <20180423102530.046BE2098A@vcs0.savannah.gnu.org>
Date: Mon, 23 Apr 2018 06:25:29 -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 Apr 2018 10:25:34 -0000

gbranden pushed a commit to branch master
in repository groff.

commit a6c2217cd0a088b649257b87bea4299cbb1e90dd
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Mon Apr 23 06:22:52 2018 -0400

    Document SHORT_VERSION where it is defined.
   =20
    Leave a breadcrumb in Makefile.am since SHORT_VERSION is logically
    related but handled by a different layer of GNU Autotools.
   =20
    Further clarify what SHORT_VERSION actually expands to: not just the
    truncated revision number, but the whole version string _up to_ the
    truncation point.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 Makefile.am  | 4 +---
 configure.ac | 5 +++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index bfea268..9de103f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -634,9 +634,7 @@ endif
 # REVISION is the full revision given by git-version-gen, which can
 # have non-alphanumeric symbols.
 #
-# SHORT_VERSION (defined in configure.ac) contains only the number of
-# REVISION before the first '.', e.g. if REVISION is '3.real.434-5aafd'
-# then SHORT_VERSION is '3'.
+# Also see configure.ac for the related SHORT_VERSION macro.
=20
 MAJOR_VERSION =3D`echo $(VERSION) | sed 's/\([0-9]\+\)\.[0-9]\+.*/\1/'`
 MINOR_VERSION =3D`echo $(VERSION) | sed 's/[0-9]\+\.\([0-9]\+\).*/\1/'`
diff --git a/configure.ac b/configure.ac
index ff89f11..19d4473 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,8 +25,9 @@ AC_INIT([GNU Troff],
=20
 AC_PREREQ([2.62])
=20
-# Version consisting of exactly MAJOR.MINOR.PATCH, stripped of any
-# digit after PATCH.
+# SHORT_VERSION contains only the number of REVISION before the first '.=
',
+# e.g. if REVISION is '3.real.434-5aafd' then SHORT_VERSION is 'x.yy.3',
+# where x and yy are MAJOR_VERSION and MINOR_VERSION, respectively.
 AC_SUBST([SHORT_VERSION],
 	m4_bregexp(AC_PACKAGE_VERSION,[^\(\w+\.\w+\.\w+\).*$],[\1]))
=20


From MAILER-DAEMON Mon Apr 23 08:00:55 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1fAa9P-0005LZ-OC
	for mharc-groff-commit@gnu.org; Mon, 23 Apr 2018 08:00:55 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:37233)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fAa9B-0005DE-2Y
	for groff-commit@gnu.org; Mon, 23 Apr 2018 08:00:54 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fAa90-0004uX-GT
	for groff-commit@gnu.org; Mon, 23 Apr 2018 08:00:41 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:36790)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fAa90-0004uA-88
	for groff-commit@gnu.org; Mon, 23 Apr 2018 08:00:30 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id DC9B5213A8; Mon, 23 Apr 2018 08:00:29 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/01: man pages: Shorten version footer.
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: <20180423120028.29229.38146@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 55f8429b13e3172140cd75878da94868b2cdd00e
Auto-Submitted: auto-generated
Message-Id: <20180423120029.DC9B5213A8@vcs0.savannah.gnu.org>
Date: Mon, 23 Apr 2018 08:00:29 -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 Apr 2018 12:00:54 -0000

gbranden pushed a commit to branch master
in repository groff.

commit 55f8429b13e3172140cd75878da94868b2cdd00e
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Mon Apr 23 07:59:44 2018 -0400

    man pages: Shorten version footer.
   =20
    * **/*.man: Replace "Groff Version" with "groff" in the fourth
      argument to .TH in all man pages.  This suffices to keep that
      part of the footer from overruning the date, even in dirty
      trees.
   =20
    Fixes https://savannah.gnu.org/bugs/index.php?53721.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 ChangeLog                                     | 11 +++++++++++
 contrib/chem/chem.1.man                       |  2 +-
 contrib/eqn2graph/eqn2graph.1.man             |  2 +-
 contrib/gdiffmk/gdiffmk.1.man                 |  2 +-
 contrib/glilypond/glilypond.1.man             |  2 +-
 contrib/gperl/gperl.1.man                     |  2 +-
 contrib/gpinyin/gpinyin.1.man                 |  2 +-
 contrib/grap2graph/grap2graph.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/mm/groff_mm.7.man                     |  2 +-
 contrib/mm/groff_mmse.7.man                   |  2 +-
 contrib/mm/mmroff.1.man                       |  2 +-
 contrib/mom/groff_mom.7.man                   |  2 +-
 contrib/pdfmark/pdfroff.1.man                 |  2 +-
 contrib/pic2graph/pic2graph.1.man             |  2 +-
 man/ditroff.7.man                             |  2 +-
 man/groff.7.man                               |  2 +-
 man/groff_diff.7.man                          |  2 +-
 man/groff_font.5.man                          |  2 +-
 man/groff_out.5.man                           |  2 +-
 man/groff_tmac.5.man                          |  2 +-
 man/roff.7.man                                |  2 +-
 src/devices/grodvi/grodvi.1.man               |  2 +-
 src/devices/grohtml/grohtml.1.man             |  2 +-
 src/devices/grolbp/grolbp.1.man               |  2 +-
 src/devices/grolj4/grolj4.1.man               |  2 +-
 src/devices/grolj4/lj4_font.5.man             |  2 +-
 src/devices/gropdf/gropdf.1.man               |  2 +-
 src/devices/gropdf/pdfmom.1.man               |  2 +-
 src/devices/grops/grops.1.man                 |  2 +-
 src/devices/grotty/grotty.1.man               |  2 +-
 src/devices/xditview/gxditview.1.man          |  2 +-
 src/preproc/eqn/eqn.1.man                     |  2 +-
 src/preproc/eqn/neqn.1.man                    |  2 +-
 src/preproc/grn/grn.1.man                     |  2 +-
 src/preproc/pic/pic.1.man                     |  2 +-
 src/preproc/preconv/preconv.1.man             |  2 +-
 src/preproc/refer/refer.1.man                 |  2 +-
 src/preproc/soelim/soelim.1.man               |  2 +-
 src/preproc/tbl/tbl.1.man                     |  2 +-
 src/roff/groff/groff.1.man                    |  2 +-
 src/roff/grog/grog.1.man                      |  2 +-
 src/roff/nroff/nroff.1.man                    |  2 +-
 src/roff/troff/troff.1.man                    |  2 +-
 src/utils/addftinfo/addftinfo.1.man           |  2 +-
 src/utils/afmtodit/afmtodit.1.man             |  2 +-
 src/utils/hpftodit/hpftodit.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/pfbtops/pfbtops.1.man               |  2 +-
 src/utils/tfmtodit/tfmtodit.1.man             |  2 +-
 src/utils/xtotroff/xtotroff.1.man             |  2 +-
 tmac/groff_man.7.man                          |  2 +-
 tmac/groff_ms.7.man                           |  2 +-
 tmac/groff_trace.7.man                        |  2 +-
 tmac/groff_www.7.man                          |  2 +-
 60 files changed, 70 insertions(+), 59 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index deb71f2..07cdac2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2018-04-23  G. Branden Robinson <g.branden.robinson@gmail.com>
=20
+	man pages: Shorten version footer.
+
+	* **/*.man: Replace "Groff Version" with "groff" in the fourth
+	  argument to .TH in all man pages.  This suffices to keep that
+	  part of the footer from overruning the date, even in dirty
+	  trees.
+
+	Fixes https://savannah.gnu.org/bugs/index.php?53721.
+
+2018-04-23  G. Branden Robinson <g.branden.robinson@gmail.com>
+
 	pic2graph: Adapt to old convert(1) programs.
=20
 	* contrib/pic2graph/pic2graph.sh: Grep convert's -help output
diff --git a/contrib/chem/chem.1.man b/contrib/chem/chem.1.man
index 02f20c6..d6242df 100644
--- a/contrib/chem/chem.1.man
+++ b/contrib/chem/chem.1.man
@@ -1,4 +1,4 @@
-.TH @G@CHEM @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH @G@CHEM @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 @g@chem \- groff preprocessor for producing chemical structure diagrams
 .
diff --git a/contrib/eqn2graph/eqn2graph.1.man b/contrib/eqn2graph/eqn2gr=
aph.1.man
index 973e1ab..47d8492 100644
--- a/contrib/eqn2graph/eqn2graph.1.man
+++ b/contrib/eqn2graph/eqn2graph.1.man
@@ -1,4 +1,4 @@
-.TH EQN2GRAPH @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH EQN2GRAPH @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 eqn2graph \- convert an EQN equation into a cropped image
 .
diff --git a/contrib/gdiffmk/gdiffmk.1.man b/contrib/gdiffmk/gdiffmk.1.ma=
n
index 6414a51..8fa83d6 100644
--- a/contrib/gdiffmk/gdiffmk.1.man
+++ b/contrib/gdiffmk/gdiffmk.1.man
@@ -1,4 +1,4 @@
-.TH GDIFFMK @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH GDIFFMK @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 gdiffmk \- mark differences between groff/nroff/troff files
 .
diff --git a/contrib/glilypond/glilypond.1.man b/contrib/glilypond/glilyp=
ond.1.man
index a9751b9..40e5c26 100644
--- a/contrib/glilypond/glilypond.1.man
+++ b/contrib/glilypond/glilypond.1.man
@@ -1,4 +1,4 @@
-.TH glilypond @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH glilypond @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 glilypond \- integrate lilypond parts into groff
 .
diff --git a/contrib/gperl/gperl.1.man b/contrib/gperl/gperl.1.man
index 818e4cd..c98ad2d 100644
--- a/contrib/gperl/gperl.1.man
+++ b/contrib/gperl/gperl.1.man
@@ -1,4 +1,4 @@
-.TH GPERL @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH GPERL @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 gperl \- groff preprocessor for Perl parts in roff files
 .
diff --git a/contrib/gpinyin/gpinyin.1.man b/contrib/gpinyin/gpinyin.1.ma=
n
index c1ea58c..668d07f 100644
--- a/contrib/gpinyin/gpinyin.1.man
+++ b/contrib/gpinyin/gpinyin.1.man
@@ -1,4 +1,4 @@
-.TH GPINYIN @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH GPINYIN @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 gpinyin \- Chinese European-like writing within groff
 .
diff --git a/contrib/grap2graph/grap2graph.1.man b/contrib/grap2graph/gra=
p2graph.1.man
index d9f54d7..7158de0 100644
--- a/contrib/grap2graph/grap2graph.1.man
+++ b/contrib/grap2graph/grap2graph.1.man
@@ -1,4 +1,4 @@
-.TH GRAP2GRAPH @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH GRAP2GRAPH @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 grap2graph \- convert a grap diagram into a cropped bitmap image
 .
diff --git a/contrib/groff_filenames/groff_filenames.5.man b/contrib/grof=
f_filenames/groff_filenames.5.man
index c3d58be..e9e8d3a 100644
--- a/contrib/groff_filenames/groff_filenames.5.man
+++ b/contrib/groff_filenames/groff_filenames.5.man
@@ -1,4 +1,4 @@
-.TH GROFF_FILENAMES @MAN5EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH GROFF_FILENAMES @MAN5EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 groff_filenames \(em filename extensions for roff and groff
 .
diff --git a/contrib/groffer/groffer.1.man b/contrib/groffer/groffer.1.ma=
n
index f77bd2d..5723606 100644
--- a/contrib/groffer/groffer.1.man
+++ b/contrib/groffer/groffer.1.man
@@ -1,4 +1,4 @@
-.TH GROFFER @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH GROFFER @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 groffer \- display groff files and man\~pages on X and tty
 .
diff --git a/contrib/groffer/roff2.1.man b/contrib/groffer/roff2.1.man
index 8757b63..fd48715 100644
--- a/contrib/groffer/roff2.1.man
+++ b/contrib/groffer/roff2.1.man
@@ -1,4 +1,4 @@
-.TH roff2@ROFF2MODE@ @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH roff2@ROFF2MODE@ @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 roff2@ROFF2MODE@ \- transform roff code into @ROFF2MODE@ mode
 .
diff --git a/contrib/hdtbl/groff_hdtbl.7.man b/contrib/hdtbl/groff_hdtbl.=
7.man
index 0f9d436..cc45511 100644
--- a/contrib/hdtbl/groff_hdtbl.7.man
+++ b/contrib/hdtbl/groff_hdtbl.7.man
@@ -1,4 +1,4 @@
-.TH GROFF_HDTBL @MAN7EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH GROFF_HDTBL @MAN7EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 groff_hdtbl \- Heidelberger table macros for GNU roff
 .
diff --git a/contrib/mm/groff_mm.7.man b/contrib/mm/groff_mm.7.man
index 4cc7684..61da970 100644
--- a/contrib/mm/groff_mm.7.man
+++ b/contrib/mm/groff_mm.7.man
@@ -1,5 +1,5 @@
 '\" t
-.TH GROFF_MM @MAN7EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH GROFF_MM @MAN7EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 groff_mm \- memorandum macros for GNU roff
 .
diff --git a/contrib/mm/groff_mmse.7.man b/contrib/mm/groff_mmse.7.man
index 0220b05..3824a2b 100644
--- a/contrib/mm/groff_mmse.7.man
+++ b/contrib/mm/groff_mmse.7.man
@@ -1,4 +1,4 @@
-.TH GROFF_MMSE @MAN7EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH GROFF_MMSE @MAN7EXT@ "@MDATE@" "groff @VERSION@"
 .
 .SH NAMN
 groff_mmse \- svenska \[rq]memorandum\[rq] makro f=EF=BF=BDr GNU roff
diff --git a/contrib/mm/mmroff.1.man b/contrib/mm/mmroff.1.man
index 9dbc886..db2c94e 100644
--- a/contrib/mm/mmroff.1.man
+++ b/contrib/mm/mmroff.1.man
@@ -1,4 +1,4 @@
-.TH MMROFF @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH MMROFF @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 mmroff \- cross-reference preprocessor for GNU roff mm macro package
 .
diff --git a/contrib/mom/groff_mom.7.man b/contrib/mom/groff_mom.7.man
index e615487..059e96d 100644
--- a/contrib/mom/groff_mom.7.man
+++ b/contrib/mom/groff_mom.7.man
@@ -1,4 +1,4 @@
-.TH GROFF_MOM @MAN7EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH GROFF_MOM @MAN7EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 groff_mom \- groff \[lq]mom\[rq] macros; \[lq]mom\[rq] is a \[lq]roff\[r=
q] language, part of \[lq]groff\[rq]
 .
diff --git a/contrib/pdfmark/pdfroff.1.man b/contrib/pdfmark/pdfroff.1.ma=
n
index a3fdb1c..0a0a7c2 100644
--- a/contrib/pdfmark/pdfroff.1.man
+++ b/contrib/pdfmark/pdfroff.1.man
@@ -1,4 +1,4 @@
-.TH PDFROFF @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH PDFROFF @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 pdfroff \- create PDF documents using groff
 .
diff --git a/contrib/pic2graph/pic2graph.1.man b/contrib/pic2graph/pic2gr=
aph.1.man
index df3cac1..081b0b1 100644
--- a/contrib/pic2graph/pic2graph.1.man
+++ b/contrib/pic2graph/pic2graph.1.man
@@ -1,4 +1,4 @@
-.TH PIC2GRAPH @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH PIC2GRAPH @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 pic2graph \- convert a PIC diagram into a cropped image
 .
diff --git a/man/ditroff.7.man b/man/ditroff.7.man
index e3c004e..fa14850 100644
--- a/man/ditroff.7.man
+++ b/man/ditroff.7.man
@@ -1,4 +1,4 @@
-.TH DITROFF @MAN7EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH DITROFF @MAN7EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 ditroff \- classical device-independent roff
 .
diff --git a/man/groff.7.man b/man/groff.7.man
index 4968e74..b34ccf9 100644
--- a/man/groff.7.man
+++ b/man/groff.7.man
@@ -1,5 +1,5 @@
 '\" t
-.TH GROFF @MAN7EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH GROFF @MAN7EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 groff \- a short reference for the GNU roff language
 .
diff --git a/man/groff_diff.7.man b/man/groff_diff.7.man
index 37423e9..1fcf8a9 100644
--- a/man/groff_diff.7.man
+++ b/man/groff_diff.7.man
@@ -1,6 +1,6 @@
 '\" e
 .\" The above line should force the use of eqn as a preprocessor
-.TH GROFF_DIFF @MAN7EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH GROFF_DIFF @MAN7EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 groff_diff \- differences between GNU troff and classical troff
 .
diff --git a/man/groff_font.5.man b/man/groff_font.5.man
index 7923191..71badf1 100644
--- a/man/groff_font.5.man
+++ b/man/groff_font.5.man
@@ -1,4 +1,4 @@
-.TH GROFF_FONT @MAN5EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH GROFF_FONT @MAN5EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 groff_font \- format of groff device and font description files
 .
diff --git a/man/groff_out.5.man b/man/groff_out.5.man
index 6658d8f..c192f18 100644
--- a/man/groff_out.5.man
+++ b/man/groff_out.5.man
@@ -1,6 +1,6 @@
 '\" e
 .\" The above line should force the use of eqn as a preprocessor
-.TH GROFF_OUT @MAN5EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH GROFF_OUT @MAN5EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 groff_out \- groff intermediate output format
 .
diff --git a/man/groff_tmac.5.man b/man/groff_tmac.5.man
index 7a18d32..c7ca133 100644
--- a/man/groff_tmac.5.man
+++ b/man/groff_tmac.5.man
@@ -1,4 +1,4 @@
-.TH GROFF_TMAC @MAN5EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH GROFF_TMAC @MAN5EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 groff_tmac \- macro files in the roff typesetting system
 .
diff --git a/man/roff.7.man b/man/roff.7.man
index 0e8c6b4..480e267 100644
--- a/man/roff.7.man
+++ b/man/roff.7.man
@@ -1,5 +1,5 @@
 '\" t
-.TH ROFF @MAN7EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH ROFF @MAN7EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 roff \- concepts and history of roff typesetting
 .
diff --git a/src/devices/grodvi/grodvi.1.man b/src/devices/grodvi/grodvi.=
1.man
index a6d0741..cbfef20 100644
--- a/src/devices/grodvi/grodvi.1.man
+++ b/src/devices/grodvi/grodvi.1.man
@@ -1,4 +1,4 @@
-.TH GRODVI @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH GRODVI @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 grodvi \- convert groff output to TeX DVI format
 .
diff --git a/src/devices/grohtml/grohtml.1.man b/src/devices/grohtml/groh=
tml.1.man
index 3d56ce6..93a97dc 100644
--- a/src/devices/grohtml/grohtml.1.man
+++ b/src/devices/grohtml/grohtml.1.man
@@ -1,4 +1,4 @@
-.TH GROHTML @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH GROHTML @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 grohtml \- HTML driver for groff
 .
diff --git a/src/devices/grolbp/grolbp.1.man b/src/devices/grolbp/grolbp.=
1.man
index 6ffd047..f4b3841 100644
--- a/src/devices/grolbp/grolbp.1.man
+++ b/src/devices/grolbp/grolbp.1.man
@@ -1,6 +1,6 @@
 '\" t
 .\" The above line should force the use of tbl as a preprocessor
-.TH GROLBP @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH GROLBP @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 grolbp \- groff driver for Canon CAPSL printers (LBP-4 and LBP-8 \
 series laser printers).
diff --git a/src/devices/grolj4/grolj4.1.man b/src/devices/grolj4/grolj4.=
1.man
index 4a06db7..cdd6bb8 100644
--- a/src/devices/grolj4/grolj4.1.man
+++ b/src/devices/grolj4/grolj4.1.man
@@ -1,4 +1,4 @@
-.TH GROLJ4 @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH GROLJ4 @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 grolj4 \- groff driver for HP Laserjet 4 family
 .
diff --git a/src/devices/grolj4/lj4_font.5.man b/src/devices/grolj4/lj4_f=
ont.5.man
index 7f8e50a..4b217eb 100644
--- a/src/devices/grolj4/lj4_font.5.man
+++ b/src/devices/grolj4/lj4_font.5.man
@@ -1,4 +1,4 @@
-.TH LJ4_FONT @MAN5EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH LJ4_FONT @MAN5EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 lj4_font \- groff fonts for use with devlj4
 .
diff --git a/src/devices/gropdf/gropdf.1.man b/src/devices/gropdf/gropdf.=
1.man
index 466049f..2a8c7f3 100644
--- a/src/devices/gropdf/gropdf.1.man
+++ b/src/devices/gropdf/gropdf.1.man
@@ -1,4 +1,4 @@
-.TH GROPDF @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH GROPDF @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 gropdf \- PDF driver for groff
 .
diff --git a/src/devices/gropdf/pdfmom.1.man b/src/devices/gropdf/pdfmom.=
1.man
index 4c6267f..9df4ca8 100644
--- a/src/devices/gropdf/pdfmom.1.man
+++ b/src/devices/gropdf/pdfmom.1.man
@@ -1,4 +1,4 @@
-.TH PDFMOM @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH PDFMOM @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 pdfmom \- Produce PDF documents using the mom macro set
 .
diff --git a/src/devices/grops/grops.1.man b/src/devices/grops/grops.1.ma=
n
index a20b750..47f5da1 100644
--- a/src/devices/grops/grops.1.man
+++ b/src/devices/grops/grops.1.man
@@ -1,4 +1,4 @@
-.TH GROPS @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH GROPS @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 grops \- PostScript driver for groff
 .
diff --git a/src/devices/grotty/grotty.1.man b/src/devices/grotty/grotty.=
1.man
index e0b8903..bba6140 100644
--- a/src/devices/grotty/grotty.1.man
+++ b/src/devices/grotty/grotty.1.man
@@ -1,4 +1,4 @@
-.TH GROTTY @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH GROTTY @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 grotty \- groff driver for typewriter-like devices
 .
diff --git a/src/devices/xditview/gxditview.1.man b/src/devices/xditview/=
gxditview.1.man
index 9ac8a58..a9e6bde 100644
--- a/src/devices/xditview/gxditview.1.man
+++ b/src/devices/xditview/gxditview.1.man
@@ -1,4 +1,4 @@
-.TH GXDITVIEW @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH GXDITVIEW @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 gxditview \- display groff intermediate output files
 .
diff --git a/src/preproc/eqn/eqn.1.man b/src/preproc/eqn/eqn.1.man
index 754d161..22e66fe 100644
--- a/src/preproc/eqn/eqn.1.man
+++ b/src/preproc/eqn/eqn.1.man
@@ -1,4 +1,4 @@
-.TH @G@EQN @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH @G@EQN @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 @g@eqn \- format equations for troff or MathML
 .
diff --git a/src/preproc/eqn/neqn.1.man b/src/preproc/eqn/neqn.1.man
index 795f51a..2017450 100644
--- a/src/preproc/eqn/neqn.1.man
+++ b/src/preproc/eqn/neqn.1.man
@@ -1,4 +1,4 @@
-.TH @G@NEQN @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH @G@NEQN @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 @g@neqn \- format equations for ascii output
 .
diff --git a/src/preproc/grn/grn.1.man b/src/preproc/grn/grn.1.man
index 0c016bc..73ce2f4 100644
--- a/src/preproc/grn/grn.1.man
+++ b/src/preproc/grn/grn.1.man
@@ -1,5 +1,5 @@
 '\" t
-.TH @G@GRN @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH @G@GRN @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 @g@grn \- groff preprocessor for gremlin files
 .
diff --git a/src/preproc/pic/pic.1.man b/src/preproc/pic/pic.1.man
index 2e92791..286345b 100644
--- a/src/preproc/pic/pic.1.man
+++ b/src/preproc/pic/pic.1.man
@@ -1,4 +1,4 @@
-.TH @G@PIC @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH @G@PIC @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 @g@pic \- compile pictures for troff or TeX
 .
diff --git a/src/preproc/preconv/preconv.1.man b/src/preproc/preconv/prec=
onv.1.man
index b3c6f8b..44273d8 100644
--- a/src/preproc/preconv/preconv.1.man
+++ b/src/preproc/preconv/preconv.1.man
@@ -1,4 +1,4 @@
-.TH PRECONV @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH PRECONV @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 preconv \- convert encoding of input files to something GNU troff unders=
tands
 .
diff --git a/src/preproc/refer/refer.1.man b/src/preproc/refer/refer.1.ma=
n
index 4278b5c..9adb212 100644
--- a/src/preproc/refer/refer.1.man
+++ b/src/preproc/refer/refer.1.man
@@ -1,4 +1,4 @@
-.TH @G@REFER @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH @G@REFER @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 @g@refer \- preprocess bibliographic references for groff
 .
diff --git a/src/preproc/soelim/soelim.1.man b/src/preproc/soelim/soelim.=
1.man
index 57f3673..e3a69d3 100644
--- a/src/preproc/soelim/soelim.1.man
+++ b/src/preproc/soelim/soelim.1.man
@@ -1,5 +1,5 @@
 '\" p
-.TH @G@SOELIM @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH @G@SOELIM @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 @g@soelim \- interpret .so requests in groff input
 .
diff --git a/src/preproc/tbl/tbl.1.man b/src/preproc/tbl/tbl.1.man
index 8bc1d06..3fdaee6 100644
--- a/src/preproc/tbl/tbl.1.man
+++ b/src/preproc/tbl/tbl.1.man
@@ -1,5 +1,5 @@
 '\" t
-.TH @G@TBL @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH @G@TBL @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 @g@tbl \- format tables for troff
 .
diff --git a/src/roff/groff/groff.1.man b/src/roff/groff/groff.1.man
index ca35d75..b965ffb 100644
--- a/src/roff/groff/groff.1.man
+++ b/src/roff/groff/groff.1.man
@@ -1,4 +1,4 @@
-.TH GROFF @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH GROFF @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 groff \- front-end for the groff document formatting system
 .
diff --git a/src/roff/grog/grog.1.man b/src/roff/grog/grog.1.man
index 5a4e43e..7b5565b 100644
--- a/src/roff/grog/grog.1.man
+++ b/src/roff/grog/grog.1.man
@@ -1,4 +1,4 @@
-.TH GROG @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH GROG @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 grog \- guess options for a following groff command
 .\" The .SH was moved to this place in order to appease 'apropos'.
diff --git a/src/roff/nroff/nroff.1.man b/src/roff/nroff/nroff.1.man
index 4d6b6bc..e070906 100644
--- a/src/roff/nroff/nroff.1.man
+++ b/src/roff/nroff/nroff.1.man
@@ -1,4 +1,4 @@
-.TH @G@NROFF @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH @G@NROFF @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 @g@nroff \- emulate nroff command with groff
 .
diff --git a/src/roff/troff/troff.1.man b/src/roff/troff/troff.1.man
index d667be1..7a54a84 100644
--- a/src/roff/troff/troff.1.man
+++ b/src/roff/troff/troff.1.man
@@ -1,5 +1,5 @@
 '\" t
-.TH @G@TROFF @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH @G@TROFF @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 @g@troff \- the troff processor of the groff text formatting system
 .
diff --git a/src/utils/addftinfo/addftinfo.1.man b/src/utils/addftinfo/ad=
dftinfo.1.man
index 7e09c68..60d7b1c 100644
--- a/src/utils/addftinfo/addftinfo.1.man
+++ b/src/utils/addftinfo/addftinfo.1.man
@@ -1,4 +1,4 @@
-.TH ADDFTINFO @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH ADDFTINFO @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 addftinfo \- add information to troff font files for use with groff
 .
diff --git a/src/utils/afmtodit/afmtodit.1.man b/src/utils/afmtodit/afmto=
dit.1.man
index 563b000..c7c1b69 100644
--- a/src/utils/afmtodit/afmtodit.1.man
+++ b/src/utils/afmtodit/afmtodit.1.man
@@ -1,4 +1,4 @@
-.TH AFMTODIT @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH AFMTODIT @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 afmtodit \- create font files for use with groff \-Tps and \-Tpdf
 .
diff --git a/src/utils/hpftodit/hpftodit.1.man b/src/utils/hpftodit/hpfto=
dit.1.man
index 6e14286..63dfefc 100644
--- a/src/utils/hpftodit/hpftodit.1.man
+++ b/src/utils/hpftodit/hpftodit.1.man
@@ -1,4 +1,4 @@
-.TH HPFTODIT @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH HPFTODIT @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 hpftodit \- create font description files for use with groff \-Tlj4
 .
diff --git a/src/utils/indxbib/indxbib.1.man b/src/utils/indxbib/indxbib.=
1.man
index 9d9e9d9..66aa17f 100644
--- a/src/utils/indxbib/indxbib.1.man
+++ b/src/utils/indxbib/indxbib.1.man
@@ -1,4 +1,4 @@
-.TH @G@INDXBIB @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH @G@INDXBIB @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 @g@indxbib \- make inverted index for bibliographic databases
 .
diff --git a/src/utils/lkbib/lkbib.1.man b/src/utils/lkbib/lkbib.1.man
index 966b988..2d87d39 100644
--- a/src/utils/lkbib/lkbib.1.man
+++ b/src/utils/lkbib/lkbib.1.man
@@ -1,4 +1,4 @@
-.TH LKBIB @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH LKBIB @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 lkbib \- search bibliographic databases
 .
diff --git a/src/utils/lookbib/lookbib.1.man b/src/utils/lookbib/lookbib.=
1.man
index e07884b..41c5200 100644
--- a/src/utils/lookbib/lookbib.1.man
+++ b/src/utils/lookbib/lookbib.1.man
@@ -1,4 +1,4 @@
-.TH @G@LOOKBIB @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH @G@LOOKBIB @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 @g@lookbib \- search bibliographic databases
 .
diff --git a/src/utils/pfbtops/pfbtops.1.man b/src/utils/pfbtops/pfbtops.=
1.man
index 6cd95ab..278aada 100644
--- a/src/utils/pfbtops/pfbtops.1.man
+++ b/src/utils/pfbtops/pfbtops.1.man
@@ -1,4 +1,4 @@
-.TH PFBTOPS @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH PFBTOPS @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 pfbtops \- translate a PostScript font in .pfb format to ASCII
 .
diff --git a/src/utils/tfmtodit/tfmtodit.1.man b/src/utils/tfmtodit/tfmto=
dit.1.man
index 62bfa74..e2dd871 100644
--- a/src/utils/tfmtodit/tfmtodit.1.man
+++ b/src/utils/tfmtodit/tfmtodit.1.man
@@ -1,4 +1,4 @@
-.TH TFMTODIT @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH TFMTODIT @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 tfmtodit \- create font files for use with groff \-Tdvi
 .
diff --git a/src/utils/xtotroff/xtotroff.1.man b/src/utils/xtotroff/xtotr=
off.1.man
index d48770d..d87d9af 100644
--- a/src/utils/xtotroff/xtotroff.1.man
+++ b/src/utils/xtotroff/xtotroff.1.man
@@ -1,4 +1,4 @@
-.TH XTOTROFF @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH XTOTROFF @MAN1EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 xtotroff \- convert X font metrics into GNU troff font metrics
 .
diff --git a/tmac/groff_man.7.man b/tmac/groff_man.7.man
index e9e64a9..80b4fbb 100644
--- a/tmac/groff_man.7.man
+++ b/tmac/groff_man.7.man
@@ -1,4 +1,4 @@
-.TH GROFF_MAN @MAN7EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH GROFF_MAN @MAN7EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 groff_man \- GNU roff macro package for formatting man pages
 .
diff --git a/tmac/groff_ms.7.man b/tmac/groff_ms.7.man
index b6dc65d..5c44c17 100644
--- a/tmac/groff_ms.7.man
+++ b/tmac/groff_ms.7.man
@@ -2,7 +2,7 @@
 .\" Save and disable compatibility mode (for, e.g., Solaris 10/11).
 .do nr groff_ms_C \n[.C]
 .cp 0
-.TH GROFF_MS @MAN7EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH GROFF_MS @MAN7EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 groff_ms \- GNU roff manuscript macro package for formatting documents
 .
diff --git a/tmac/groff_trace.7.man b/tmac/groff_trace.7.man
index b992a46..9aa5a02 100644
--- a/tmac/groff_trace.7.man
+++ b/tmac/groff_trace.7.man
@@ -1,4 +1,4 @@
-.TH GROFF_TRACE @MAN7EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH GROFF_TRACE @MAN7EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 groff_trace \- groff macro package trace.tmac
 .
diff --git a/tmac/groff_www.7.man b/tmac/groff_www.7.man
index 6a82620..002e240 100644
--- a/tmac/groff_www.7.man
+++ b/tmac/groff_www.7.man
@@ -1,4 +1,4 @@
-.TH GROFF_WWW @MAN7EXT@ "@MDATE@" "Groff Version @VERSION@"
+.TH GROFF_WWW @MAN7EXT@ "@MDATE@" "groff @VERSION@"
 .SH NAME
 groff_www \- groff macros for authoring web pages
 .


From MAILER-DAEMON Tue Apr 24 12:33:18 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1fB0sY-0003Ui-Fm
	for mharc-groff-commit@gnu.org; Tue, 24 Apr 2018 12:33:18 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:40800)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <deri@chuzzlewit.myzen.co.uk>) id 1fB0sW-0003SW-2Y
	for groff-commit@gnu.org; Tue, 24 Apr 2018 12:33:17 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <deri@chuzzlewit.myzen.co.uk>) id 1fB0sU-00012i-Ki
	for groff-commit@gnu.org; Tue, 24 Apr 2018 12:33:16 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:54963)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <deri@chuzzlewit.myzen.co.uk>) id 1fB0sU-00012a-Gh
	for groff-commit@gnu.org; Tue, 24 Apr 2018 12:33:14 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 126928)
	id 1D34C20A0A; Tue, 24 Apr 2018 12:33:14 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/01: Restrict scaling factors to 3dp and better handle
	CR/LF in import.
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: <20180424163313.1527.79236@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 1041a8139d9b872ba0576a4c5dc36fd789c4ed91
Auto-Submitted: auto-generated
Message-Id: <20180424163314.1D34C20A0A@vcs0.savannah.gnu.org>
Date: Tue, 24 Apr 2018 12:33:13 -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, 24 Apr 2018 16:33:17 -0000

deri pushed a commit to branch master
in repository groff.

commit 1041a8139d9b872ba0576a4c5dc36fd789c4ed91
Author: Deri James <deri@chuzzlewit.myzen.co.uk>
Date:   Tue Apr 24 17:29:40 2018 +0100

    Restrict scaling factors to 3dp and better handle CR/LF in import.
   =20
    * src/devices/gropdf/gropdf.pl: Restrict scaling factors to 3dp
    rounded. If pdf imported with pdfpic uses CR/LF line termination
    ibclude XObject Image, length of stream out by 1.
---
 ChangeLog                    |  8 ++++++++
 src/devices/gropdf/gropdf.pl | 22 ++++++++++++++--------
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 07cdac2..94aef28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2018-04-24  Deri James  <deri@chuzzlewit.myzen.co.uk>
+
+	Restrict scaling factors to 3dp and better handle CR/LF in imoport.
+
+	* src/devices/gropdf/gropdf.pl: Restrict scaling factors to 3dp
+	rounded. If pdf imported with pdfpic uses CR/LF line termination
+	ibclude XObject Image, length of stream out by 1.
+
 2018-04-23  G. Branden Robinson <g.branden.robinson@gmail.com>
=20
 	man pages: Shorten version footer.
diff --git a/src/devices/gropdf/gropdf.pl b/src/devices/gropdf/gropdf.pl
index 74f2b3b..f055839 100644
--- a/src/devices/gropdf/gropdf.pl
+++ b/src/devices/gropdf/gropdf.pl
@@ -1027,8 +1027,11 @@ sub do_x
 		    if ($fil=3D~m/\.pdf$/)
 		    {
 			my $bbox=3D$incfil{$fil}->[1];
-			my $xscale=3D$wid/($bbox->[2]-$bbox->[0]+1);
-			my $yscale=3D($hgt<=3D0)?$xscale:($hgt/($bbox->[3]-$bbox->[1]+1));
+			my $xscale=3Dd3($wid/($bbox->[2]-$bbox->[0]+1));
+			my $yscale=3Dd3(($hgt<=3D0)?$xscale:($hgt/($bbox->[3]-$bbox->[1]+1)))=
;
+			$wid=3D($bbox->[2]-$bbox->[0])*$xscale;
+			$hgt=3D($bbox->[3]-$bbox->[1])*$yscale;
+			$ypos+=3D$hgt;
 			$stream.=3D"q $xscale 0 0 $yscale ".PutXY($xpos,$ypos)." cm";
 			$stream.=3D" 0 1 -1 0 0 0 cm" if $rot;
 			$stream.=3D" /$incfil{$fil}->[0] Do Q\n";
@@ -1058,8 +1061,8 @@ sub do_x
 		    IsGraphic();
 		    my $bbox=3D$incfil{$fil}->[1];
 		    $wid=3D($bbox->[2]-$bbox->[0]) if $wid <=3D 0;
-		    my $xscale=3D$wid/($bbox->[2]-$bbox->[0]);
-		    my $yscale=3D($hgt<=3D0)?$xscale:($hgt/($bbox->[3]-$bbox->[1]));
+		    my $xscale=3Dd3($wid/($bbox->[2]-$bbox->[0]));
+		    my $yscale=3Dd3(($hgt<=3D0)?$xscale:($hgt/($bbox->[3]-$bbox->[1]))=
);
 		    $xscale=3D($wid<=3D0)?$yscale:$xscale;
 		    $xscale=3D$yscale if $yscale < $xscale;
 		    $yscale=3D$xscale if $xscale < $yscale;
@@ -1488,6 +1491,8 @@ sub LoadPDF
     my $curobj=3D-1;
     my $instream=3D0;
     my $cont;
+    my $adj=3D0;
+    my $keepsep=3D$/;
=20
     my ($PD,$PDnm)=3DOpenInc($pdfnm);
=20
@@ -1499,7 +1504,7 @@ sub LoadPDF
=20
     my $hdr=3D<$PD>;
=20
-    $/=3D"\r" if (length($hdr) > 10);
+    $/=3D"\r",$adj=3D1 if (length($hdr) > 10);
=20
     while (<$PD>)
     {
@@ -1538,7 +1543,7 @@ sub LoadPDF
 	{
 	    if ($curobj > -1)
 	    {
-		$pdf->[$curobj]->{STREAMPOS}=3D[tell($PD),$strmlen];
+		$pdf->[$curobj]->{STREAMPOS}=3D[tell($PD)+$adj,$strmlen];
 		seek($PD,$strmlen,1);
 		$instream=3D1;
 	    }
@@ -1622,8 +1627,8 @@ sub LoadPDF
     $BBox=3D[0,0,595,842] if !defined($BBox);
=20
     $wid=3D($BBox->[2]-$BBox->[0]+1) if $wid=3D=3D0;
-    my $xscale=3Dabs($wid)/($BBox->[2]-$BBox->[0]+1);
-    my $yscale=3D($hgt<=3D0)?$xscale:(abs($hgt)/($BBox->[3]-$BBox->[1]+1=
));
+    my $xscale=3Dd3(abs($wid)/($BBox->[2]-$BBox->[0]+1));
+    my $yscale=3Dd3(($hgt<=3D0)?$xscale:(abs($hgt)/($BBox->[3]-$BBox->[1=
]+1)));
     $hgt=3D($BBox->[3]-$BBox->[1]+1)*$yscale;
=20
     if ($type eq "import")
@@ -1657,6 +1662,7 @@ sub LoadPDF
=20
     BuildStream($xobj,$pdf,$pdf->[$page]->{OBJ}->{Contents});
=20
+    $/=3D$keepsep;
     return([$xonm,$BBox] );
 }
=20


From MAILER-DAEMON Tue Apr 24 17:56:03 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1fB5ut-00012H-Ed
	for mharc-groff-commit@gnu.org; Tue, 24 Apr 2018 17:56:03 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:35399)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fB5uq-000124-PB
	for groff-commit@gnu.org; Tue, 24 Apr 2018 17:56:01 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fB5uq-0002JA-0k
	for groff-commit@gnu.org; Tue, 24 Apr 2018 17:56:00 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:57965)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fB5up-0002J6-TC
	for groff-commit@gnu.org; Tue, 24 Apr 2018 17:55:59 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id A76852049C; Tue, 24 Apr 2018 17:55:59 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 02/02: doc/groff.texi: Bump copyright range end to 2018.
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: <20180424215558.31936.70890@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 6536a16adc56b0827a2bda07661181b5011118b9
Auto-Submitted: auto-generated
Message-Id: <20180424215559.A76852049C@vcs0.savannah.gnu.org>
Date: Tue, 24 Apr 2018 17:55: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: Tue, 24 Apr 2018 21:56:01 -0000

gbranden pushed a commit to branch master
in repository groff.

commit 6536a16adc56b0827a2bda07661181b5011118b9
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Tue Apr 24 17:53:58 2018 -0400

    doc/groff.texi: Bump copyright range end to 2018.
   =20
    Werner added substantial text this year about hyphenation.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 ChangeLog      | 9 +++++++--
 doc/groff.texi | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index eba85bc..c6e63f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2018-04-24  G. Branden Robinson <g.branden.robinson@gmail.com>
=20
+	* doc/groff.texi: Bump end of copyright range to 2018.  Werner
+	  added substantial text this year about hyphenation.
+
+2018-04-24  G. Branden Robinson <g.branden.robinson@gmail.com>
+
 	Set version to 1.22.4 in the few places that hard-code it.
=20
 	arch/mingw/grap2graph.cmd:
@@ -22,8 +27,8 @@
=20
 	* **/*.man: Replace "Groff Version" with "groff" in the fourth
 	  argument to .TH in all man pages.  This suffices to keep that
-	  part of the footer from overruning the date, even in dirty
-	  trees.
+	  part of the footer from overrunning the date, even in dirty
+	  trees on 80-column terminals.
=20
 	Fixes https://savannah.gnu.org/bugs/index.php?53721.
=20
diff --git a/doc/groff.texi b/doc/groff.texi
index 47fcae8..1be8f0b 100644
--- a/doc/groff.texi
+++ b/doc/groff.texi
@@ -26,7 +26,7 @@
 @copying
 This manual documents GNU @code{troff} version 1.22.4.
=20
-Copyright @copyright{} 1994--2014 Free Software Foundation, Inc.
+Copyright @copyright{} 1994--2018 Free Software Foundation, Inc.
=20
 @quotation
 Permission is granted to copy, distribute and/or modify this document


From MAILER-DAEMON Tue Apr 24 17:56:03 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1fB5ut-00012S-Hs
	for mharc-groff-commit@gnu.org; Tue, 24 Apr 2018 17:56:03 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:35402)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fB5ur-000125-08
	for groff-commit@gnu.org; Tue, 24 Apr 2018 17:56:02 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fB5up-0002J2-Rm
	for groff-commit@gnu.org; Tue, 24 Apr 2018 17:56:01 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:57964)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fB5up-0002Iw-OC
	for groff-commit@gnu.org; Tue, 24 Apr 2018 17:55:59 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id 7843E2049C; Tue, 24 Apr 2018 17:55:59 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/02: Set version to 1.22.4 in places that hard-code it.
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: <20180424215558.31936.70890@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 53607735d944e779e7208c66229c47efeed7c8c6
Auto-Submitted: auto-generated
Message-Id: <20180424215559.7843E2049C@vcs0.savannah.gnu.org>
Date: Tue, 24 Apr 2018 17:55:58 -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: Tue, 24 Apr 2018 21:56:02 -0000

gbranden pushed a commit to branch master
in repository groff.

commit 53607735d944e779e7208c66229c47efeed7c8c6
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Tue Apr 24 17:51:51 2018 -0400

    Set version to 1.22.4 in places that hard-code it.
   =20
    arch/mingw/grap2graph.cmd:
    contrib/groffer/version.sh:
    doc/groff.texi:
    doc/webpage.ms:
    * Bump from 1.22.3 to 1.22.4.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 ChangeLog                  | 10 ++++++++++
 arch/mingw/grap2graph.cmd  |  2 +-
 contrib/groffer/ChangeLog  |  4 ++++
 contrib/groffer/version.sh |  2 +-
 doc/groff.texi             |  2 +-
 doc/webpage.ms             |  2 +-
 6 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 94aef28..eba85bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2018-04-24  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+	Set version to 1.22.4 in the few places that hard-code it.
+
+	arch/mingw/grap2graph.cmd:
+	contrib/groffer/version.sh:
+	doc/groff.texi:
+	doc/webpage.ms:
+	* Bump from 1.22.3 to 1.22.4.
+
 2018-04-24  Deri James  <deri@chuzzlewit.myzen.co.uk>
=20
 	Restrict scaling factors to 3dp and better handle CR/LF in imoport.
diff --git a/arch/mingw/grap2graph.cmd b/arch/mingw/grap2graph.cmd
index 84f4085..6b26cc9 100644
--- a/arch/mingw/grap2graph.cmd
+++ b/arch/mingw/grap2graph.cmd
@@ -75,7 +75,7 @@ rm -rf %tdir%
 goto end
=20
 :version
-echo GNU grap2graph (groff) version 1.22.3
+echo GNU grap2graph (groff) version 1.22.4
 goto end
=20
 :usage
diff --git a/contrib/groffer/ChangeLog b/contrib/groffer/ChangeLog
index 9087ea4..7644706 100644
--- a/contrib/groffer/ChangeLog
+++ b/contrib/groffer/ChangeLog
@@ -1,3 +1,7 @@
+2018-04-24  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+	* version.sh (_GROFF_VERSION_PRESET): Set to 1.22.4.
+
 2018-02-28  Werner LEMBERG  <wl@gnu.org>
=20
 	* groffer.am (groffer): Use $(AM_V_GEN) to silence file generation.
diff --git a/contrib/groffer/version.sh b/contrib/groffer/version.sh
index 3235e15..4d62479 100644
--- a/contrib/groffer/version.sh
+++ b/contrib/groffer/version.sh
@@ -31,4 +31,4 @@ _PROGRAM_VERSION=3D'2.2.5';
 # this setting of the groff version is only used before make is run,
 # otherwise @VERSION@ will set it, see groffer.sh.
 export _GROFF_VERSION_PRESET;
-_GROFF_VERSION_PRESET=3D'1.22.3';
+_GROFF_VERSION_PRESET=3D'1.22.4';
diff --git a/doc/groff.texi b/doc/groff.texi
index 4cd633a..47fcae8 100644
--- a/doc/groff.texi
+++ b/doc/groff.texi
@@ -24,7 +24,7 @@
=20
=20
 @copying
-This manual documents GNU @code{troff} version 1.22.3.
+This manual documents GNU @code{troff} version 1.22.4.
=20
 Copyright @copyright{} 1994--2014 Free Software Foundation, Inc.
=20
diff --git a/doc/webpage.ms b/doc/webpage.ms
index 88a883c..8b0a46d 100644
--- a/doc/webpage.ms
+++ b/doc/webpage.ms
@@ -82,7 +82,7 @@ and its mirrors;
 the current development version is available from a
 .URL "https://\:savannah.gnu.org/\:git/\:?group=3Dgroff" "git repository=
" .
 .
-The current version is 1.22.3 (04-Nov-2014).
+The current version is 1.22.4 (Spring 2018).
=20
 To view the git repository in your browser, use
 .URL "http://\:git.savannah.gnu.org/\:cgit/\:groff.git" \


From MAILER-DAEMON Tue Apr 24 18:18:11 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1fB6GJ-0000ti-2D
	for mharc-groff-commit@gnu.org; Tue, 24 Apr 2018 18:18:11 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:40167)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fB6GD-0000s3-UD
	for groff-commit@gnu.org; Tue, 24 Apr 2018 18:18:09 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fB6GC-00006R-Sj
	for groff-commit@gnu.org; Tue, 24 Apr 2018 18:18:05 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:58124)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fB6GC-00006K-OW
	for groff-commit@gnu.org; Tue, 24 Apr 2018 18:18:04 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id 690CF2049C; Tue, 24 Apr 2018 18:18:04 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/01: groffer: Bump version to 2.3.0.
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: <20180424221803.10163.18000@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 93f1a2060c11daf36d9b7099ef2720d644937451
Auto-Submitted: auto-generated
Message-Id: <20180424221804.690CF2049C@vcs0.savannah.gnu.org>
Date: Tue, 24 Apr 2018 18:18:04 -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: Tue, 24 Apr 2018 22:18:09 -0000

gbranden pushed a commit to branch master
in repository groff.

commit 93f1a2060c11daf36d9b7099ef2720d644937451
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Tue Apr 24 18:07:49 2018 -0400

    groffer: Bump version to 2.3.0.
   =20
    This reflects Bernd's addition of the xhtml device/mode feature in 20=
15.
    This change extended the interface of the groffer program
    (backwards-compatibly) e.g., by adding the '--xhtml' option.
   =20
    Also give groffer a NEWS item since this wasn't done at the time.
    Interface changes seem to warrant one.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 NEWS                       | 3 +++
 contrib/groffer/ChangeLog  | 8 ++++++++
 contrib/groffer/version.sh | 2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 06d868a..559f9d6 100644
--- a/NEWS
+++ b/NEWS
@@ -60,6 +60,9 @@ o pic2graph now attempts to adapt to very old installed=
 versions of the
   results on versions that _do_ support "-trim") is used.  pic2graph emi=
ts a
   warning to standard error if the search fails and the old method is us=
ed.
=20
+o groffer now supports the output of XHTML.  Use the "--xhtml" or
+  "--mode=3Dxhtml" command-line options to generate it.
+
 VERSION 1.22.3
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=20
diff --git a/contrib/groffer/ChangeLog b/contrib/groffer/ChangeLog
index 7644706..4f48a88 100644
--- a/contrib/groffer/ChangeLog
+++ b/contrib/groffer/ChangeLog
@@ -1,5 +1,13 @@
 2018-04-24  G. Branden Robinson <g.branden.robinson@gmail.com>
=20
+	* version.sh: Bump groffer version to 2.3.0, reflecting Bernd's
+	  addition of the xhtml device/mode feature in 2015.  This
+	  change extended the interface of the groffer
+	  program--backwards-compatibly--e.g., by adding the '--xhtml'
+	  option.
+
+2018-04-24  G. Branden Robinson <g.branden.robinson@gmail.com>
+
 	* version.sh (_GROFF_VERSION_PRESET): Set to 1.22.4.
=20
 2018-02-28  Werner LEMBERG  <wl@gnu.org>
diff --git a/contrib/groffer/version.sh b/contrib/groffer/version.sh
index 4d62479..6a8e623 100644
--- a/contrib/groffer/version.sh
+++ b/contrib/groffer/version.sh
@@ -26,7 +26,7 @@
 ########################################################################
=20
 export _PROGRAM_VERSION;
-_PROGRAM_VERSION=3D'2.2.5';
+_PROGRAM_VERSION=3D'2.3.0';
=20
 # this setting of the groff version is only used before make is run,
 # otherwise @VERSION@ will set it, see groffer.sh.


From MAILER-DAEMON Wed Apr 25 10:21:24 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1fBLIS-0004CO-P9
	for mharc-groff-commit@gnu.org; Wed, 25 Apr 2018 10:21:24 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:57079)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fBLIO-00049l-07
	for groff-commit@gnu.org; Wed, 25 Apr 2018 10:21:21 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fBLIN-0000ZX-0V
	for groff-commit@gnu.org; Wed, 25 Apr 2018 10:21:19 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:38022)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fBLIM-0000ZD-TS
	for groff-commit@gnu.org; Wed, 25 Apr 2018 10:21:18 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id CB64520856; Wed, 25 Apr 2018 10:21:18 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 03/03: pic2graph: Refactor temp directory handling.
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: <20180425142117.4508.9661@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: b1cd3b77a48f56c319b8642234f39b21e260e0c3
Auto-Submitted: auto-generated
Message-Id: <20180425142118.CB64520856@vcs0.savannah.gnu.org>
Date: Wed, 25 Apr 2018 10:21:18 -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, 25 Apr 2018 14:21:21 -0000

gbranden pushed a commit to branch master
in repository groff.

commit b1cd3b77a48f56c319b8642234f39b21e260e0c3
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Wed Apr 25 10:18:44 2018 -0400

    pic2graph: Refactor temp directory handling.
   =20
    contrib/pic2graph/pic2graph.sh: Issue a diagnostic and give up if the
    user's desired temporary directory does not exist.  Also document the
    Bashism $RANDOM and work around its absence.
   =20
    The work-around is crap entropy but slightly better than a null strin=
g
    (/bin/dash's $RANDOM), and at this point in the logic we're already o=
n a
    system where the mktemp command is not installed, doesn't support the
    flags we need, or doesn't work.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 ChangeLog                      |  8 ++++++++
 contrib/pic2graph/pic2graph.sh | 37 +++++++++++++++++++++++++-----------=
-
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 548a70e..29564d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2018-04-25  G. Branden Robinson <g.branden.robinson@gmail.com>
=20
+	pic2graph: Refactor temp directory handling.
+
+	contrib/pic2graph/pic2graph.sh: Issue a diagnostic and give up
+	if the user's desired temporary directory does not exist.  Also
+	document the Bashism $RANDOM and work around its absence.
+
+2018-04-25  G. Branden Robinson <g.branden.robinson@gmail.com>
+
 	pic2graph: Handle embedded whitespace in temp dir.
=20
 	contrib/pic2graph/pic2graph.sh: Quote shell variables having to
diff --git a/contrib/pic2graph/pic2graph.sh b/contrib/pic2graph/pic2graph=
.sh
index 97b486e..b229914 100644
--- a/contrib/pic2graph/pic2graph.sh
+++ b/contrib/pic2graph/pic2graph.sh
@@ -68,20 +68,33 @@ fi
=20
 # create temporary directory
 tmp=3D
-for d in "$GROFF_TMPDIR" "$TMPDIR" "$TMP" "$TEMP" /tmp; do
-    test -z "$d" && continue
+for d in "$GROFF_TMPDIR" "$TMPDIR" "$TMP" "$TEMP" /tmp
+do
+    test -n "$d" && break
+done
+
+if ! test -d "$d"
+then
+    echo "$0: error: temporary directory \"$d\" does not exist or is" \
+        "not a directory" >&2
+    exit 1
+fi
=20
-    tmp=3D`(umask 077 && mktemp -d -q "$d/pic2graph-XXXXXX") 2> /dev/nul=
l` \
-    && test -n "$tmp" && test -d "$tmp" \
-    && break
+if ! tmp=3D`(umask 077 && mktemp -d -q "$d/pic2graph-XXXXXX") 2> /dev/nu=
ll`
+then
+    # mktemp failed--not installed or is a version that doesn't support =
those
+    # flags?  Fall back to older method which uses more predictable nami=
ng.
+    #
+    # $RANDOM is a Bashism.  The fallback of $PPID is not good pseudoran=
domness,
+    # but is supported by the stripped-down dash shell, for instance.
+    tmp=3D"$d/pic2graph$$-${RANDOM:-$PPID}"
+    (umask 077 && mkdir "$tmp") 2> /dev/null
+fi
=20
-    tmp=3D"$d/pic2graph$$-$RANDOM"
-    (umask 077 && mkdir "$tmp") 2> /dev/null \
-    && break
-done;
-if test -z "$tmp"; then
-    echo "$0: cannot create temporary directory" >&2
-    { (exit 1); exit 1; }
+if ! test -d "$tmp"
+then
+    echo "$0: error: cannot create temporary directory \"$tmp\"" >&2
+    exit 1
 fi
=20
 # See if the installed version of convert(1) is new enough to support th=
e -trim


From MAILER-DAEMON Wed Apr 25 10:21:25 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1fBLIT-0004D3-9s
	for mharc-groff-commit@gnu.org; Wed, 25 Apr 2018 10:21:25 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:57072)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fBLIN-00049S-JZ
	for groff-commit@gnu.org; Wed, 25 Apr 2018 10:21:20 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fBLIM-0000Yt-RM
	for groff-commit@gnu.org; Wed, 25 Apr 2018 10:21:19 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:38020)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fBLIM-0000YQ-OA
	for groff-commit@gnu.org; Wed, 25 Apr 2018 10:21:18 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id 951222086E; Wed, 25 Apr 2018 10:21:18 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 02/03: pic2graph(1): Document -v option.
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: <20180425142117.4508.9661@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 720a45e7dda716a6e295cf4176d5a5b69811318d
Auto-Submitted: auto-generated
Message-Id: <20180425142118.951222086E@vcs0.savannah.gnu.org>
Date: Wed, 25 Apr 2018 10:21:18 -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, 25 Apr 2018 14:21:21 -0000

gbranden pushed a commit to branch master
in repository groff.

commit 720a45e7dda716a6e295cf4176d5a5b69811318d
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Wed Apr 25 09:20:51 2018 -0400

    pic2graph(1): Document -v option.
   =20
    Also use .SY more idiomatically when documenting --help, -v, --versio=
n.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 contrib/pic2graph/pic2graph.1.man | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/contrib/pic2graph/pic2graph.1.man b/contrib/pic2graph/pic2gr=
aph.1.man
index 081b0b1..7f0a560 100644
--- a/contrib/pic2graph/pic2graph.1.man
+++ b/contrib/pic2graph/pic2graph.1.man
@@ -21,8 +21,10 @@ pic2graph \- convert a PIC diagram into a cropped imag=
e
 .RI [ \%convert-arguments ]
 .YS
 .
-.SY "pic2graph \-\-help"
-.SY "pic2graph \-\-version"
+.SY pic2graph
+.B \-\-help
+.SY pic2graph
+.RB { \-v | \-\-version }
 .YS
 .
 .
@@ -139,6 +141,8 @@ Display a brief usage message and exit.
 .
 .
 .TP
+.B \-v
+.TQ
 .B \-\-version
 Display
 .IR pic2graph 's


From MAILER-DAEMON Wed Apr 25 10:21:25 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1fBLIT-0004DR-GD
	for mharc-groff-commit@gnu.org; Wed, 25 Apr 2018 10:21:25 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:57082)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fBLIO-0004A0-6w
	for groff-commit@gnu.org; Wed, 25 Apr 2018 10:21:21 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fBLIM-0000Yz-SP
	for groff-commit@gnu.org; Wed, 25 Apr 2018 10:21:20 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:38018)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fBLIM-0000YM-O1
	for groff-commit@gnu.org; Wed, 25 Apr 2018 10:21:18 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id 6A4B520856; Wed, 25 Apr 2018 10:21:18 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/03: pic2graph: Handle embedded whitespace in temp dir.
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: <20180425142117.4508.9661@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 266bf8ff4f80024710462d6996cae2db97406c3b
Auto-Submitted: auto-generated
Message-Id: <20180425142118.6A4B520856@vcs0.savannah.gnu.org>
Date: Wed, 25 Apr 2018 10:21: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: Wed, 25 Apr 2018 14:21:21 -0000

gbranden pushed a commit to branch master
in repository groff.

commit 266bf8ff4f80024710462d6996cae2db97406c3b
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Wed Apr 25 00:34:44 2018 -0400

    pic2graph: Handle embedded whitespace in temp dir.
   =20
    contrib/pic2graph/pic2graph.sh: Quote shell variables having to do wi=
th
    the temporary directory's location; without quotation, temporary
    directory names with embedded whitespace are wrongly handled.
   =20
    Test case:
      GROFF_TMPDIR=3D"/tmp/My Documents" ./build/pic2graph < pic >| pic.p=
ng
   =20
    Not all shell variables should be quoted, especially not blindly, but
    this one should be.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 ChangeLog                      |  9 +++++++++
 contrib/pic2graph/pic2graph.sh | 14 +++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c6e63f1..548a70e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2018-04-25  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+	pic2graph: Handle embedded whitespace in temp dir.
+
+	contrib/pic2graph/pic2graph.sh: Quote shell variables having to
+	do with the temporary directory's location; without quotation,
+	temporary directory names with embedded whitespace are wrongly
+	handled.
+
 2018-04-24  G. Branden Robinson <g.branden.robinson@gmail.com>
=20
 	* doc/groff.texi: Bump end of copyright range to 2018.  Werner
diff --git a/contrib/pic2graph/pic2graph.sh b/contrib/pic2graph/pic2graph=
.sh
index 7773b26..97b486e 100644
--- a/contrib/pic2graph/pic2graph.sh
+++ b/contrib/pic2graph/pic2graph.sh
@@ -75,8 +75,8 @@ for d in "$GROFF_TMPDIR" "$TMPDIR" "$TMP" "$TEMP" /tmp;=
 do
     && test -n "$tmp" && test -d "$tmp" \
     && break
=20
-    tmp=3D$d/pic2graph$$-$RANDOM
-    (umask 077 && mkdir $tmp) 2> /dev/null \
+    tmp=3D"$d/pic2graph$$-$RANDOM"
+    (umask 077 && mkdir "$tmp") 2> /dev/null \
     && break
 done;
 if test -z "$tmp"; then
@@ -93,7 +93,7 @@ then
     convert_trim_arg=3D"-crop 0x0"
 fi
=20
-trap 'exit_status=3D$?; rm -rf $tmp && exit $exit_status' EXIT INT TERM
+trap 'exit_status=3D$?; rm -rf "$tmp" && exit $exit_status' EXIT INT TER=
M
=20
 # Here goes:
 # 1. Wrap the input in dummy .PS/PE macros (and add possibly null .EQ/.E=
N)
@@ -101,9 +101,9 @@ trap 'exit_status=3D$?; rm -rf $tmp && exit $exit_sta=
tus' EXIT INT TERM
 # 3. Process through groff to emit Postscript.
 # 4. Use convert(1) to crop the PostScript and turn it into a bitmap.
 (echo ".EQ"; echo $eqndelim; echo ".EN"; echo ".PS"; cat; echo ".PE") | =
\
-    groff -e -p $groffpic_opts -Tps -P-pletter > $tmp/pic2graph.ps \
-    && convert $convert_trim_arg $convert_opts $tmp/pic2graph.ps \
-       $tmp/pic2graph.$format \
-    && cat $tmp/pic2graph.$format
+    groff -e -p $groffpic_opts -Tps -P-pletter > "$tmp"/pic2graph.ps \
+    && convert $convert_trim_arg $convert_opts "$tmp"/pic2graph.ps \
+       "$tmp"/pic2graph.$format \
+    && cat "$tmp"/pic2graph.$format
=20
 # End


From MAILER-DAEMON Thu Apr 26 04:29:34 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1fBcHW-00060Y-7Z
	for mharc-groff-commit@gnu.org; Thu, 26 Apr 2018 04:29:34 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:38048)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fBcHU-0005zI-L2
	for groff-commit@gnu.org; Thu, 26 Apr 2018 04:29:33 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fBcHT-0004rz-Tq
	for groff-commit@gnu.org; Thu, 26 Apr 2018 04:29:32 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:46880)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fBcHT-0004rt-QJ
	for groff-commit@gnu.org; Thu, 26 Apr 2018 04:29:31 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id B3FD62049B; Thu, 26 Apr 2018 04:29:31 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 03/04: eqn2graph(1), pic2graph(1): Fix doubled word.
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: <20180426082930.26434.12335@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: d253e6c0ea7e0db177a076c33b3ca3a8633bce5c
Auto-Submitted: auto-generated
Message-Id: <20180426082931.B3FD62049B@vcs0.savannah.gnu.org>
Date: Thu, 26 Apr 2018 04:29:31 -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 Apr 2018 08:29:33 -0000

gbranden pushed a commit to branch master
in repository groff.

commit d253e6c0ea7e0db177a076c33b3ca3a8633bce5c
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Thu Apr 26 04:14:17 2018 -0400

    eqn2graph(1), pic2graph(1): Fix doubled word.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 contrib/eqn2graph/eqn2graph.1.man | 2 +-
 contrib/pic2graph/pic2graph.1.man | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/eqn2graph/eqn2graph.1.man b/contrib/eqn2graph/eqn2gr=
aph.1.man
index cd27ced..afe57c6 100644
--- a/contrib/eqn2graph/eqn2graph.1.man
+++ b/contrib/eqn2graph/eqn2graph.1.man
@@ -34,7 +34,7 @@ eqn2graph \- convert an EQN equation into a cropped ima=
ge
 .I eqn2graph
 reads a one-line
 .BR @g@eqn (@MAN1EXT@)
-equation from the standard input and and writes an image file,
+equation from the standard input and writes an image file,
 by default in Portable Network Graphics (PNG) format,
 to the standard output.
 .
diff --git a/contrib/pic2graph/pic2graph.1.man b/contrib/pic2graph/pic2gr=
aph.1.man
index 516e6a6..00e5dee 100644
--- a/contrib/pic2graph/pic2graph.1.man
+++ b/contrib/pic2graph/pic2graph.1.man
@@ -35,7 +35,7 @@ pic2graph \- convert a PIC diagram into a cropped image
 .I pic2graph
 reads a
 .BR @g@pic (@MAN1EXT@)
-program from the standard input and and writes an image file,
+program from the standard input and writes an image file,
 by default in Portable Network Graphics (PNG) format,
 to the standard output.
 .


From MAILER-DAEMON Thu Apr 26 04:29:36 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1fBcHY-00062U-CO
	for mharc-groff-commit@gnu.org; Thu, 26 Apr 2018 04:29:36 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:38046)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fBcHU-0005zC-FG
	for groff-commit@gnu.org; Thu, 26 Apr 2018 04:29:33 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fBcHT-0004ri-K8
	for groff-commit@gnu.org; Thu, 26 Apr 2018 04:29:32 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:46877)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fBcHT-0004rc-GU
	for groff-commit@gnu.org; Thu, 26 Apr 2018 04:29:31 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id 45D0E2049B; Thu, 26 Apr 2018 04:29:31 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 01/04: pic2graph(1): Fix style nit.
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: <20180426082930.26434.12335@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 34c5e51f9f070fea9e1a0010808e87770fbf4c95
Auto-Submitted: auto-generated
Message-Id: <20180426082931.45D0E2049B@vcs0.savannah.gnu.org>
Date: Thu, 26 Apr 2018 04:29:31 -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 Apr 2018 08:29:33 -0000

gbranden pushed a commit to branch master
in repository groff.

commit 34c5e51f9f070fea9e1a0010808e87770fbf4c95
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Wed Apr 25 10:33:04 2018 -0400

    pic2graph(1): Fix style nit.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 contrib/pic2graph/pic2graph.1.man | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contrib/pic2graph/pic2graph.1.man b/contrib/pic2graph/pic2gr=
aph.1.man
index 7f0a560..516e6a6 100644
--- a/contrib/pic2graph/pic2graph.1.man
+++ b/contrib/pic2graph/pic2graph.1.man
@@ -172,6 +172,7 @@ is used.
 .\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 .SH AUTHORS
 .\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+.
 .I pic2graph
 was written by
 .MT esr@\:thyrsus.com


From MAILER-DAEMON Thu Apr 26 04:29:36 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1fBcHY-00062g-K6
	for mharc-groff-commit@gnu.org; Thu, 26 Apr 2018 04:29:36 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:38062)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fBcHV-0005zl-8p
	for groff-commit@gnu.org; Thu, 26 Apr 2018 04:29:34 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fBcHU-0004sA-37
	for groff-commit@gnu.org; Thu, 26 Apr 2018 04:29:33 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:46882)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fBcHT-0004s6-VS
	for groff-commit@gnu.org; Thu, 26 Apr 2018 04:29:32 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id DAACA2049B; Thu, 26 Apr 2018 04:29:31 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 04/04: eqn2graph: Remove -unsafe option.
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: <20180426082930.26434.12335@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 3fa04f3e60bebfdcf968f573e6b46e6236a55789
Auto-Submitted: auto-generated
Message-Id: <20180426082931.DAACA2049B@vcs0.savannah.gnu.org>
Date: Thu, 26 Apr 2018 04:29:31 -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 Apr 2018 08:29:34 -0000

gbranden pushed a commit to branch master
in repository groff.

commit 3fa04f3e60bebfdcf968f573e6b46e6236a55789
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Thu Apr 26 04:27:43 2018 -0400

    eqn2graph: Remove -unsafe option.
   =20
    contrib/eqn2graph/eqn2graph.sh:
    * Unrecognize "-unsafe" option and eliminate $groff_opts
    variable.  As far as I can tell, this option had no effect
    because (1) pic is not run on the input stream (no -p argument
    to groff); (2) eqn doesn't support "shelling out" as pic does;
    and (3) there is no way to embed *roff requests inside a
    sequence of eqn commands.  If I'm wrong, let me know.
   =20
    contrib/eqn2graph/eqn2graph.1.man:
    * Undocument "-unsafe" option.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 ChangeLog                         | 15 +++++++++++++++
 NEWS                              |  2 ++
 contrib/eqn2graph/eqn2graph.1.man | 18 ------------------
 contrib/eqn2graph/eqn2graph.sh    | 12 +++---------
 4 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9b9d7c9..18edd8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
 2018-04-26  G. Branden Robinson <g.branden.robinson@gmail.com>
=20
+	eqn2graph: Remove -unsafe option.
+
+	contrib/eqn2graph/eqn2graph.sh:
+	* Unrecognize "-unsafe" option and eliminate $groff_opts
+	variable.  As far as I can tell, this option had no effect
+	because (1) pic is not run on the input stream (no -p argument
+	to groff); (2) eqn doesn't support "shelling out" as pic does;
+	and (3) there is no way to embed *roff requests inside a
+	sequence of eqn commands.  If I'm wrong, let me know.
+
+	contrib/eqn2graph/eqn2graph.1.man:
+	* Undocument "-unsafe" option.
+
+2018-04-26  G. Branden Robinson <g.branden.robinson@gmail.com>
+
 	eqn2graph: Parallelize changes with pic2graph.
=20
 	contrib/eqn2graph/eqn2graph.sh:
diff --git a/NEWS b/NEWS
index 4d9ad17..d3c7fc2 100644
--- a/NEWS
+++ b/NEWS
@@ -61,6 +61,8 @@ o eqn2graph and pic2graph now attempt to adapt to very =
old installed
   programs emit a warning to standard error if the search fails and the =
old
   method is used.
=20
+o eqn2graph no longer supports the "-unsafe" option.  It did nothing.
+
 o groffer now supports the output of XHTML.  Use the "--xhtml" or
   "--mode=3Dxhtml" command-line options to generate it.
=20
diff --git a/contrib/eqn2graph/eqn2graph.1.man b/contrib/eqn2graph/eqn2gr=
aph.1.man
index afe57c6..f9bd344 100644
--- a/contrib/eqn2graph/eqn2graph.1.man
+++ b/contrib/eqn2graph/eqn2graph.1.man
@@ -15,7 +15,6 @@ eqn2graph \- convert an EQN equation into a cropped ima=
ge
 .\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 .
 .SY eqn2graph
-.OP \-unsafe
 .OP \-format output-format
 .RI [ \%convert-arguments ]
 .YS
@@ -86,23 +85,6 @@ pixels.
 .\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 .
 .TP
-.B \-unsafe
-Run
-.I groff
-in
-.I unsafe
-mode, enabling the
-.I PIC
-command
-.B sh
-to execute arbitrary Unix shell commands.
-.
-The
-.I groff
-default is to forbid this.
-.
-.
-.TP
 .BI "\-format " output-format
 Write the image in
 .IR output-format ,
diff --git a/contrib/eqn2graph/eqn2graph.sh b/contrib/eqn2graph/eqn2graph=
.sh
index daa8517..620dd37 100644
--- a/contrib/eqn2graph/eqn2graph.sh
+++ b/contrib/eqn2graph/eqn2graph.sh
@@ -8,7 +8,6 @@
 #
 # Take an eqn equation on stdin, emit cropped bitmap on stdout.
 # The eqn markup should *not* be wrapped in .EQ/.EN, this script will do=
 that.
-# A -U option on the command line enables gpic/groff "unsafe" mode.
 # A -format FOO option changes the image output format to any format
 # supported by convert(1).  All other options are passed to convert(1).
 # The default format is PNG.
@@ -25,14 +24,11 @@
 #
 # 1. None of the options of eqn(1) are relevant.
 #
-# 2. Only the -U option of groff(1) is relevant.
-#
-# 3. Many options of convert(1) are potentially relevant, (especially=20
+# 2. Many options of convert(1) are potentially relevant, (especially
 # -density, -interlace, -transparency, -border, and -comment).
 #
-# Thus, we pass -U to groff(1), and everything else to convert(1).
+# Thus, we pass everything except -format to convert(1).
 #
-groff_opts=3D""
 convert_opts=3D""
 convert_trim_arg=3D"-trim"
 format=3D"png"
@@ -40,8 +36,6 @@ format=3D"png"
 while [ "$1" ]
 do
     case $1 in
-    -unsafe)
-	groff_opts=3D"-U";;
     -format)
 	format=3D$2
 	shift;;
@@ -106,7 +100,7 @@ trap 'exit_status=3D$?; rm -rf "$tmp" && exit $exit_s=
tatus' EXIT INT TERM
 # 4. Use convert(1) to crop the Postscript and turn it into a bitmap.
 read equation
 (echo ".EQ"; echo 'delim $$'; echo ".EN"; echo '$'"$equation"'$') | \
-	groff -e $groff_opts -Tps -P-pletter > "$tmp"/eqn2graph.ps \
+	groff -e -Tps -P-pletter > "$tmp"/eqn2graph.ps \
 	&& convert $convert_trim_arg $convert_opts "$tmp"/eqn2graph.ps \
 	   "$tmp"/eqn2graph.$format \
 	&& cat "$tmp"/eqn2graph.$format


From MAILER-DAEMON Thu Apr 26 04:29:37 2018
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1fBcHY-000630-QF
	for mharc-groff-commit@gnu.org; Thu, 26 Apr 2018 04:29:36 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:38068)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fBcHV-00060J-SI
	for groff-commit@gnu.org; Thu, 26 Apr 2018 04:29:35 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fBcHT-0004rq-QZ
	for groff-commit@gnu.org; Thu, 26 Apr 2018 04:29:33 -0400
Received: from vcs0.savannah.gnu.org ([208.118.235.201]:46878)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <g.branden.robinson@gmail.com>) id 1fBcHT-0004rm-Ll
	for groff-commit@gnu.org; Thu, 26 Apr 2018 04:29:31 -0400
Received: by vcs0.savannah.gnu.org (Postfix, from userid 143018)
	id 910AD2049B; Thu, 26 Apr 2018 04:29:31 -0400 (EDT)
To: groff-commit@gnu.org
Subject: [groff] 02/04: eqn2graph: Parallelize changes with pic2graph.
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: <20180426082930.26434.12335@vcs0.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: c100633a9f6be3d65c2566eea894109026f8ae64
Auto-Submitted: auto-generated
Message-Id: <20180426082931.910AD2049B@vcs0.savannah.gnu.org>
Date: Thu, 26 Apr 2018 04:29:31 -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 Apr 2018 08:29:36 -0000

gbranden pushed a commit to branch master
in repository groff.

commit c100633a9f6be3d65c2566eea894109026f8ae64
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
Date:   Thu Apr 26 03:58:27 2018 -0400

    eqn2graph: Parallelize changes with pic2graph.
   =20
    contrib/eqn2graph/eqn2graph.sh:
    contrib/eqn2graph/eqn2graph.1.man:
    * Refactor temp directory handling.
    * Handle embedded whitespace in temp dir.
    * Adapt to old convert(1) programs.
   =20
    Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
---
 ChangeLog                         |  10 ++
 NEWS                              |  13 +--
 contrib/eqn2graph/eqn2graph.1.man | 207 ++++++++++++++++++--------------=
------
 contrib/eqn2graph/eqn2graph.sh    |  57 ++++++++---
 4 files changed, 155 insertions(+), 132 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 29564d9..9b9d7c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2018-04-26  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+	eqn2graph: Parallelize changes with pic2graph.
+
+	contrib/eqn2graph/eqn2graph.sh:
+	contrib/eqn2graph/eqn2graph.1.man:
+	* Refactor temp directory handling.
+	* Handle embedded whitespace in temp dir.
+	* Adapt to old convert(1) programs.
+
 2018-04-25  G. Branden Robinson <g.branden.robinson@gmail.com>
=20
 	pic2graph: Refactor temp directory handling.
diff --git a/NEWS b/NEWS
index 559f9d6..4d9ad17 100644
--- a/NEWS
+++ b/NEWS
@@ -53,12 +53,13 @@ o New 'configure' option --with-compatibility-wrapper=
s to control how groff
   compatibility wrappers for vendor-provided non-GNU macro sets are
   installed (See: ./configure --help).
=20
-o pic2graph now attempts to adapt to very old installed versions of the
-  ImageMagick and GraphicsMagick programs "convert".  pic2graph searches=
 the
-  output of convert's "-help" option, and uses "-trim" if that string is
-  found; otherwise, the old "-crop 0x0" method (which produces incompati=
ble
-  results on versions that _do_ support "-trim") is used.  pic2graph emi=
ts a
-  warning to standard error if the search fails and the old method is us=
ed.
+o eqn2graph and pic2graph now attempt to adapt to very old installed
+  versions of the ImageMagick and GraphicsMagick programs "convert".  Th=
ey
+  search the output of convert(1)'s "-help" option, and use "-trim" if t=
hat
+  string is found; otherwise, the old "-crop 0x0" method (which produces
+  incompatible results on versions that _do_ support "-trim") is used.  =
The
+  programs emit a warning to standard error if the search fails and the =
old
+  method is used.
=20
 o groffer now supports the output of XHTML.  Use the "--xhtml" or
   "--mode=3Dxhtml" command-line options to generate it.
diff --git a/contrib/eqn2graph/eqn2graph.1.man b/contrib/eqn2graph/eqn2gr=
aph.1.man
index 47d8492..cd27ced 100644
--- a/contrib/eqn2graph/eqn2graph.1.man
+++ b/contrib/eqn2graph/eqn2graph.1.man
@@ -3,74 +3,82 @@
 eqn2graph \- convert an EQN equation into a cropped image
 .
 .
+.\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+.\" Legalese
+.\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+.\"
 .\" This documentation is released to the public domain.
 .
 .
-.\" 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"
-..
-.
 .\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 .SH SYNOPSIS
 .\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 .
-.B eqn2graph
-[
-.B \-unsafe
-]
-[
-.BI \-format\  fmt
-]
+.SY eqn2graph
+.OP \-unsafe
+.OP \-format output-format
+.RI [ \%convert-arguments ]
+.YS
+.
+.SY eqn2graph
+.B \-\-help
+.SY eqn2graph
+.RB { \-v | \-\-version }
+.YS
 .
 .
 .\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 .SH DESCRIPTION
 .\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 .
-Reads an EQN equation (one line) as input; produces an image
-file (by default in Portable Network Graphics format) suitable for the
-Web as output.
+.I eqn2graph
+reads a one-line
+.BR @g@eqn (@MAN1EXT@)
+equation from the standard input and and writes an image file,
+by default in Portable Network Graphics (PNG) format,
+to the standard output.
 .
 .
-.P
-Your input EQN code should
+.PP
+The input
+.I EQN
+code should
 .I not
-have the \&.EQ/.EN preamble that normally precedes it within
+be preceded by the
+.B \&.EQ
+macro that normally precedes it within
 .BR groff (@MAN1EXT@)
-macros; nor do you need to have dollar-sign or other delimiters
-around the equation.
+macros;
+nor do you need to have dollar-sign or other delimiters around the
+equation.
 .
 .
-.P
-The output image will be clipped to the smallest possible bounding box
-that contains all the black pixels.
+.\" FIXME: How old?  This text hasn't been touched since 2008 at latest.
+.\" Older versions of
+.\" .I \%convert
+.\" will produce a black-on-white graphic; newer ones may produce a
+.\" black-on-transparent graphic.
 .
-Older versions of
-.BR convert (1)
-will produce a black-on-white graphic; newer ones may produce a
-black-on-transparent graphic.
+.PP
+Arguments not recognized by
+.I eqn2graph
+are passed to the ImageMagick or GraphicsMagick program
+.BR \%convert (1).
 .
-By specifying command-line options to be passed to
-.BR convert (1)
-you can give it a border, force the background transparent, set the
-image's pixel density, or perform other useful transformations.
 .
+By specifying these, you can give your image a border,
+.\" Transparent backgrounds are the default in 2018.
+.\" force the background transparent,
+set the image's pixel density,
+or perform other useful transformations.
 .
-.P
-This program uses
-.BR @g@eqn (@MAN1EXT@),
-.BR groff (@MAN1EXT@),
-and the ImageMagick
-.BR convert (1)
-program.
 .
-These programs must be installed on your system and accessible on your
-$PATH for
-.B eqn2graph
-to work.
+.PP
+The output image is clipped using
+.IR convert 's
+.B \-trim
+option to the smallest possible bounding box that contains all the black
+pixels.
 .
 .
 .\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
@@ -80,36 +88,41 @@ to work.
 .TP
 .B \-unsafe
 Run
-.BR groff (@MAN1EXT@)
-in the \[lq]unsafe\[rq] mode enabling the PIC macro
+.I groff
+in
+.I unsafe
+mode, enabling the
+.I PIC
+command
 .B sh
-to execute arbitrary commands.
+to execute arbitrary Unix shell commands.
 .
-The default is to forbid this.
+The
+.I groff
+default is to forbid this.
 .
-.TP
-.BI \-format\  fmt
-Specify an output format; the default is PNG (Portable Network Graphics)=
.
 .
-Any format that
-.BR convert (1)
-can emit is supported.
+.TP
+.BI "\-format " output-format
+Write the image in
+.IR output-format ,
+which must be understood by
+.IR convert ;
+the default is PNG.
 .
 .
-.PP
-Command-line switches and arguments not listed above are passed to
-.BR convert (1).
+.TP
+.B \-\-help
+Display a brief usage message and exit.
 .
 .
-.\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
-.SH FILES
-.\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
-.
-.Tp \w'\fB@MACRODIR@/eqnrc'u+2n
-.B @MACRODIR@/eqnrc
-The
-.BR @g@eqn (@MAN1EXT@)
-initialization file.
+.TP
+.B \-v
+.TQ
+.B \-\-version
+Display
+.IR pic2graph 's
+version string and exit.
 .
 .
 .\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
@@ -117,58 +130,33 @@ initialization file.
 .\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 .
 .TP
-.B GROFF_TMPDIR
-The directory in which temporary files will be created.
-.
-If this is not set
-.B eqn2graph
-searches the environment variables
-.BR \%TMPDIR ,
-.BR TMP ,
-and
-.B TEMP
-(in that order).
-.
-Otherwise, temporary files will be created in
-.BR /tmp .
-.
+.B \%GROFF_TMPDIR
+.TQ
+.B \%TMPDIR
+.TQ
+.B \%TMP
+.TQ
+.B \%TEMP
+These environment variables are searched in the given order to determine
+the directory where temporary files will be created.
 .
-.\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
-.SH BUGS
-.\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
-.
-Due to changes in the behavior of ImageMagick
-.BR convert (1)
-that are both forward and backward-incompatible,
-mismatches between your
-.B eqn2graph
-and
-.BR convert (1)
-versions may produce zero-sized or untrimmed output images.
-.
-For this version of
-.B eqn2graph
-you will need a version of
-.BR convert (1)
-that supports the
-.B \-trim
-option; older versions of
-.B eqn2graph
-used
-.BR \-crop\~0x0 ,
-which no longer has trimming behavior.
+If none are set,
+.I /tmp
+is used.
 .
 .
 .\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 .SH AUTHORS
 .\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 .
-
-.B eqn2graph
+.I eqn2graph
 was written by
 .MT esr@\:thyrsus.com
 Eric S.\& Raymond
-.ME .
+.ME ,
+based on a recipe for
+.BR pic2graph (@MAN1EXT@),
+by W.\& Richard Stevens.
 .
 .
 .\" =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
@@ -179,8 +167,7 @@ Eric S.\& Raymond
 .BR grap2graph (@MAN1EXT@),
 .BR @g@eqn (@MAN1EXT@),
 .BR groff (@MAN1EXT@),
-.BR gs (1),
-.BR convert (1).
+.BR convert (1)
 .
 .
 .\" Local Variables:
diff --git a/contrib/eqn2graph/eqn2graph.sh b/contrib/eqn2graph/eqn2graph=
.sh
index ee7cc5f..daa8517 100644
--- a/contrib/eqn2graph/eqn2graph.sh
+++ b/contrib/eqn2graph/eqn2graph.sh
@@ -7,7 +7,7 @@
 # In Unixland, the magic is in knowing what to string together...
 #
 # Take an eqn equation on stdin, emit cropped bitmap on stdout.
-# The pic markup should *not* be wrapped in .EQ/.EN, this script will do=
 that.
+# The eqn markup should *not* be wrapped in .EQ/.EN, this script will do=
 that.
 # A -U option on the command line enables gpic/groff "unsafe" mode.
 # A -format FOO option changes the image output format to any format
 # supported by convert(1).  All other options are passed to convert(1).
@@ -34,6 +34,7 @@
 #
 groff_opts=3D""
 convert_opts=3D""
+convert_trim_arg=3D"-trim"
 format=3D"png"
=20
 while [ "$1" ]
@@ -58,22 +59,45 @@ done
=20
 # create temporary directory
 tmp=3D
-for d in "$GROFF_TMPDIR" "$TMPDIR" "$TMP" "$TEMP" /tmp; do
-    test -z "$d" && continue
+for d in "$GROFF_TMPDIR" "$TMPDIR" "$TMP" "$TEMP" /tmp
+do
+    test -n "$d" && break
+done
+
+if ! test -d "$d"
+then
+    echo "$0: error: temporary directory \"$d\" does not exist or is" \
+        "not a directory" >&2
+    exit 1
+fi
=20
-    tmp=3D`(umask 077 && mktemp -d -q "$d/eqn2graph-XXXXXX") 2> /dev/nul=
l` \
-    && test -n "$tmp" && test -d "$tmp" \
-    && break
+if ! tmp=3D`(umask 077 && mktemp -d -q "$d/pic2graph-XXXXXX") 2> /dev/nu=
ll`
+then
+    # mktemp failed--not installed or is a version that doesn't support =
those
+    # flags?  Fall back to older method which uses more predictable nami=
ng.
+    #
+    # $RANDOM is a Bashism.  The fallback of $PPID is not good pseudoran=
domness,
+    # but is supported by the stripped-down dash shell, for instance.
+    tmp=3D"$d/pic2graph$$-${RANDOM:-$PPID}"
+    (umask 077 && mkdir "$tmp") 2> /dev/null
+fi
+
+if ! test -d "$tmp"
+then
+    echo "$0: error: cannot create temporary directory \"$tmp\"" >&2
+    exit 1
+fi
=20
-    tmp=3D$d/eqn2graph$$-$RANDOM
-    (umask 077 && mkdir $tmp) 2> /dev/null && break
-done;
-if test -z "$tmp"; then
-    echo "$0: cannot create temporary directory" >&2
-    { (exit 1); exit 1; }
+# See if the installed version of convert(1) is new enough to support th=
e -trim
+# option.  Versions that didn't were described as "old" as early as 2008=
.
+is_convert_recent=3D`convert -help | grep -e -trim`
+if test -z "$is_convert_recent"
+then
+    echo "$0: warning: falling back to old '-crop 0x0' trim method" >&2
+    convert_trim_arg=3D"-crop 0x0"
 fi
=20
-trap 'exit_status=3D$?; rm -rf $tmp && exit $exit_status' EXIT INT TERM
+trap 'exit_status=3D$?; rm -rf "$tmp" && exit $exit_status' EXIT INT TER=
M
=20
 # Here goes:
 # 1. Add .EQ/.EN.
@@ -82,8 +106,9 @@ trap 'exit_status=3D$?; rm -rf $tmp && exit $exit_stat=
us' EXIT INT TERM
 # 4. Use convert(1) to crop the Postscript and turn it into a bitmap.
 read equation
 (echo ".EQ"; echo 'delim $$'; echo ".EN"; echo '$'"$equation"'$') | \
-	groff -e $groff_opts -Tps -P-pletter > $tmp/eqn2graph.ps \
-	&& convert -trim $convert_opts $tmp/eqn2graph.ps $tmp/eqn2graph.$format=
 \
-	&& cat $tmp/eqn2graph.$format
+	groff -e $groff_opts -Tps -P-pletter > "$tmp"/eqn2graph.ps \
+	&& convert $convert_trim_arg $convert_opts "$tmp"/eqn2graph.ps \
+	   "$tmp"/eqn2graph.$format \
+	&& cat "$tmp"/eqn2graph.$format
=20
 # End


