* NEWS, src/roff/grog/grog.man, doc/groff.texinfo: Updated.

* aclocal.m4 (GROFF_MKSTEMP): Include unistd.h.
* configure: Regenerated.

* src/roff/troff/symbol.cc (table_sizes): Add more values.

* src/roff/grog/grog.pl, src/roff/grog/grog.sh: Recognize mom.

9 files changed, 100 insertions, 87 deletions

diff --git a/ChangeLog b/ChangeLog
index 316e666b..ed3033cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2002-06-05  Werner LEMBERG  <wl@gnu.org>
+
+	* NEWS, src/roff/grog/grog.man, doc/groff.texinfo: Updated.
+
+	* aclocal.m4 (GROFF_MKSTEMP): Include unistd.h.
+	* configure: Regenerated.
+
+2002-06-05  Ralph Corderoy  <ralph@inputplus.demon.co.uk>
+
+	* src/roff/troff/symbol.cc (table_sizes): Add more values.
+
+	* src/roff/grog/grog.pl, src/roff/grog/grog.sh: Recognize mom.
+
 2002-06-04  Werner LEMBERG  <wl@gnu.org>
 
 	* aclocal.m4 (GROFF_PAGE): Don't use `prefix' directly since it
@@ -14,8 +27,6 @@
 	(src_version, src_revision): New variables to avoid overwriting
 	from parent make process.
 	(version.cc): Updated.
