From 8d6dea3a5542a987c08a218c28776d3751d6878d Mon Sep 17 00:00:00 2001
From: ru <ru@FreeBSD.org>
Date: Tue, 10 Jul 2001 17:09:00 +0000
Subject: Virgin import of FSF groff v1.17.2

---
 contrib/groff/src/preproc/eqn/eqn.man  |  8 ++++++--
 contrib/groff/src/preproc/eqn/lex.cc   |  5 +++--
 contrib/groff/src/preproc/eqn/main.cc  |  2 +-
 contrib/groff/src/preproc/eqn/neqn.man | 22 ++++++++++++++++++++++
 contrib/groff/src/preproc/eqn/neqn.sh  |  3 ++-
 contrib/groff/src/preproc/eqn/over.cc  |  4 ++--
 6 files changed, 36 insertions(+), 8 deletions(-)

(limited to 'contrib/groff/src/preproc/eqn')

diff --git a/contrib/groff/src/preproc/eqn/eqn.man b/contrib/groff/src/preproc/eqn/eqn.man
index 381d97d..bc7dc7e 100644
--- a/contrib/groff/src/preproc/eqn/eqn.man
+++ b/contrib/groff/src/preproc/eqn/eqn.man
@@ -1,5 +1,5 @@
-.ig \"-*- nroff -*-
-Copyright (C) 1989-2000 Free Software Foundation, Inc.
+.ig
+Copyright (C) 1989-2000, 2001 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -880,3 +880,7 @@ beginning of the input line.
 .BR @g@troff (@MAN1EXT@),
 .BR groff_font (@MAN5EXT@),
 .I The\ \*(txbook
+.
+.\" Local Variables:
+.\" mode: nroff
+.\" End:
diff --git a/contrib/groff/src/preproc/eqn/lex.cc b/contrib/groff/src/preproc/eqn/lex.cc
index 25faec2..e14053d 100644
--- a/contrib/groff/src/preproc/eqn/lex.cc
+++ b/contrib/groff/src/preproc/eqn/lex.cc
@@ -1,5 +1,6 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001
+   Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -251,7 +252,7 @@ static struct {
 
 void init_table(const char *device)
 {
-  int i;
+  unsigned int i;
   for (i = 0; i < sizeof(token_table)/sizeof(token_table[0]); i++) {
     definition *def = new definition;
     def->is_macro = 0;
diff --git a/contrib/groff/src/preproc/eqn/main.cc b/contrib/groff/src/preproc/eqn/main.cc
index 6dc03f0..f53ffa3 100644
--- a/contrib/groff/src/preproc/eqn/main.cc
+++ b/contrib/groff/src/preproc/eqn/main.cc
@@ -30,6 +30,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 #define STARTUP_FILE "eqnrc"
 
 extern int yyparse();
+extern "C" const char *Version_string;
 
 static char *delim_search    (char *, int);
 static int   inline_equation (FILE *, string &, string &);
@@ -303,7 +304,6 @@ int main(int argc, char **argv)
       break;
     case 'v':
       {
-	extern const char *Version_string;
 	printf("GNU eqn (groff) version %s\n", Version_string);
 	exit(0);
 	break;
diff --git a/contrib/groff/src/preproc/eqn/neqn.man b/contrib/groff/src/preproc/eqn/neqn.man
index bca7dc2..27261c4 100644
--- a/contrib/groff/src/preproc/eqn/neqn.man
+++ b/contrib/groff/src/preproc/eqn/neqn.man
@@ -1,3 +1,21 @@
+.ig
+Copyright (C) 2001 Free Software Foundation, Inc.
+
+Permission is granted to make and distribute verbatim copies of
+this manual provided the copyright notice and this permission notice
+are preserved on all copies.
+
+Permission is granted to copy and distribute modified versions of this
+manual under the conditions for verbatim copying, provided that the
+entire resulting derived work is distributed under the terms of a
+permission notice identical to this one.
+
+Permission is granted to copy and distribute translations of this
+manual into another language, under the above conditions for modified
+versions, except that this permission notice may be included in
+translations approved by the Free Software Foundation instead of in
+the original English.
+..
 .TH @G@NEQN @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
 .SH NAME
 @g@neqn \- format equations for ascii output
@@ -19,3 +37,7 @@ does not support low-resolution, typewriter-like devices (although it may
 work adequately for very simple input).
 .SH "SEE ALSO"
 .BR @g@eqn (@MAN1EXT@)
+.
+.\" Local Variables:
+.\" mode: nroff
+.\" End:
diff --git a/contrib/groff/src/preproc/eqn/neqn.sh b/contrib/groff/src/preproc/eqn/neqn.sh
index 8f6bc8b..08346b0 100644
--- a/contrib/groff/src/preproc/eqn/neqn.sh
+++ b/contrib/groff/src/preproc/eqn/neqn.sh
@@ -3,7 +3,8 @@
 # GNU eqn with groff -Tascii|-Tlatin1|-Tutf8|-Tcp1047 is supported.
 
 : ${GROFF_BIN_PATH=@BINDIR@}
-export PATH=$GROFF_BIN_PATH:$PATH
+PATH=$GROFF_BIN_PATH:$PATH
+export PATH
 exec @g@eqn -Tascii ${1+"$@"}
 
 # eof
diff --git a/contrib/groff/src/preproc/eqn/over.cc b/contrib/groff/src/preproc/eqn/over.cc
index 06b0321..4c544d1 100644
--- a/contrib/groff/src/preproc/eqn/over.cc
+++ b/contrib/groff/src/preproc/eqn/over.cc
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2001 Free Software Foundation, Inc.
      Written by James Clark (jjc@jclark.com)
 
 This file is part of groff.
@@ -65,7 +65,7 @@ int over_box::compute_metrics(int style)
     set_script_size();
     printf(".nr " SMALL_SIZE_FORMAT " \\n[.s]\n", uid);
   }
-  int mark_uid;
+  int mark_uid = 0;
   int res = num->compute_metrics(style);
   if (res)
     mark_uid = num->uid;
-- 
cgit v1.1