* tmac/groff_tmac.man, man/groff.man, man/roff.man: Fixing @MANxEXT@

expansion.
* NEWS: Document the three new man pages.

* aclocal.m4 (GROFF_CXX_CHECK): Removing obsolete AC_C_CROSS call.
* configure: Updated.

* font/devcp1047/R.proto: Fixing fatal bug (a missing `"' character).

8 files changed, 188 insertions, 194 deletions

diff --git a/ChangeLog b/ChangeLog
index 65c7fcc79..ac1d6e752 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2000-05-02  Werner LEMBERG  <wl@gnu.org>
+
+	* tmac/groff_tmac.man, man/groff.man, man/roff.man: Fixing @MANxEXT@
+	expansion.
+	* NEWS: Document the three new man pages.
+
+	* aclocal.m4 (GROFF_CXX_CHECK): Removing obsolete AC_C_CROSS call.
+	* configure: Updated.
+
+	* font/devcp1047/R.proto: Fixing fatal bug (a missing `"' character).
+
 2000-05-01  Werner LEMBERG  <wl@gnu.org>
 
 	Added grap support to grog.
diff --git a/NEWS b/NEWS
index cd3543bb6..23004c7bd 100644
--- a/NEWS
+++ b/NEWS
@@ -132,6 +132,13 @@ Gxditview
 Simplified installation: The Imakefile will now be configured (by groff's
 configure script).
 
+Documentation
+-------------
+
+Three new man pages are available: groff_tmac.5 (documenting how troff macros
+are accessed and where they are found), groff.7 (a short reference of groff),
+and roff.7 (a general survey on GNU troff).
+
 VERSION 1.13, 1.14, 1.15
 ========================
 
diff --git a/aclocal.m4 b/aclocal.m4
index 586129896..77a4d800f 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -301,8 +301,7 @@ AC_SUBST(PAGE)])dnl
 dnl
 dnl
 AC_DEFUN(GROFF_CXX_CHECK,
-[AC_REQUIRE([AC_C_CROSS])
-AC_REQUIRE([AC_PROG_CXX])
+[AC_REQUIRE([AC_PROG_CXX])
 AC_LANG_SAVE
 AC_LANG_CPLUSPLUS
 if test "$cross_compiling" = no; then
diff --git a/configure b/configure
index c07017767..d5a2d3356 100755
--- a/configure
+++ b/configure
@@ -892,8 +892,6 @@ fi
 
 
 
-
-
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -903,20 +901,20 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 if test "$cross_compiling" = no; then
 	echo $ac_n "checking that C++ compiler can compile simple program""... $ac_c" 1>&6
-echo "configure:907: checking that C++ compiler can compile simple program" >&5
+echo "configure:905: checking that C++ compiler can compile simple program" >&5
 fi
 if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 913 "configure"
+#line 911 "configure"
 #include "confdefs.h"
 #ifdef __cplusplus
 extern "C" void exit(int);
 #endif
 int main() { return 0; }
 EOF
-if { (eval echo configure:920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   echo "$ac_t""yes" 1>&6
 else
@@ -930,13 +928,13 @@ fi
 
 if test "$cross_compiling" = no; then
 	echo $ac_n "checking that C++ static constructors and destructors are called""... $ac_c" 1>&6
-echo "configure:934: checking that C++ static constructors and destructors are called" >&5
+echo "configure:932: checking that C++ static constructors and destructors are called" >&5
 fi
 if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 940 "configure"
+#line 938 "configure"
 #include "confdefs.h"
 #ifdef __cplusplus
 extern "C" void exit(int);
@@ -955,7 +953,7 @@ A a;
 int main() { return 1; }
 
 EOF
-if { (eval echo configure:959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   echo "$ac_t""yes" 1>&6
 else
@@ -968,16 +966,16 @@ rm -fr conftest*
 fi
 
 echo $ac_n "checking that header files support C++""... $ac_c" 1>&6
-echo "configure:972: checking that header files support C++" >&5
+echo "configure:970: checking that header files support C++" >&5
 cat > conftest.$ac_ext <<EOF
-#line 974 "configure"
+#line 972 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int main() {
 fopen(0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -995,9 +993,9 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether character set is EBCDIC""... $ac_c" 1>&6
-echo "configure:999: checking whether character set is EBCDIC" >&5
+echo "configure:997: checking whether character set is EBCDIC" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1001 "configure"
+#line 999 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -1009,7 +1007,7 @@ make an error "Character set is not EBCDIC"
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:1013: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1011: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   groff_cv_ebcdic="yes"
  TTYDEVDIRS="font/devcp1047"
@@ -1031,7 +1029,7 @@ rm -f conftest*
 groff_cv_os390="no"
 if test "$groff_cv_ebcdic" = "yes"; then
 	echo $ac_n "checking for OS/390 Unix""... $ac_c" 1>&6
-echo "configure:1035: checking for OS/390 Unix" >&5
+echo "configure:1033: checking for OS/390 Unix" >&5
 	case `uname` in
 	OS/390)
 		CFLAGS="$CFLAGS -D_ALL_SOURCE"
@@ -1047,7 +1045,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1051: checking for $ac_word" >&5
+echo "configure:1049: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LPR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1081,7 +1079,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1085: checking for $ac_word" >&5
+echo "configure:1083: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1119,7 +1117,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1123: checking for $ac_word" >&5
+echo "configure:1121: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LPQ'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1158,11 +1156,11 @@ done
 fi
 
 echo $ac_n "checking for command to use for printing PostScript files""... $ac_c" 1>&6
-echo "configure:1162: checking for command to use for printing PostScript files" >&5
+echo "configure:1160: checking for command to use for printing PostScript files" >&5
 echo "$ac_t""$PSPRINT" 1>&6
 # Figure out DVIPRINT from PSPRINT.
 echo $ac_n "checking for command to use for printing dvi files""... $ac_c" 1>&6
-echo "configure:1166: checking for command to use for printing dvi files" >&5
+echo "configure:1164: checking for command to use for printing dvi files" >&5
 if test -n "$PSPRINT" && test -z "$DVIPRINT"; then
 	if test "X$PSPRINT" = "Xlpr"; then
 		DVIPRINT="lpr -d"
@@ -1175,7 +1173,7 @@ echo "$ac_t""$DVIPRINT" 1>&6
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1179: checking for $ac_word" >&5
+echo "configure:1177: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PERLPATH'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1213,7 +1211,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1217: checking for $ac_word" >&5
+echo "configure:1215: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1246,7 +1244,7 @@ test -n "$YACC" || YACC="yacc"
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1250: checking for $ac_word" >&5
+echo "configure:1248: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1306,7 +1304,7 @@ ac_install_sh="$ac_dir/install-sh -c"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1310: checking for a BSD compatible install" >&5
+echo "configure:1308: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1359,7 +1357,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1363: checking whether ln -s works" >&5
+echo "configure:1361: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1380,7 +1378,7 @@ else
 fi
 
 echo $ac_n "checking for csh hash hack""... $ac_c" 1>&6
-echo "configure:1384: checking for csh hash hack" >&5
+echo "configure:1382: checking for csh hash hack" >&5
 cat <<EOF >conftest.sh
 #!/bin/sh
 true || exit 0
@@ -1396,7 +1394,7 @@ fi
 rm -f conftest.sh
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1400: checking how to run the C preprocessor" >&5
+echo "configure:1398: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -1411,13 +1409,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1415 "configure"
+#line 1413 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1421: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1419: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1428,13 +1426,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1432 "configure"
+#line 1430 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1438: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1445,13 +1443,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 1449 "configure"
+#line 1447 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1455: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1453: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1479,17 +1477,17 @@ for ac_hdr in unistd.h dirent.h limits.h sys/dir.h stdlib.h strings.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1483: checking for $ac_hdr" >&5
+echo "configure:1481: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1488 "configure"
+#line 1486 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1493: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1491: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1516,7 +1514,7 @@ fi
 done
 
 echo $ac_n "checking for ISC 3.x or 4.x""... $ac_c" 1>&6
-echo "configure:1520: checking for ISC 3.x or 4.x" >&5
+echo "configure:1518: checking for ISC 3.x or 4.x" >&5
 if grep '[34]\.' /usr/options/cb.name >/dev/null 2>&1
 then
 	echo "$ac_t""yes" 1>&6
@@ -1528,7 +1526,7 @@ else
 	echo "$ac_t""no" 1>&6
 fi
 echo $ac_n "checking whether -D_POSIX_SOURCE is necessary""... $ac_c" 1>&6
-echo "configure:1532: checking whether -D_POSIX_SOURCE is necessary" >&5
+echo "configure:1530: checking whether -D_POSIX_SOURCE is necessary" >&5
 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1538,7 +1536,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
 
 cat > conftest.$ac_ext <<EOF
-#line 1542 "configure"
+#line 1540 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 extern "C" { void fileno(int); }
@@ -1546,7 +1544,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1550: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1548: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF
 #define _POSIX_SOURCE 1
@@ -1575,9 +1573,9 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking declaration of putenv""... $ac_c" 1>&6
-echo "configure:1579: checking declaration of putenv" >&5
+echo "configure:1577: checking declaration of putenv" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1581 "configure"
+#line 1579 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 extern "C" { void putenv(int); }
@@ -1585,7 +1583,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1587: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""no" 1>&6
 else
@@ -1614,9 +1612,9 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking declaration of popen""... $ac_c" 1>&6
-echo "configure:1618: checking declaration of popen" >&5
+echo "configure:1616: checking declaration of popen" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1620 "configure"
+#line 1618 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 extern "C" { void popen(int); }
@@ -1624,7 +1622,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1628: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1626: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""no" 1>&6
 else
@@ -1653,9 +1651,9 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking declaration of pclose""... $ac_c" 1>&6
-echo "configure:1657: checking declaration of pclose" >&5
+echo "configure:1655: checking declaration of pclose" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1659 "configure"
+#line 1657 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 extern "C" { void pclose(int); }
@@ -1663,7 +1661,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1667: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1665: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""no" 1>&6
 else
@@ -1692,9 +1690,9 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking for sys_nerr in <errno.h> or <stdio.h>""... $ac_c" 1>&6
-echo "configure:1696: checking for sys_nerr in <errno.h> or <stdio.h>" >&5
+echo "configure:1694: checking for sys_nerr in <errno.h> or <stdio.h>" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1698 "configure"
+#line 1696 "configure"
 #include "confdefs.h"
 #include <errno.h>
 #include <stdio.h>
@@ -1702,7 +1700,7 @@ int main() {
 int k; k = sys_nerr;
 ; return 0; }
 EOF
-if { (eval echo configure:1706: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1704: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF
 #define HAVE_SYS_NERR 1
@@ -1731,9 +1729,9 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking for sys_errlist in <errno.h> or <stdio.h>""... $ac_c" 1>&6
-echo "configure:1735: checking for sys_errlist in <errno.h> or <stdio.h>" >&5
+echo "configure:1733: checking for sys_errlist in <errno.h> or <stdio.h>" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1737 "configure"
+#line 1735 "configure"
 #include "confdefs.h"
 #include <errno.h>
 #include <stdio.h>
@@ -1741,7 +1739,7 @@ int main() {
 int k; k = (int)sys_errlist[0];
 ; return 0; }
 EOF
-if { (eval echo configure:1745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1743: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF
 #define HAVE_SYS_ERRLIST 1
@@ -1770,9 +1768,9 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking declaration of hypot""... $ac_c" 1>&6
-echo "configure:1774: checking declaration of hypot" >&5
+echo "configure:1772: checking declaration of hypot" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1776 "configure"
+#line 1774 "configure"
 #include "confdefs.h"
 #include <math.h>
 extern "C" { double hypot(double,double); }
@@ -1780,7 +1778,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1784: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1782: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""no" 1>&6
 else
@@ -1809,16 +1807,16 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking C++ <osfcn.h>""... $ac_c" 1>&6
-echo "configure:1813: checking C++ <osfcn.h>" >&5
+echo "configure:1811: checking C++ <osfcn.h>" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1815 "configure"
+#line 1813 "configure"
 #include "confdefs.h"
 #include <osfcn.h>
 int main() {
 read(0, 0, 0); open(0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:1822: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1820: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF
 #define HAVE_CC_OSFCN_H 1
@@ -1847,16 +1845,16 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking C++ <limits.h>""... $ac_c" 1>&6
-echo "configure:1851: checking C++ <limits.h>" >&5
+echo "configure:1849: checking C++ <limits.h>" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1853 "configure"
+#line 1851 "configure"
 #include "confdefs.h"
 #include <limits.h>
 int main() {
 int x = INT_MIN; int y = INT_MAX; int z = UCHAR_MAX;
 ; return 0; }
 EOF
-if { (eval echo configure:1860: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1858: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF
 #define HAVE_CC_LIMITS_H 1
@@ -1885,16 +1883,16 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking for declaration of time_t""... $ac_c" 1>&6
-echo "configure:1889: checking for declaration of time_t" >&5
+echo "configure:1887: checking for declaration of time_t" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1891 "configure"
+#line 1889 "configure"
 #include "confdefs.h"
 #include <time.h>
 int main() {
 time_t t = time(0); struct tm *p = localtime(&t);
 ; return 0; }
 EOF
-if { (eval echo configure:1898: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1896: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -1915,12 +1913,12 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:1919: checking return type of signal handlers" >&5
+echo "configure:1917: checking return type of signal handlers" >&5
 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1924 "configure"
+#line 1922 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -1937,7 +1935,7 @@ int main() {
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:1941: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1939: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -1956,16 +1954,16 @@ EOF
 
 
 echo $ac_n "checking struct exception""... $ac_c" 1>&6
-echo "configure:1960: checking struct exception" >&5
+echo "configure:1958: checking struct exception" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1962 "configure"
+#line 1960 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
 struct exception e;
 ; return 0; }
 EOF
-if { (eval echo configure:1969: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF
 #define HAVE_STRUCT_EXCEPTION 1
@@ -1979,7 +1977,7 @@ else
 fi
 rm -f conftest*
 echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
-echo "configure:1983: checking for sin in -lm" >&5
+echo "configure:1981: checking for sin in -lm" >&5
 ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1987,7 +1985,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lm  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1991 "configure"
+#line 1989 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1998,7 +1996,7 @@ int main() {
 sin()
 ; return 0; }
 EOF
-if { (eval echo configure:2002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2023,17 +2021,17 @@ for ac_hdr in unistd.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2027: checking for $ac_hdr" >&5
+echo "configure:2025: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2032 "configure"
+#line 2030 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2037: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2035: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2062,12 +2060,12 @@ done
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2066: checking for $ac_func" >&5
+echo "configure:2064: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2071 "configure"
+#line 2069 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2090,7 +2088,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2115,7 +2113,7 @@ fi
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:2119: checking for working mmap" >&5
+echo "configure:2117: checking for working mmap" >&5
 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2123,7 +2121,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 2127 "configure"
+#line 2125 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -2263,7 +2261,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:2267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -2290,12 +2288,12 @@ LIBS="$LIBS -lc $LIBM"
 for ac_func in fmod strtol getcwd strerror putenv
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2294: checking for $ac_func" >&5
+echo "configure:2292: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2299 "configure"
+#line 2297 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2318,7 +2316,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2348,12 +2346,12 @@ LIBS="$saved_libs"
 for ac_func in rename mkstemp strcasecmp strsep strdup
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2352: checking for $ac_func" >&5
+echo "configure:2350: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2357 "configure"
+#line 2355 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2376,7 +2374,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:2380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2401,12 +2399,12 @@ fi
 done
 
 echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
-echo "configure:2405: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+echo "configure:2403: checking for sys_siglist declaration in signal.h or unistd.h" >&5
 if eval "test \"`echo '$''{'ac_cv_decl_sys_siglist'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2410 "configure"
+#line 2408 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -2418,7 +2416,7 @@ int main() {
 char *msg = *(sys_siglist + 1);
 ; return 0; }
 EOF
-if { (eval echo configure:2422: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2420: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_decl_sys_siglist=yes
 else
@@ -2447,16 +2445,16 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking whether ANSI array delete syntax supported""... $ac_c" 1>&6
-echo "configure:2451: checking whether ANSI array delete syntax supported" >&5
+echo "configure:2449: checking whether ANSI array delete syntax supported" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2453 "configure"
+#line 2451 "configure"
 #include "confdefs.h"
 
 int main() {
 char *p = new char[5]; delete [] p;
 ; return 0; }
 EOF
-if { (eval echo configure:2460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2458: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -2485,16 +2483,16 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking traditional preprocessor""... $ac_c" 1>&6
-echo "configure:2489: checking traditional preprocessor" >&5
+echo "configure:2487: checking traditional preprocessor" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2491 "configure"
+#line 2489 "configure"
 #include "confdefs.h"
 #define name2(a,b) a/**/b
 int main() {
 int name2(foo,bar);
 ; return 0; }
 EOF
-if { (eval echo configure:2498: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2496: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF
 #define TRADITIONAL_CPP 1
@@ -2515,12 +2513,12 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking w_coredump""... $ac_c" 1>&6
-echo "configure:2519: checking w_coredump" >&5
+echo "configure:2517: checking w_coredump" >&5
 if test "$cross_compiling" = yes; then
   echo "$ac_t""no" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2524 "configure"
+#line 2522 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -2535,7 +2533,7 @@ main()
 #endif
 }
 EOF
-if { (eval echo configure:2539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF
 #define WCOREFLAG 0200
@@ -2551,12 +2549,12 @@ rm -fr conftest*
 fi
 
 echo $ac_n "checking default value for grops -b option""... $ac_c" 1>&6
-echo "configure:2555: checking default value for grops -b option" >&5
+echo "configure:2553: checking default value for grops -b option" >&5
 test -n "${BROKEN_SPOOLER_FLAGS}" || BROKEN_SPOOLER_FLAGS=7
 echo "$ac_t""$BROKEN_SPOOLER_FLAGS" 1>&6
 
 echo $ac_n "checking default paper size""... $ac_c" 1>&6
-echo "configure:2560: checking default paper size" >&5
+echo "configure:2558: checking default paper size" >&5
 if test -z "$PAGE"; then
 	descfile=
 	if test -r $prefix/share/groff/font/devps/DESC; then
@@ -2591,7 +2589,7 @@ test -n "$PAGE" || PAGE=letter
 echo "$ac_t""$PAGE" 1>&6
 
 echo $ac_n "checking for existing troff installation""... $ac_c" 1>&6
-echo "configure:2595: checking for existing troff installation" >&5
+echo "configure:2593: checking for existing troff installation" >&5
 if test "x`(echo .tm '|n(.g' | tr '|' '\\\\' | troff -z -i 2>&1) 2>/dev/null`" = x0; then
 	echo "$ac_t""yes" 1>&6
 	g=g
@@ -2601,7 +2599,7 @@ else
 fi
 
 echo $ac_n "checking for prefix of system macro packages""... $ac_c" 1>&6
-echo "configure:2605: checking for prefix of system macro packages" >&5
+echo "configure:2603: checking for prefix of system macro packages" >&5
 sys_tmac_prefix=
 sys_tmac_file_prefix=
 for d in /usr/share/lib/tmac /usr/lib/tmac; do
@@ -2621,7 +2619,7 @@ echo "$ac_t""$sys_tmac_prefix" 1>&6
 
 tmac_wrap=
 echo $ac_n "checking which system macro packages should be made available""... $ac_c" 1>&6
-echo "configure:2625: checking which system macro packages should be made available" >&5
+echo "configure:2623: checking which system macro packages should be made available" >&5
 if test "x$sys_tmac_file_prefix" = "xtmac."; then
 	for f in $sys_tmac_prefix*; do
 		suff=`echo $f | sed -e "s;$sys_tmac_prefix;;"`
diff --git a/font/devcp1047/R.proto b/font/devcp1047/R.proto
index 0fb8ab0f5..91d4509c1 100644
--- a/font/devcp1047/R.proto
+++ b/font/devcp1047/R.proto
@@ -307,7 +307,7 @@ char223	"
 \	24	0	0340
 rs	"
 di	24	0	0341
-char225
+char225	"
 S	24	0	0342
 T	24	0	0343
 *T	"
diff --git a/man/groff.man b/man/groff.man
index 6bd36725d..b666b1eed 100644
--- a/man/groff.man
+++ b/man/groff.man
@@ -34,15 +34,6 @@ fdl.txt in the main directory of the groff source package.
 \&\\*[@tmp@]\\$*
 .rm @tmp@
 ..
-.de groffMP
-.MP \\$1 @MAN\\$2EXT@
-..
-.ig			\" old definition of .groffMP
-.ds @tmp@ \\fB\\$1\\fP\\fR(@MAN\\$2EXT@)\\fP
-.shift 2
-\&\\*[@tmp@]\\$*
-.rm @tmp@
-..
 .de BIP
 .ie (\\n[.$]<=2) \
 .	BI $@
@@ -145,7 +136,7 @@ stands for
 .I GNU roff
 and is the free implementation of the roff type-setting system.
 See
-.groffMP roff 7
+.BR roff (@MAN7EXT@)
 for a survey and the background of the groff system.
 .LP
 This document gives only short descriptions of the predefined roff
@@ -2213,7 +2204,7 @@ GFDL on your system, it is also available on-line under
 .LP
 Formerly, the extensions of the groff language were kept in the manual
 page
-.groffMP troff 1 .
+.BR troff (@MAN1EXT@).
 This document contains the essential parts of that documentation, but
 the gory details were left for the groff info file.
 .\" --------------------------------------------------------------------
@@ -2225,12 +2216,12 @@ The main source of information for the groff language is the
 file.
 .LP
 For a survey of the groff system and further documentation pointers see
-.groffMP roff 7 .
+.BR roff (@MAN7EXT@).
 .LP
 The formatter programs are described in
-.groffMP groff 1
+.BR groff (@MAN1EXT@)
 and
-.groffMP troff 1 .
+.BR troff (@MAN1EXT@).
 .LP
 The classical
 .I troff
diff --git a/man/roff.man b/man/roff.man
index e6844d9c9..f51c215e8 100644
--- a/man/roff.man
+++ b/man/roff.man
@@ -27,12 +27,6 @@ fdl.txt in the main directory of the groff source package.
 \\*[@tmp@]\\$*
 .	rm @tmp@
 ..
-.de groffMP
-.	ds @tmp@ \\fB\\$1\\fP\\fR(@MAN\\$2EXT@)\\fP
-.	shift 2
-\\*[@tmp@]\\$*
-.	rm @tmp@
-..
 .de BIR
 .ie \\n[.$]<3 .BI $@
 .el \{\
@@ -118,7 +112,7 @@ is the general term.
 The main source of documentation for all aspects of the
 .I groff language
 is the groff info file.  The manual page
-.groffMP groff 7
+.BR groff (@MAN7EXT@)
 gives a short description of all predefined language elements.
 .LP
 .I roff
@@ -269,7 +263,7 @@ or
 .BIR "troff\ -m" name .
 General details on the naming of macro packages and their placement is
 found in
-.groffMP tmac 5 .
+.BR tmac (@MAN5EXT@).
 .LP
 Famous classical macro packages are
 .IR man ,
@@ -415,64 +409,64 @@ file.
 The predefined elements of the
 .I groff
 language are also documented in the manual page
-.groffMP groff 7 .
+.BR groff (@MAN7EXT@).
 .LP
 Formatters and their wrappers:
-.groffMP groff 1 ,
-.groffMP grog 1 ,
-.groffMP nroff 1 ,
+.BR groff (@MAN1EXT@),
+.BR grog (@MAN1EXT@),
+.BR nroff (@MAN1EXT@),
 and
-.groffMP troff 1 .
+.BR troff (@MAN1EXT@).
 .LP
 Postprocessors for the output devices:
-.groffMP grodvi 1 ,
-.groffMP grohtml 1 ,
-.groffMP grolbp 1 ,
-.groffMP grolj4 1 ,
-.groffMP grops 1 ,
+.BR grodvi (@MAN1EXT@),
+.BR grohtml (@MAN1EXT@),
+.BR grolbp (@MAN1EXT@),
+.BR grolj4 (@MAN1EXT@),
+.BR grops (@MAN1EXT@),
 and
-.groffMP grotty 1 .
+.BR grotty (@MAN1EXT@).
 .LP
 Standard preprocessors:
-.groffMP eqn 1 ,
-.groffMP grn 1 ,
+.BR eqn (@MAN1EXT@),
+.BR grn (@MAN1EXT@),
 .BR grap (1),
-.groffMP pic 1 ,
-.groffMP refer 1 ,
-.groffMP soelim 1 ,
+.BR pic (@MAN1EXT@),
+.BR refer (@MAN1EXT@),
+.BR soelim (@MAN1EXT@),
 and
-.groffMP tbl 1 .
+.BR tbl (@MAN1EXT@).
 .LP
 The man pages for macro packages include
-.groffMP groff_tmac 5 ,
-.groffMP groff_man 7 ,
-.groffMP groff_markup 7 ,
-.groffMP groff_mdoc 7 ,
-.groffMP groff_mdoc.samples 7 ,
-.groffMP groff_me 7 ,
-.groffMP groff_mm 7 ,
-.groffMP groff_mmroff 7 ,
-.groffMP groff_ms 7 ,
+.BR groff_tmac (@MAN5EXT@),
+.BR groff_man (@MAN7EXT@),
+.BR groff_markup (@MAN7EXT@),
+.BR groff_mdoc (@MAN7EXT@),
+.BR groff_mdoc.samples (@MAN7EXT@),
+.BR groff_me (@MAN7EXT@),
+.BR groff_mm (@MAN7EXT@),
+.BR groff_mmroff (@MAN7EXT@),
+.BR groff_ms (@MAN7EXT@),
 and
-.groffMP groff_msafer 7 .
+.BR groff_msafer (@MAN7EXT@).
 .LP
 The following utils are available:
-.groffMP addftinfo 1 ,
-.groffMP afmtodif 1 ,
-.groffMP hpftodit 1 ,
-.groffMP indxbib 1 ,
-.groffMP lookbib 1 ,
-.groffMP pfbtops 1 ,
-.groffMP tfmtodit 1 ,
+.BR addftinfo (@MAN1EXT@),
+.BR afmtodif (@MAN1EXT@),
+.BR hpftodit (@MAN1EXT@),
+.BR indxbib (@MAN1EXT@),
+.BR lookbib (@MAN1EXT@),
+.BR pfbtops (@MAN1EXT@),
+.BR tfmtodit (@MAN1EXT@),
 and
-.groffMP gxditview 1 .
+.BR gxditview (@MAN1EXT@).
 .LP
 For details on the GNU implementation of the
 .I roff
 system see
-.groffMP groff_char 7 ,
-.groffMP groff_font 7 ,
-.groffMP groff_out 7 ,
+.BR groff_char (@MAN7EXT@),
+.BR groff_font (@MAN7EXT@),
+.BR groff_out (@MAN7EXT@),
 and the file
 .I README
 in the main directory of the groff source distribution.
diff --git a/tmac/groff_tmac.man b/tmac/groff_tmac.man
index f3d95d996..edfe237e1 100755
--- a/tmac/groff_tmac.man
+++ b/tmac/groff_tmac.man
@@ -28,12 +28,6 @@ fdl.txt in the main directory of the groff source package.
 \\*[@tmp@]\\$*
 .rm @tmp@
 ..
-.de groffMP
-.ds @tmp@ \\fB\\$1\\fP\\fR(@MAN\\$2EXT@)\\fP
-.shift 2
-\\*[@tmp@]\\$*
-.rm @tmp@
-..
 .de BIR
 .ie \\n[.$]<3 .BI $@
 .el \{
@@ -55,7 +49,7 @@ groff_tmac \- macro files in the roff typesetting system
 .SH DESCRIPTION
 .\" --------------------------------------------------------------------
 The
-.groffMP roff 7
+.BR roff (@MAN7EXT@)
 type-setting system provides a set of macro packages suitable for
 special kinds of documents.  Each macro package stores its macros and
 definitions in a file called the package's
@@ -95,7 +89,7 @@ because the command-line for activating it reads
 .RE
 .LP
 Actual versions of
-.groffMP groff 1
+.BR groff (@MAN1EXT@)
 provide both naming schemes for the inflicted macro packages, with and
 without the leading `m'.  So in
 .I groff
@@ -123,7 +117,7 @@ or
 In
 .IR groff ,
 most macro packages are described in man pages called
-.groffMP groff_<name> 7 ,
+.BR groff_<name> (@MAN7EXT@),
 with a leading
 .I m
 for the classical packages.
@@ -237,7 +231,7 @@ are recognized which stand for the classical preprocessors
 and
 .B soelim
 resp., see
-.groffMP roff 7 .
+.BR roff (@MAN7EXT@).
 .LP
 Besides being a good reminder for the user, some formatters are even
 able to automatically start the preprocessors specified in the
@@ -358,27 +352,27 @@ system is the
 file.
 .LP
 For a groff overview, see
-.groffMP roff 7
+.BR roff (@MAN7EXT@)
 and the file
 .I README
 in the groff source package.
 .LP
 The groff tmac macro packages are
-.groffMP groff_man 7 ,
-.groffMP groff_markup 7 ,
-.groffMP groff_mdoc 7 ,
-.groffMP groff_mdoc.samples 7 ,
-.groffMP groff_me 7 ,
-.groffMP groff_mm 7 ,
-.groffMP groff_mmroff 7 ,
-.groffMP groff_ms 7 ,
-.groffMP groff_msafer 7 .
+.BR groff_man (@MAN7EXT@),
+.BR groff_markup (@MAN7EXT@),
+.BR groff_mdoc (@MAN7EXT@),
+.BR groff_mdoc.samples (@MAN7EXT@),
+.BR groff_me (@MAN7EXT@),
+.BR groff_mm (@MAN7EXT@),
+.BR groff_mmroff (@MAN7EXT@),
+.BR groff_ms (@MAN7EXT@),
+.BR groff_msafer (@MAN7EXT@).
 .LP
 The groff language is described in
-.groffMP groff 7
+.BR groff (@MAN7EXT@)
 and the formatters in
-.groffMP groff 1 ,
-.groffMP troff 1 .
+.BR groff (@MAN1EXT@),
+.BR troff (@MAN1EXT@).
 .LP
 The Filesystem Hierarchy Standard (FHS) is available at
 .B http://www.pathname.com/fhs/