-	* contrib/mom/Makefile.sub (groff_bin_dirs): Fix typo (forgotten
-	`src' element).
 
 	* src/preproc/html/pre-html.cc: Include paper.h and font.h.
 	(linebuf, linebufsize): New global variables.
@@ -43,9 +54,6 @@
 	(CLEANADD): Removed grnexmpl.g, groff, groff-*.
 	Added `HTMLDOCFILES'.
 	(CLEANNOTSRCDIRADD): New target for grnexmpl.h, groff, groff-*.
-	* contrib/mom/Makefile.sub (uninstall_sub): Don't use `momdocdir'
-	but `htmldocdir'.
-	Add missing backslash.
 	* src/preproc/eqn/Makefile.sub, src/preproc/pic/Makefile.sub,
 	src/preproc/refer/Makefile.sub (YTABC, YTABH): Don't use `srcdir'
 	as prefix.
@@ -156,14 +164,6 @@
 	* doc/homepage.ms: Renamed to ...
 	* doc/webpage.ms: This.
 	Use `.NHR'.
-	* contrib/mom/Makefile.sub (momdocdir): Removed.
-	(HTMLDOCFILES): Prepend `momdoc/'.
-	(EXTRAEXAMPLEFILES): Removed.  Added entries to...
-	(EXAMPLEFILES): This.
-	(.SUFFIXES, .mom.ps): New.
-	(prepare_make_examples): Updated.
-	(examples/*.ps): Removed; .mom.ps will handle this.
-	(install_data): Updated.
 
 2002-05-23  Werner LEMBERG  <wl@gnu.org>
 
diff --git a/NEWS b/NEWS
index c6ae8663..aa1849a2 100644
--- a/NEWS
+++ b/NEWS
@@ -285,6 +285,11 @@ o A new script contributed by Bernd Warken <bwarken@mayn.de>.  It displays
   groff files and man pages on X and tty, taking care of most parameters
   automatically.
 
+Grog
+____
+
+o Documents using the mom macro package are recognized.
+
 Grops
 -----
 
diff --git a/aclocal.m4 b/aclocal.m4
index 9abb270f..4d41ba03 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -527,6 +527,7 @@ AC_DEFUN(GROFF_MKSTEMP,
 AC_LANG_PUSH(C++)
 AC_LIBSOURCE(mkstemp.cc)
 AC_TRY_LINK([#include <stdlib.h>
+#include <unistd.h>
 int (*f) (char *);],
 [f = mkstemp;],
 AC_MSG_RESULT(yes);AC_DEFINE(HAVE_MKSTEMP, 1,
diff --git a/configure b/configure
index da306dff..49f23629 100755
--- a/configure
+++ b/configure
@@ -4666,6 +4666,7 @@ cat >conftest.$ac_ext <<_ACEOF
 #line 4666 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
+#include <unistd.h>
 int (*f) (char *);
 int
 main ()
@@ -4676,18 +4677,18 @@ f = mkstemp;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4679: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4680: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4682: \$? = $ac_status" >&5
+  echo "$as_me:4683: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4685: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4686: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4688: \$? = $ac_status" >&5
+  echo "$as_me:4689: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:4690: result: yes" >&5
+  echo "$as_me:4691: result: yes" >&5
 echo "${ECHO_T}yes" >&6;
 cat >>confdefs.h <<\EOF
 #define HAVE_MKSTEMP 1
@@ -4696,7 +4697,7 @@ EOF
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:4699: result: no" >&5
+echo "$as_me:4700: result: no" >&5
 echo "${ECHO_T}no" >&6;LIBOBJS="$LIBOBJS mkstemp.$ac_objext"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
@@ -4706,13 +4707,13 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-echo "$as_me:4709: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+echo "$as_me:4710: checking for sys_siglist declaration in signal.h or unistd.h" >&5
 echo $ECHO_N "checking for sys_siglist declaration in signal.h or unistd.h... $ECHO_C" >&6
 if test "${ac_cv_decl_sys_siglist+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4715 "configure"
+#line 4716 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -4730,16 +4731,16 @@ char *msg = *(sys_siglist + 1);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4733: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4734: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4736: \$? = $ac_status" >&5
+  echo "$as_me:4737: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4739: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4740: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4742: \$? = $ac_status" >&5
+  echo "$as_me:4743: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_decl_sys_siglist=yes
 else
@@ -4749,7 +4750,7 @@ ac_cv_decl_sys_siglist=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4752: result: $ac_cv_decl_sys_siglist" >&5
+echo "$as_me:4753: result: $ac_cv_decl_sys_siglist" >&5
 echo "${ECHO_T}$ac_cv_decl_sys_siglist" >&6
 if test $ac_cv_decl_sys_siglist = yes; then
 
@@ -4765,10 +4766,10 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-echo "$as_me:4768: checking whether ANSI array delete syntax supported" >&5
+echo "$as_me:4769: checking whether ANSI array delete syntax supported" >&5
 echo $ECHO_N "checking whether ANSI array delete syntax supported... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 4771 "configure"
+#line 4772 "configure"
 #include "confdefs.h"
 
 int
@@ -4780,23 +4781,23 @@ char *p = new char[5]; delete [] p;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4783: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4784: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4786: \$? = $ac_status" >&5
+  echo "$as_me:4787: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4789: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4790: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4792: \$? = $ac_status" >&5
+  echo "$as_me:4793: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:4794: result: yes" >&5
+  echo "$as_me:4795: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:4799: result: no" >&5
+echo "$as_me:4800: result: no" >&5
 echo "${ECHO_T}no" >&6;
 cat >>confdefs.h <<\EOF
 #define ARRAY_DELETE_NEEDS_SIZE 1
@@ -4816,10 +4817,10 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-echo "$as_me:4819: checking traditional preprocessor" >&5
+echo "$as_me:4820: checking traditional preprocessor" >&5
 echo $ECHO_N "checking traditional preprocessor... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 4822 "configure"
+#line 4823 "configure"
 #include "confdefs.h"
 #define name2(a,b) a/**/b
 int
@@ -4831,18 +4832,18 @@ int name2(foo,bar);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4834: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4835: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4837: \$? = $ac_status" >&5
+  echo "$as_me:4838: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4840: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4841: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4843: \$? = $ac_status" >&5
+  echo "$as_me:4844: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:4845: result: yes" >&5
+  echo "$as_me:4846: result: yes" >&5
 echo "${ECHO_T}yes" >&6;
 cat >>confdefs.h <<\EOF
 #define TRADITIONAL_CPP 1
@@ -4851,7 +4852,7 @@ EOF
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:4854: result: no" >&5
+echo "$as_me:4855: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
@@ -4861,14 +4862,14 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-echo "$as_me:4864: checking w_coredump" >&5
+echo "$as_me:4865: checking w_coredump" >&5
 echo $ECHO_N "checking w_coredump... $ECHO_C" >&6
 if test "$cross_compiling" = yes; then
-  echo "$as_me:4867: result: no" >&5
+  echo "$as_me:4868: result: no" >&5
 echo "${ECHO_T}no" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4871 "configure"
+#line 4872 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -4884,17 +4885,17 @@ main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:4887: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4888: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4890: \$? = $ac_status" >&5
+  echo "$as_me:4891: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:4892: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4893: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4895: \$? = $ac_status" >&5
+  echo "$as_me:4896: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:4897: result: yes" >&5
+  echo "$as_me:4898: result: yes" >&5
 echo "${ECHO_T}yes" >&6;
 cat >>confdefs.h <<\EOF
 #define WCOREFLAG 0200
@@ -4904,18 +4905,18 @@ else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:4907: result: no" >&5
+echo "$as_me:4908: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:4912: checking default value for grops -b option" >&5
+echo "$as_me:4913: checking default value for grops -b option" >&5
 echo $ECHO_N "checking default value for grops -b option... $ECHO_C" >&6
 test -n "${BROKEN_SPOOLER_FLAGS}" || BROKEN_SPOOLER_FLAGS=7
-echo "$as_me:4915: result: $BROKEN_SPOOLER_FLAGS" >&5
+echo "$as_me:4916: result: $BROKEN_SPOOLER_FLAGS" >&5
 echo "${ECHO_T}$BROKEN_SPOOLER_FLAGS" >&6
 
-echo "$as_me:4918: checking default paper size" >&5
+echo "$as_me:4919: checking default paper size" >&5
 echo $ECHO_N "checking default paper size... $ECHO_C" >&6
 groff_prefix=$prefix
 test "x$prefix" = xNONE && groff_prefix=$ac_default_prefix
@@ -4968,22 +4969,22 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi
-echo "$as_me:4971: result: $PAGE" >&5
+echo "$as_me:4972: result: $PAGE" >&5
 echo "${ECHO_T}$PAGE" >&6
 
-echo "$as_me:4974: checking for existing troff installation" >&5
+echo "$as_me:4975: checking for existing troff installation" >&5
 echo $ECHO_N "checking for existing troff installation... $ECHO_C" >&6
 if test "x`(echo .tm '|n(.g' | tr '|' '\\\\' | troff -z -i 2>&1) 2>/dev/null`" = x0; then
-	echo "$as_me:4977: result: yes" >&5
+	echo "$as_me:4978: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	g=g
 else
-	echo "$as_me:4981: result: no" >&5
+	echo "$as_me:4982: result: no" >&5
 echo "${ECHO_T}no" >&6
 	g=
 fi
 
-echo "$as_me:4986: checking for prefix of system macro packages" >&5
+echo "$as_me:4987: checking for prefix of system macro packages" >&5
 echo $ECHO_N "checking for prefix of system macro packages... $ECHO_C" >&6
 sys_tmac_prefix=
 sys_tmac_file_prefix=
@@ -5000,11 +5001,11 @@ for d in /usr/share/lib/tmac /usr/lib/tmac; do
 		done
 	done
 done
-echo "$as_me:5003: result: $sys_tmac_prefix" >&5
+echo "$as_me:5004: result: $sys_tmac_prefix" >&5
 echo "${ECHO_T}$sys_tmac_prefix" >&6
 
 tmac_wrap=
-echo "$as_me:5007: checking which system macro packages should be made available" >&5
+echo "$as_me:5008: checking which system macro packages should be made available" >&5
 echo $ECHO_N "checking which system macro packages should be made available... $ECHO_C" >&6
 if test "x$sys_tmac_file_prefix" = "xtmac."; then
 	for f in $sys_tmac_prefix*; do
@@ -5040,7 +5041,7 @@ elif test -n "$sys_tmac_prefix"; then
 	done
 	rm -f conftest.sol
 fi
-echo "$as_me:5043: result: $tmac_wrap" >&5
+echo "$as_me:5044: result: $tmac_wrap" >&5
 echo "${ECHO_T}$tmac_wrap" >&6
 
 ac_config_files="$ac_config_files stamp-h"
@@ -5126,7 +5127,7 @@ DEFS=-DHAVE_CONFIG_H
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:5129: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:5130: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -5299,7 +5300,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:5302: error: ambiguous option: $1
+    { { echo "$as_me:5303: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -5318,7 +5319,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:5321: error: unrecognized option: $1
+  -*) { { echo "$as_me:5322: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -5358,7 +5359,7 @@ do
   "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
   "src/xditview/Imakefile" ) CONFIG_FILES="$CONFIG_FILES src/xditview/Imakefile" ;;
   "src/include/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/include/config.h:src/include/config.hin" ;;
-  *) { { echo "$as_me:5361: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:5362: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -5589,7 +5590,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:5592: creating $ac_file" >&5
+    { echo "$as_me:5593: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -5607,7 +5608,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:5610: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:5611: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -5620,7 +5621,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:5623: error: cannot find input file: $f" >&5
+           { { echo "$as_me:5624: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -5685,7 +5686,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:5688: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:5689: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -5696,7 +5697,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:5699: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:5700: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -5709,7 +5710,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:5712: error: cannot find input file: $f" >&5
+           { { echo "$as_me:5713: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -5826,7 +5827,7 @@ cat >>$CONFIG_STATUS <<\EOF
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
-      { echo "$as_me:5829: $ac_file is unchanged" >&5
+      { echo "$as_me:5830: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -5893,7 +5894,7 @@ if test "$no_create" != yes; then
   $ac_cs_success || { (exit 1); exit 1; }
 fi
 
-{ echo "$as_me:5896:
+{ echo "$as_me:5897:
 
   Configuration completed.
 
diff --git a/doc/groff.texinfo b/doc/groff.texinfo
index 309f9965..4a8a8b0b 100644
--- a/doc/groff.texinfo
+++ b/doc/groff.texinfo
@@ -1351,7 +1351,7 @@ double-sided printing -- don't produce any output.
 and/or macro packages are required for formatting them, and prints the
 @code{groff} command including those options on the standard output.  It
 generates one or more of the options @option{-e}, @option{-man},
-@option{-me}, @option{-mm}, @option{-ms}, @option{-mdoc},
+@option{-me}, @option{-mm}, @option{-mom}, @option{-ms}, @option{-mdoc},
 @option{-mdoc-old}, @option{-p}, @option{-R}, @option{-g}, @option{-G},
 @option{-s}, and @option{-t}.
 
diff --git a/src/roff/grog/grog.man b/src/roff/grog/grog.man
index 8cd0bb25..e1ab74e7 100644
--- a/src/roff/grog/grog.man
+++ b/src/roff/grog/grog.man
@@ -1,5 +1,5 @@
 .ig
-Copyright (C) 1989-2000, 2001 Free Software Foundation, Inc.
+Copyright (C) 1989-2000, 2001, 2002 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -23,10 +23,10 @@ grog \- guess options for groff command
 .B grog
 [
 .BI \- option
-\|.\|.\|.
+\|.\|.\|.\&
 ]
 [
-.IR files \|.\|.\|.
+.IR files\  \|.\|.\|.\&
 ]
 .SH DESCRIPTION
 .B grog
@@ -39,6 +39,7 @@ options
 .BR \-man ,
 .BR \-me ,
 .BR \-mm ,
+.BR \-mom ,
 .BR \-ms ,
 .BR \-mdoc,
 .BR \-mdoc-old,
diff --git a/src/roff/grog/grog.pl b/src/roff/grog/grog.pl
index 03c9e7c9..764d67ce 100644
--- a/src/roff/grog/grog.pl
+++ b/src/roff/grog/grog.pl
@@ -19,13 +19,9 @@ while ($ARGV[0] =~ /^-./) {
     push(@command, $arg);
 }
 
-if (@ARGV) {
-    foreach $arg (@ARGV) {
-	&process($arg, 0);
-    }
-}
-else {
-    &process("-", 0);
+@ARGV = ('-') unless @ARGV;
+foreach $arg (@ARGV) {
+    &process($arg, 0);
 }
 
 sub process {
@@ -152,6 +148,9 @@ sub process {
 	    }
 	    redo;
 	}
+	elseif (/^\.(PRINTSTYLE|START)$sp/) {
+	    $mom++;
+	}
 	if (/^\.so$sp/) {
 	    chop;
 	    s/^.so *//;
@@ -195,6 +194,9 @@ if ($me > 0) {
 elsif ($SH > 0 && $TH > 0) {
     push(@command, "-man");
 }
+else ($mom > 0) {
+    push(@command, "-mom");
+}
 elsif ($PP > 0) {
     push(@command, "-ms");
 }
diff --git a/src/roff/grog/grog.sh b/src/roff/grog/grog.sh
index 20ea863e..ba9533cb 100644
--- a/src/roff/grog/grog.sh
+++ b/src/roff/grog/grog.sh
@@ -71,6 +71,7 @@ egrep -h "^\.(\[|\])|((P|PS|[PLI]P|[pnil]p|sh|Dd|Tp|Dp|De|Cx|Cl|Oo|.* Oo|Oc|.* O
 		Oo--
 	}
 }
+/^\.(PRINTSTYLE|START)/ { mom++ }
 
 END {
 	if (files ~ /^-/)
@@ -91,6 +92,8 @@ END {
 		printf " -me"
 	else if (SH > 0 && TH > 0)
 		printf " -man"
+	else if (mom > 0)
+		printf " -mom"
 	else if (PP > 0)
 		printf " -ms"
 	else if (P > 0 || mm > 0)
diff --git a/src/roff/troff/symbol.cc b/src/roff/troff/symbol.cc
index 6245301e..09f4c98c 100644
--- a/src/roff/troff/symbol.cc
+++ b/src/roff/troff/symbol.cc
@@ -39,9 +39,9 @@ const int BLOCK_SIZE = 1024;
 // the table will increase in size as necessary
 // the size will be chosen from the following array
 // add some more if you want
-// I think it unlikely that we'll need more than a million symbols
 static const unsigned int table_sizes[] = { 
-101, 503, 1009, 2003, 3001, 4001, 5003, 10007, 20011, 40009, 80021, 160001, 500009, 1000003, 0 
+  101, 503, 1009, 2003, 3001, 4001, 5003, 10007, 20011, 40009, 80021,
+  160001, 500009, 1000003, 1500007, 2000003, 0 
 };
 const double FULL_MAX = 0.3;	// don't let the table get more than this full