From 3480fedff242873b9378a9d46cd887c02faa1cbc Mon Sep 17 00:00:00 2001
From: Werner LEMBERG <wl@gnu.org>
Date: Wed, 2 Jul 2003 15:37:58 +0000
Subject: [PATCH] Integrated grap2graph, contributed by Eric S. Raymond.

* contrib/grap2graph/{Makefile.sub, grap2graph.sh, grap2graph.man}:
New files.
* Makefile.in, NEWS, MANIFEST, contrib/eqn2graph.man,
contrib/pic2graph.man, src/roff/groff/groff.man: Updated.
---
 ChangeLog                       | 9 +++++++++
 MANIFEST                        | 1 +
 Makefile.in                     | 1 +
 NEWS                            | 7 +++++++
 contrib/eqn2graph/eqn2graph.man | 4 +++-
 contrib/pic2graph/pic2graph.man | 1 +
 src/roff/groff/groff.man        | 3 ++-
 7 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c297a223..f299b3e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-07-01  Werner LEMBERG  <wl@gnu.org>
+
+	Integrated grap2graph, contributed by Eric S. Raymond.
+
+	* contrib/grap2graph/{Makefile.sub, grap2graph.sh, grap2graph.man}:
+	New files.
+	* Makefile.in, NEWS, MANIFEST, contrib/eqn2graph.man,
+	contrib/pic2graph.man, src/roff/groff/groff.man: Updated.
+
 2003-07-01  Colin Watson  <cjwatson@debian.org>
 
 	* src/xditview/*.c: Add prototypes, fix return types, add includes.
diff --git a/MANIFEST b/MANIFEST
index 50d59aef..f8d1ae79 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -51,6 +51,7 @@ the groff source distribution.
 ./contrib       Part of groff, but maintained by other people.
   eqn2graph     Convert equations created with EQN into different
                 graphical formats.
+  grap2graph    Convert grap diagraps into different graphical formats.
   groffer       A wrapper to conveniently view roff files.
   mm            The groff mm macro package.
   mom           The groff mom macro package.
diff --git a/Makefile.in b/Makefile.in
index b12b86b6..9bcdb521 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -467,6 +467,7 @@ OTHERDIRS=\
   contrib/mm \
   contrib/pic2graph \
   contrib/eqn2graph \
+  contrib/grap2graph \
   contrib/groffer \
   contrib/mom \
   doc
diff --git a/NEWS b/NEWS
index edddf565..0e756308 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,13 @@ o If the `return' request is called with an argument, it exits twice,
   namely the current macro and the macro one level higher.  This is
   used to define a wrapper macro for `return' in trace.tmac.
 
+Grap2graph
+----------
+
+o A new script contributed by Eric S. Raymond <esr@thyrsus.com>.  It
+  converts a grap diagram into a cropped image.  Since it uses gs and the
+  PNM library, virtually all graphics formats are available for output.
+
 
 VERSION 1.19
 ============
diff --git a/contrib/eqn2graph/eqn2graph.man b/contrib/eqn2graph/eqn2graph.man
index 08bba6ef..a57b3706 100644
--- a/contrib/eqn2graph/eqn2graph.man
+++ b/contrib/eqn2graph/eqn2graph.man
@@ -31,7 +31,7 @@ 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.
 .P
-Your input EQN code should \fInot\fR have the .EQ/.EN preamble that
+Your input EQN code should \fInot\fR have the \&.EQ/.EN preamble that
 that normally precedes it within 
 .BR groff (@MAN1EXT@) 
 macros; nor do you need to have dollar-sign or other delimiters
@@ -83,6 +83,8 @@ initialization file.
 .
 .
 .SH "SEE ALSO"
+.BR pic2graph (@MAN1EXT@),
+.BR grap2graph (@MAN1EXT@),
 .BR @g@eqn (@MAN1EXT@),
 .BR groff (@MAN1EXT@),
 .BR gs (1),
diff --git a/contrib/pic2graph/pic2graph.man b/contrib/pic2graph/pic2graph.man
index a8be6988..126ca3b9 100644
--- a/contrib/pic2graph/pic2graph.man
+++ b/contrib/pic2graph/pic2graph.man
@@ -108,6 +108,7 @@ initialization file.
 .
 .SH "SEE ALSO"
 .BR eqn2graph (@MAN1EXT@),
+.BR grap2graph (@MAN1EXT@),
 .BR @g@pic (@MAN1EXT@),
 .BR @g@eqn (@MAN1EXT@),
 .BR groff (@MAN1EXT@),
diff --git a/src/roff/groff/groff.man b/src/roff/groff/groff.man
index 2227b71e..cde8bec6 100644
--- a/src/roff/groff/groff.man
+++ b/src/roff/groff/groff.man
@@ -1,7 +1,7 @@
 .ig
 groff.man
 
-Last update: 18 Mar 2003
+Last update: 01 Jul 2003
 
 Copyright (C) 1989, 2002, 2003 Free Software Foundation, Inc.
 Rewritten in 2002 by Bernd Warken <bwarken@mayn.de>
@@ -1620,6 +1620,7 @@ The following utilities are available:
 .BR \%addftinfo (@MAN1EXT@),
 .BR \%afmtodit (@MAN1EXT@),
 .BR \%eqn2graph (@MAN1EXT@),
+.BR \%grap2graph (@MAN1EXT@),
 .BR \%groffer (@MAN1EXT@),
 .BR \%gxditview (@MAN1EXT@),
 .BR \%hpftodit (@MAN1EXT@),
-- 
2.11.4.GIT