Integrate gxditview into groff's standard directory hierarchy.

* src/xditview/*: Moved to ...
* src/devices/xditview/*: Here.
Moved DviChar.h and XFontName.h to src/include.
Moved DviChar.c and XFontName.c to new directory src/libs/libxutil.
Split off `xmalloc' into new file src/libs/libxutil/xmalloc.c.
Moved xtotroff.c to new directory src/utils/xtotroff.
Provide proper Makefile.sub files (reusing the stuff from
Imakefile.in).
DESC renamed to DESC.in.
Removed GXDitview-ad.h, INSTALL, Imakefile.in.
Converted everything from K&R to ANSI C.
Decorated with const where appropriate.
Cast string constants with `String' and `char *' where appropriate.
Made it compile with C++ (used as a C compiler).
Removed other minor compiler warnings.

* src/devices/xditview/device.c: Include config.h, string.h, and
defs.h.
Don't declare `exit', `strtok', `strchr', and `getenv'.
(FONTPATH): Remove.

* src/devices/xditview/font.c: Don't declare `XParseFontName' and
`XFormatFontName'.

* src/devices/xditview/xditview.c: Include config.h.
Include stdio.h earlier.
Protect declaration of `popen' and `pclose' with
NEED_DECLARATION_POPEN and NEED_DECLARATION_PCLOSE.
Replace `caddr_t' with `XtPointer'.
(MakePromptFunc): New typedef.
(DoPrint): Use RETSIGTYPE.
(promptfunction): Change type to MakePromptFunc.
(MakePrompt): Use MakePromptFunc for third argument.
(xmalloc): Removed.

* src/devices/xditview/ad2c: Add casts to `String'.

* src/include/XFontName.h (XFontNameString): Don't use array
notation.
Add prototypes for `XParseFontName', `XFormatFontName',
`XCompareFontName', and `XCopyFontName'.

* src/include/Makefile.sub (HDRS): Add `DviChar.h' and
`XFontName.h'.

* src/utils/xtotroff/xtotroff.c: Include getopt.h.
Don't declare `XParseFontName' and `XFormatFontName'.
(xmalloc): Removed.
(main): Remove `optind' and `optarg'.

* Makefile.in (XDEVDIRS, XPROGDIRS, XLIBDIRS): New variables
(to select programs which need X).
Make XDEVIDIRS depend on `FORCE'.
(X_CFLAGS, X_LIBS, X_EXTRA_LIBS, X_PRE_LIBS): New variables (for
X support).
(MDEFINES): Updated.
(LIBDIRS): Use XLIBDIRS.
(CPROGDIRS): Use XPROGDIRS.
(DEVDIRS): Remove font directories for gxditview.
(ALLDIRS, DISTDIRS): Add XDEVDIRS.
(EXTRADIRS): Remove src/xditview.

* Makefile.sub (DISCLEANFILES): Updated.

* Makefile.comm (LIBXUTIL): New variable.
(.cpp.o, .cpp.obj): Handle EXTRA_CCFLAGS.
(.c.o, .c.obj, .y.o): Handle EXTRA_CFLAGS.

* Makefile.cpg, Makefile.ccpg ($PROG): Handle EXTRA_LDFLAGS.

* aclocal.m4 (GROFF_X11): New function.

* configure.ac: Call GROFF_X11.
Don't create src/xditview/Imakefile.
Don't emit notice how to build gxditview.

* configure: Regenerated.

* test-groff.in (GROFF_BIN_PATH, XENVIRONMENT): Updated.

50 files changed, 1888 insertions, 6698 deletions

diff --git a/ChangeLog b/ChangeLog
index 5abb170a..039c24e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,87 @@
+2004-06-01  Werner LEMBERG  <wl@gnu.org>
+
+	Integrate gxditview into groff's standard directory hierarchy.
+
+	* src/xditview/*: Moved to ...
+	* src/devices/xditview/*: Here.
+	Moved DviChar.h and XFontName.h to src/include.
+	Moved DviChar.c and XFontName.c to new directory src/libs/libxutil.
+	Split off `xmalloc' into new file src/libs/libxutil/xmalloc.c.
+	Moved xtotroff.c to new directory src/utils/xtotroff.
+	Provide proper Makefile.sub files (reusing the stuff from
+	Imakefile.in).
+	DESC renamed to DESC.in.
+	Removed GXDitview-ad.h, INSTALL, Imakefile.in.
+	Converted everything from K&R to ANSI C.
+	Decorated with const where appropriate.
+	Cast string constants with `String' and `char *' where appropriate.
+	Made it compile with C++ (used as a C compiler).
+	Removed other minor compiler warnings.
+
+	* src/devices/xditview/device.c: Include config.h, string.h, and
+	defs.h.
+	Don't declare `exit', `strtok', `strchr', and `getenv'.
+	(FONTPATH): Remove.
+
+	* src/devices/xditview/font.c: Don't declare `XParseFontName' and
+	`XFormatFontName'.
+
+	* src/devices/xditview/xditview.c: Include config.h.
+	Include stdio.h earlier.
+	Protect declaration of `popen' and `pclose' with
+	NEED_DECLARATION_POPEN and NEED_DECLARATION_PCLOSE.
+	Replace `caddr_t' with `XtPointer'.
+	(MakePromptFunc): New typedef.
+	(DoPrint): Use RETSIGTYPE.
+	(promptfunction): Change type to MakePromptFunc.
+	(MakePrompt): Use MakePromptFunc for third argument.
+	(xmalloc): Removed.
+
+	* src/devices/xditview/ad2c: Add casts to `String'.
+
+	* src/include/XFontName.h (XFontNameString): Don't use array
+	notation.
+	Add prototypes for `XParseFontName', `XFormatFontName',
+	`XCompareFontName', and `XCopyFontName'.
+
+	* src/include/Makefile.sub (HDRS): Add `DviChar.h' and
+	`XFontName.h'.
+
+	* src/utils/xtotroff/xtotroff.c: Include getopt.h.
+	Don't declare `XParseFontName' and `XFormatFontName'.
+	(xmalloc): Removed.
+	(main): Remove `optind' and `optarg'.
+
+	* Makefile.in (XDEVDIRS, XPROGDIRS, XLIBDIRS): New variables
+	(to select programs which need X).
+	Make XDEVIDIRS depend on `FORCE'.
+	(X_CFLAGS, X_LIBS, X_EXTRA_LIBS, X_PRE_LIBS): New variables (for
+	X support).
+	(MDEFINES): Updated.
+	(LIBDIRS): Use XLIBDIRS.
+	(CPROGDIRS): Use XPROGDIRS.
+	(DEVDIRS): Remove font directories for gxditview.
+	(ALLDIRS, DISTDIRS): Add XDEVDIRS.
+	(EXTRADIRS): Remove src/xditview.
+
+	* Makefile.sub (DISCLEANFILES): Updated.
+
+	* Makefile.comm (LIBXUTIL): New variable.
+	(.cpp.o, .cpp.obj): Handle EXTRA_CCFLAGS.
+	(.c.o, .c.obj, .y.o): Handle EXTRA_CFLAGS.
+
+	* Makefile.cpg, Makefile.ccpg ($PROG): Handle EXTRA_LDFLAGS.
+
+	* aclocal.m4 (GROFF_X11): New function.
+
+	* configure.ac: Call GROFF_X11.
+	Don't create src/xditview/Imakefile.
+	Don't emit notice how to build gxditview.
+
+	* configure: Regenerated.
+
+	* test-groff.in (GROFF_BIN_PATH, XENVIRONMENT): Updated.
+
 2004-05-28  Akihiro Sagawa  <sagawa@sohgoh.net>
 
 	* Makefile.in (CPPFLAGS): Define.
diff --git a/Makefile.ccpg b/Makefile.ccpg
index ec46a94e..3110df24 100644
--- a/Makefile.ccpg
+++ b/Makefile.ccpg
@@ -9,7 +9,7 @@ MAKEFILEPARTS=\
 all: $(PROG) $(MANPAGES)
 
 $(PROG): $(OBJS) $(XLIBS)
-	$(LINK.cpp) -o $@ $(OBJS) $(XLIBS) $(LIBS) $(MLIB)
+	$(LINK.cpp) -o $@ $(OBJS) $(XLIBS) $(EXTRA_LDFLAGS) $(LIBS) $(MLIB)
 
 install_bin: install_prog
 install_prog: $(PROG)
diff --git a/Makefile.comm b/Makefile.comm
index 0efef389..5ecd73d8 100644
--- a/Makefile.comm
+++ b/Makefile.comm
@@ -30,6 +30,7 @@ LINK.c=$(CC) $(CFLAGS) $(LDFLAGS)
 LIBGROFF=$(top_builddir)/src/libs/libgroff/libgroff.$(LIBEXT)
 LIBBIB=$(top_builddir)/src/libs/libbib/libbib.$(LIBEXT)
 LIBDRIVER=$(top_builddir)/src/libs/libdriver/libdriver.$(LIBEXT)
+LIBXUTIL=$(top_builddir)/src/libs/libxutil/libxutil.$(LIBEXT)
 MLIB=
 XLIBS=
 YTABH=
@@ -98,16 +99,16 @@ extraclean: distclean
 .SUFFIXES: .o .obj .cpp .c .y .man .n
 
 .cpp.o:
-	$(COMPILE.cpp) $<
+	$(COMPILE.cpp) $(EXTRA_CCFLAGS) $<
 
 .c.o:
-	$(COMPILE.c) $<
+	$(COMPILE.c) $(EXTRA_CFLAGS) $<
 
 .cpp.obj:
-	$(COMPILE.cpp) $<
+	$(COMPILE.cpp) $(EXTRA_CCFLAGS) $<
 
 .c.obj:
-	$(COMPILE.c) $<
+	$(COMPILE.c) $(EXTRA_CFLAGS) $<
 
 .y.cpp:
 	if test -n "$(YTABH)"; then \
@@ -132,7 +133,7 @@ extraclean: distclean
 	-test -f y.tab.c && mv y.tab.c y_tab.c
 	mv y_tab.c $(YTABC)
 	test -z "$(YTABH)" || mv y_tab.h $(YTABH)
-	$(COMPILE.cpp) $(YTABC)
+	$(COMPILE.cpp) $(EXTRA_CCFLAGS) $(YTABC)
 
 .man.n:
 	@echo Making $@ from $<
diff --git a/Makefile.cpg b/Makefile.cpg
index b7af68c3..1a6974ad 100644
--- a/Makefile.cpg
+++ b/Makefile.cpg
@@ -9,7 +9,7 @@ MAKEFILEPARTS=\
 all: $(PROG) $(MANPAGES)
 
 $(PROG): $(OBJS) $(XLIBS)
-	$(LINK.c) -o $@ $(OBJS) $(XLIBS) $(LIBS) $(MLIB)
+	$(LINK.c) -o $@ $(OBJS) $(XLIBS) $(EXTRA_LDFLAGS) $(LIBS) $(MLIB)
 
 install_bin: install_prog
 install_prog: $(PROG)
diff --git a/Makefile.in b/Makefile.in
index 0a3881f7..1d50cf64 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -69,6 +69,15 @@ BROKEN_SPOOLER_FLAGS=@BROKEN_SPOOLER_FLAGS@
 # `DEVICE' is the default device.
 DEVICE=ps
 
+# `XDEVDIRS' is either `font/devX{75,100}{,-12}' or empty.
+XDEVDIRS=@XDEVDIRS@
+
+# `XPROGDIRS' is either `src/devices/xditview src/utils/xtotroff' or empty.
+XPROGDIRS=@XPROGDIRS@
+
+# `XLIBDIRS' is either `src/libs/libxutil' or empty.
+XLIBDIRS=@XLIBDIRS@
+
 # `TTYDEVDIRS' is either `font/devascii font/devlatin1' (for
 # ASCII) or `font/devcp1047' (for EBCDIC) plus font/devutf8.
 TTYDEVDIRS=@TTYDEVDIRS@ font/devutf8
@@ -313,6 +322,12 @@ CCFLAGS=@CXXFLAGS@
 CFLAGS=@CFLAGS@
 CPPFLAGS=@CPPFLAGS@
 LDFLAGS=@LDFLAGS@
+
+X_CFLAGS=@X_CFLAGS@
+X_LIBS=@X_LIBS@
+X_EXTRA_LIBS=@X_EXTRA_LIBS@
+X_PRE_LIBS=@X_PRE_LIBS@
+
 YACC=@YACC@
 YACCFLAGS=-v
 
@@ -392,6 +407,13 @@ MDEFINES= \
   "SH_SCRIPT_SED_CMD=$(SH_SCRIPT_SED_CMD)" \
   "SH_DEPS_SED_SCRIPT=$(SH_DEPS_SED_SCRIPT)" \
   "TTYDEVDIRS=$(TTYDEVDIRS)" \
+  "XDEVDIRS=$(XDEVDIRS)" \
+  "XLIBDIRS=$(XLIBDIRS)" \
+  "XPROGDIRS=$(XPROGDIRS)" \
+  "X_CFLAGS=$(X_CFLAGS)" \
+  "X_LIBS=$(X_LIBS)" \
+  "X_EXTRA_LIBS=$(X_EXTRA_LIBS)" \
+  "X_PRE_LIBS=$(X_PRE_LIBS)" \
   "YACC=$(YACC)" \
   "YACCFLAGS=$(YACCFLAGS)" \
   "bindir=$(bindir)" \
@@ -444,7 +466,8 @@ INCDIRS=src/include
 LIBDIRS=\
   src/libs/libgroff \
   src/libs/libdriver \
-  src/libs/libbib
+  src/libs/libbib \
+  $(XLIBDIRS)
 CCPROGDIRS=\
   src/roff/groff \
   src/roff/troff \
@@ -467,16 +490,14 @@ CCPROGDIRS=\
   src/utils/indxbib \
   src/utils/lkbib \
   src/utils/addftinfo
-CPROGDIRS=src/utils/pfbtops
+CPROGDIRS=\
+  src/utils/pfbtops \
+  $(XPROGDIRS)
 PROGDEPDIRS=arch/misc
 PROGDIRS=$(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS)
 DEVDIRS=\
   font/devps \
   font/devdvi \
-  font/devX75 \
-  font/devX75-12 \
-  font/devX100 \
-  font/devX100-12 \
   font/devhtml
 ALLTTYDEVDIRS=\
   font/devascii \
@@ -497,12 +518,11 @@ OTHERDIRS=\
   contrib/mom \
   doc
 ALLDIRS=$(INCDIRS) $(LIBDIRS) $(PROGDIRS) \
-  $(DEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS) $(OTHERDIRS)
+  $(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS) $(OTHERDIRS)
 EXTRADIRS=\
   font/devps/generate \
   font/devdvi/generate \
   font/devlj4/generate \
-  src/xditview \
   doc
 NOMAKEDIRS=\
   arch/djgpp \
@@ -512,7 +532,7 @@ NOMAKEDIRS=\
   contrib/mom/momdoc \
   src/libs/snprintf
 DISTDIRS=\
-  $(INCDIRS) $(LIBDIRS) $(PROGDIRS) $(DEVDIRS) $(OTHERDEVDIRS) \
+  $(INCDIRS) $(LIBDIRS) $(PROGDIRS) $(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) \
   $(ALLTTYDEVDIRS) $(OTHERDIRS) $(EXTRADIRS) $(NOMAKEDIRS)
 TARGETS=all install install_bin install_data clean distclean mostlyclean \
   realclean extraclean distfiles TAGS depend uninstall_sub
@@ -589,7 +609,7 @@ $(CCPROGDIRS): FORCE
 	  -f $(top_srcdir)/Makefile.ccpg \
 	  -f Makefile.dep $(do)
 
-$(DEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS): FORCE
+$(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS): FORCE
 	@$(ENVSETUP); \
 	if test $(srcdir) = .; then \
 	  srcdir=.; \
diff --git a/Makefile.sub b/Makefile.sub
index cf123eb7..3f2586ba 100644
--- a/Makefile.sub
+++ b/Makefile.sub
@@ -5,11 +5,6 @@ DISTCLEANFILES=\
   stamp-h \
   Makefile \
   test-groff \
-  src/xditview/Imakefile \
-  src/xditview/Makefile \
-  src/xditview/*.o \
-  src/xditview/gxditview src/xditview/xtotroff \
-  $(srcdir)/src/xditview/gxditview._man \
   src/include/config.h
 CLEANADD=Makefile.cfg conftest*
 
diff --git a/aclocal.m4 b/aclocal.m4
index 6d013bf6..267ae531 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -843,3 +843,34 @@ make an error "Path separator is ';'"
      [GROFF_PATH_SEPARATOR=";"])
    AC_MSG_RESULT([$GROFF_PATH_SEPARATOR])
    AC_SUBST(GROFF_PATH_SEPARATOR)])
+
+# Check for X11.
+
+AC_DEFUN([GROFF_X11],
+  [AC_REQUIRE([AC_PATH_XTRA])
+   have_no_x=$no_x
+   if test -z "$have_no_x"; then
+     AC_MSG_CHECKING([for Xaw library])
+     AC_LINK_IFELSE([
+         AC_LANG_PROGRAM([[
+
+#include <X11/Intrinsic.h>
+#include <X11/Xaw/Simple.h>
+
+         ]],
+         [])
+       ],
+       [AC_MSG_RESULT([yes])],
+       [AC_MSG_RESULT([no])
+        have_no_x="yes"])
+   fi
+   if test "X$have_no_x" = "Xyes"; then
+     AC_MSG_NOTICE([gxditview and xtotroff won't be built])
+   else
+     XDEVDIRS="font/devX75 font/devX75-12 font/devX100 font/devX100-12"
+     XPROGDIRS="src/devices/xditview src/utils/xtotroff"
+     XLIBDIRS="src/libs/libxutil"
+   fi
+   AC_SUBST([XDEVDIRS])
+   AC_SUBST([XPROGDIRS])
+   AC_SUBST([XLIBDIRS])])
diff --git a/configure b/configure
index 8bb50b80..6e0211fd 100755
--- a/configure
+++ b/configure
@@ -531,7 +531,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX TTYDEVDIRS OTHERDEVDIRS LPR LP LPQ PSPRINT DVIPRINT PERLPATH YACC RANLIB ac_ct_RANLIB INSTALL_INFO INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SH_SCRIPT_SED_CMD CPP GREP EGREP LIBC LIBM LIBOBJS BROKEN_SPOOLER_FLAGS PAGE g sys_tmac_prefix tmac_wrap GROFF_PATH_SEPARATOR pnmcut pnmcrop pnmtopng psselect pnmtops gs make_html make_install_html pnmtops_nosetpage LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX TTYDEVDIRS OTHERDEVDIRS CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XDEVDIRS XPROGDIRS XLIBDIRS LPR LP LPQ PSPRINT DVIPRINT PERLPATH YACC RANLIB ac_ct_RANLIB INSTALL_INFO INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SH_SCRIPT_SED_CMD GREP EGREP LIBC LIBM LIBOBJS BROKEN_SPOOLER_FLAGS PAGE g sys_tmac_prefix tmac_wrap GROFF_PATH_SEPARATOR pnmcut pnmcrop pnmtopng psselect pnmtops gs make_html make_install_html pnmtops_nosetpage LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1060,6 +1060,10 @@ Fine tuning of the installation directories:
 _ACEOF
 
   cat <<\_ACEOF
+
+X features:
+  --x-includes=DIR    X include files are in DIR
+  --x-libraries=DIR   X library files are in DIR
 _ACEOF
 fi
 
@@ -1067,6 +1071,11 @@ if test -n "$ac_init_help"; then
 
   cat <<\_ACEOF
 
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-x                use the X Window System
+
 Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
@@ -3140,6 +3149,1702 @@ echo "${ECHO_T}yes" >&6 ;;
 echo "${ECHO_T}no" >&6 ;;
      esac
    fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+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:$LINENO: checking how to run the C preprocessor" >&5
+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if test "${ac_cv_prog_CPP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether non-existent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  # Broken: success on invalid input.
+continue
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  break
+fi
+
+    done
+    ac_cv_prog_CPP=$CPP
+
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+echo "$as_me:$LINENO: result: $CPP" >&5
+echo "${ECHO_T}$CPP" >&6
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether non-existent headers
+  # can be detected and how.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  # Broken: success on invalid input.
+continue
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+  :
+else
+  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&5
+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+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:$LINENO: checking for X" >&5
+echo $ECHO_N "checking for X... $ECHO_C" >&6
+
+
+# Check whether --with-x or --without-x was given.
+if test "${with_x+set}" = set; then
+  withval="$with_x"
+
+fi;
+# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
+if test "x$with_x" = xno; then
+  # The user explicitly disabled X.
+  have_x=disabled
+else
+  if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
+    # Both variables are already set.
+    have_x=yes
+  else
+    if test "${ac_cv_have_x+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  # One or both of the vars are not set, and there is no cached value.
+ac_x_includes=no ac_x_libraries=no
+rm -f -r conftest.dir
+if mkdir conftest.dir; then
+  cd conftest.dir
+  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
+  cat >Imakefile <<'_ACEOF'
+acfindx:
+	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
+_ACEOF
+  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
+    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
+    # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
+    for ac_extension in a so sl; do
+      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
+	 test -f $ac_im_libdir/libX11.$ac_extension; then
+	ac_im_usrlibdir=$ac_im_libdir; break
+      fi
+    done
+    # Screen out bogus values from the imake configuration.  They are
+    # bogus both because they are the default anyway, and because
+    # using them would break gcc on systems where it needs fixed includes.
+    case $ac_im_incroot in
+	/usr/include) ;;
+	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
+    esac
+    case $ac_im_usrlibdir in
+	/usr/lib | /lib) ;;
+	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
+    esac
+  fi
+  cd ..
+  rm -f -r conftest.dir
+fi
+
+# Standard set of common directories for X headers.
+# Check X11 before X11Rn because it is often a symlink to the current release.
+ac_x_header_dirs='
+/usr/X11/include
+/usr/X11R6/include
+/usr/X11R5/include
+/usr/X11R4/include
+
+/usr/include/X11
+/usr/include/X11R6
+/usr/include/X11R5
+/usr/include/X11R4
+
+/usr/local/X11/include
+/usr/local/X11R6/include
+/usr/local/X11R5/include
+/usr/local/X11R4/include
+
+/usr/local/include/X11
+/usr/local/include/X11R6
+/usr/local/include/X11R5
+/usr/local/include/X11R4
+
+/usr/X386/include
+/usr/x386/include
+/usr/XFree86/include/X11
+
+/usr/include
+/usr/local/include
+/usr/unsupported/include
+/usr/athena/include
+/usr/local/x11r5/include
+/usr/lpp/Xamples/include
+
+/usr/openwin/include
+/usr/openwin/share/include'
+
+if test "$ac_x_includes" = no; then
+  # Guess where to find include files, by looking for Intrinsic.h.
+  # First, try using that file with no special directory specified.
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <X11/Intrinsic.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  # We can compile using X headers with no special include directory.
+ac_x_includes=
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  for ac_dir in $ac_x_header_dirs; do
+  if test -r "$ac_dir/X11/Intrinsic.h"; then
+    ac_x_includes=$ac_dir
+    break
+  fi
+done
+fi
+rm -f conftest.err conftest.$ac_ext
+fi # $ac_x_includes = no
+
+if test "$ac_x_libraries" = no; then
+  # Check for the libraries.
+  # See if we find them without any special options.
+  # Don't add to $LIBS permanently.
+  ac_save_LIBS=$LIBS
+  LIBS="-lXt $LIBS"
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <X11/Intrinsic.h>
+int
+main ()
+{
+XtMalloc (0)
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  LIBS=$ac_save_LIBS
+# We can link X programs with no special library path.
+ac_x_libraries=
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+LIBS=$ac_save_LIBS
+for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
+do
+  # Don't even attempt the hair of trying to link an X program!
+  for ac_extension in a so sl; do
+    if test -r $ac_dir/libXt.$ac_extension; then
+      ac_x_libraries=$ac_dir
+      break 2
+    fi
+  done
+done
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi # $ac_x_libraries = no
+
+if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then
+  # Didn't find X anywhere.  Cache the known absence of X.
+  ac_cv_have_x="have_x=no"
+else
+  # Record where we found X for the cache.
+  ac_cv_have_x="have_x=yes \
+		ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
+fi
+fi
+
+  fi
+  eval "$ac_cv_have_x"
+fi # $with_x != no
+
+if test "$have_x" != yes; then
+  echo "$as_me:$LINENO: result: $have_x" >&5
+echo "${ECHO_T}$have_x" >&6
+  no_x=yes
+else
+  # If each of the values was on the command line, it overrides each guess.
+  test "x$x_includes" = xNONE && x_includes=$ac_x_includes
+  test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
+  # Update the cache value to reflect the command line values.
+  ac_cv_have_x="have_x=yes \
+		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+  echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
+echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+fi
+
+if test "$no_x" = yes; then
+  # Not all programs may use this symbol, but it does not hurt to define it.
+
+cat >>confdefs.h <<\_ACEOF
+#define X_DISPLAY_MISSING 1
+_ACEOF
+
+  X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
+else
+  if test -n "$x_includes"; then
+    X_CFLAGS="$X_CFLAGS -I$x_includes"
+  fi
+
+  # It would also be nice to do this for all -L options, not just this one.
+  if test -n "$x_libraries"; then
+    X_LIBS="$X_LIBS -L$x_libraries"
+    # For Solaris; some versions of Sun CC require a space after -R and
+    # others require no space.  Words are not sufficient . . . .
+    case `(uname -sr) 2>/dev/null` in
+    "SunOS 5"*)
+      echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
+echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
+      ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+      cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_R_nospace=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_R_nospace=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+      if test $ac_R_nospace = yes; then
+	echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+	X_LIBS="$X_LIBS -R$x_libraries"
+      else
+	LIBS="$ac_xsave_LIBS -R $x_libraries"
+	cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_R_space=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_R_space=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+	if test $ac_R_space = yes; then
+	  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+	  X_LIBS="$X_LIBS -R $x_libraries"
+	else
+	  echo "$as_me:$LINENO: result: neither works" >&5
+echo "${ECHO_T}neither works" >&6
+	fi
+      fi
+      LIBS=$ac_xsave_LIBS
+    esac
+  fi
+
+  # Check for system-dependent libraries X programs must link with.
+  # Do this before checking for the system-independent R6 libraries
+  # (-lICE), since we may need -lsocket or whatever for X linking.
+
+  if test "$ISC" = yes; then
+    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
+  else
+    # Martyn Johnson says this is needed for Ultrix, if the X
+    # libraries were built with DECnet support.  And Karl Berry says
+    # the Alpha needs dnet_stub (dnet does not exist).
+    ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char XOpenDisplay ();
+int
+main ()
+{
+XOpenDisplay ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  :
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
+echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
+if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldnet  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dnet_ntoa ();
+int
+main ()
+{
+dnet_ntoa ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dnet_dnet_ntoa=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dnet_dnet_ntoa=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
+if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
+  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+fi
+
+    if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+      echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
+echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
+if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldnet_stub  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char dnet_ntoa ();
+int
+main ()
+{
+dnet_ntoa ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_dnet_stub_dnet_ntoa=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_dnet_stub_dnet_ntoa=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
+if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
+  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+fi
+
+    fi
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+    LIBS="$ac_xsave_LIBS"
+
+    # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
+    # to get the SysV transport functions.
+    # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4)
+    # needs -lnsl.
+    # The nsl library prevents programs from opening the X display
+    # on Irix 5.2, according to T.E. Dickey.
+    # The functions gethostbyname, getservbyname, and inet_addr are
+    # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
+    echo "$as_me:$LINENO: checking for gethostbyname" >&5
+echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
+if test "${ac_cv_func_gethostbyname+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define gethostbyname innocuous_gethostbyname
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char gethostbyname (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef gethostbyname
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char gethostbyname ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
+choke me
+#else
+char (*f) () = gethostbyname;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != gethostbyname;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_gethostbyname=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_gethostbyname=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
+echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
+
+    if test $ac_cv_func_gethostbyname = no; then
+      echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
+echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lnsl  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char gethostbyname ();
+int
+main ()
+{
+gethostbyname ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_nsl_gethostbyname=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_nsl_gethostbyname=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
+if test $ac_cv_lib_nsl_gethostbyname = yes; then
+  X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+fi
+
+      if test $ac_cv_lib_nsl_gethostbyname = no; then
+	echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
+echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
+if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lbsd  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char gethostbyname ();
+int
+main ()
+{
+gethostbyname ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_bsd_gethostbyname=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_bsd_gethostbyname=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
+if test $ac_cv_lib_bsd_gethostbyname = yes; then
+  X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+fi
+
+      fi
+    fi
+
+    # lieder@skyler.mavd.honeywell.com says without -lsocket,
+    # socket/setsockopt and other routines are undefined under SCO ODT
+    # 2.0.  But -lsocket is broken on IRIX 5.2 (and is not necessary
+    # on later versions), says Simon Leinen: it contains gethostby*
+    # variants that don't use the name server (or something).  -lsocket
+    # must be given before -lnsl if both are needed.  We assume that
+    # if connect needs -lnsl, so does gethostbyname.
+    echo "$as_me:$LINENO: checking for connect" >&5
+echo $ECHO_N "checking for connect... $ECHO_C" >&6
+if test "${ac_cv_func_connect+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define connect to an innocuous variant, in case <limits.h> declares connect.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define connect innocuous_connect
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char connect (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef connect
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char connect ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_connect) || defined (__stub___connect)
+choke me
+#else
+char (*f) () = connect;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != connect;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_connect=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_connect=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+echo "${ECHO_T}$ac_cv_func_connect" >&6
+
+    if test $ac_cv_func_connect = no; then
+      echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
+echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
+if test "${ac_cv_lib_socket_connect+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char connect ();
+int
+main ()
+{
+connect ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_socket_connect=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_socket_connect=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
+echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
+if test $ac_cv_lib_socket_connect = yes; then
+  X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+fi
+
+    fi
+
+    # Guillermo Gomez says -lposix is necessary on A/UX.
+    echo "$as_me:$LINENO: checking for remove" >&5
+echo $ECHO_N "checking for remove... $ECHO_C" >&6
+if test "${ac_cv_func_remove+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define remove to an innocuous variant, in case <limits.h> declares remove.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define remove innocuous_remove
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char remove (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef remove
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char remove ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_remove) || defined (__stub___remove)
+choke me
+#else
+char (*f) () = remove;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != remove;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_remove=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_remove=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
+echo "${ECHO_T}$ac_cv_func_remove" >&6
+
+    if test $ac_cv_func_remove = no; then
+      echo "$as_me:$LINENO: checking for remove in -lposix" >&5
+echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
+if test "${ac_cv_lib_posix_remove+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lposix  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char remove ();
+int
+main ()
+{
+remove ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_posix_remove=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_posix_remove=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
+echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
+if test $ac_cv_lib_posix_remove = yes; then
+  X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+fi
+
+    fi
+
+    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+    echo "$as_me:$LINENO: checking for shmat" >&5
+echo $ECHO_N "checking for shmat... $ECHO_C" >&6
+if test "${ac_cv_func_shmat+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define shmat innocuous_shmat
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char shmat (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef shmat
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char shmat ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_shmat) || defined (__stub___shmat)
+choke me
+#else
+char (*f) () = shmat;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != shmat;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_func_shmat=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_func_shmat=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
+echo "${ECHO_T}$ac_cv_func_shmat" >&6
+
+    if test $ac_cv_func_shmat = no; then
+      echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
+echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
+if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lipc  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char shmat ();
+int
+main ()
+{
+shmat ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_ipc_shmat=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_ipc_shmat=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
+echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
+if test $ac_cv_lib_ipc_shmat = yes; then
+  X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+fi
+
+    fi
+  fi
+
+  # Check for libraries that X11R6 Xt/Xaw programs need.
+  ac_save_LDFLAGS=$LDFLAGS
+  test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
+  # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
+  # check for ICE first), but we must link in the order -lSM -lICE or
+  # we get undefined symbols.  So assume we have SM if we have ICE.
+  # These have to be linked with before -lX11, unlike the other
+  # libraries we check for below, so use a different variable.
+  # John Interrante, Karl Berry
+  echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
+echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
+if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char IceConnectionNumber ();
+int
+main ()
+{
+IceConnectionNumber ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_ICE_IceConnectionNumber=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_ICE_IceConnectionNumber=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
+if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
+  X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+fi
+
+  LDFLAGS=$ac_save_LDFLAGS
+
+fi
+
+
+   have_no_x=$no_x
+   if test -z "$have_no_x"; then
+     echo "$as_me:$LINENO: checking for Xaw library" >&5
+echo $ECHO_N "checking for Xaw library... $ECHO_C" >&6
+     cat >conftest.$ac_ext <<_ACEOF
+
+         /* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+
+#include <X11/Intrinsic.h>
+#include <X11/Xaw/Simple.h>
+
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+        have_no_x="yes"
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+   fi
+   if test "X$have_no_x" = "Xyes"; then
+     { echo "$as_me:$LINENO: gxditview and xtotroff won't be built" >&5
+echo "$as_me: gxditview and xtotroff won't be built" >&6;}
+   else
+     XDEVDIRS="font/devX75 font/devX75-12 font/devX100 font/devX100-12"
+     XPROGDIRS="src/devices/xditview src/utils/xtotroff"
+     XLIBDIRS="src/libs/libxutil"
+   fi
+
+
+
 if test -z "$PSPRINT"; then
      for ac_prog in lpr
 do
@@ -3650,241 +5355,6 @@ echo "${ECHO_T}no" >&6
 
 
 # checks for headers
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-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:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-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:$LINENO: checking for grep that handles long lines" >&5
 echo $ECHO_N "checking for grep that handles long lines... $ECHO_C" >&6
 if test "${oc_cv_path_GREP+set}" = set; then
@@ -8352,7 +9822,7 @@ echo "${ECHO_T}no" >&6
 
           ac_config_files="$ac_config_files stamp-h"
 
-                              ac_config_files="$ac_config_files Makefile doc/Makefile src/xditview/Imakefile"
+                    ac_config_files="$ac_config_files Makefile doc/Makefile"
 
           ac_config_files="$ac_config_files test-groff"
 
@@ -8867,7 +10337,6 @@ do
   "stamp-h" ) CONFIG_FILES="$CONFIG_FILES stamp-h" ;;
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
   "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-  "src/xditview/Imakefile" ) CONFIG_FILES="$CONFIG_FILES src/xditview/Imakefile" ;;
   "test-groff" ) CONFIG_FILES="$CONFIG_FILES test-groff" ;;
   "src/include/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/include/config.h:src/include/config.hin" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
@@ -8966,6 +10435,14 @@ s,@CXXFLAGS@,$CXXFLAGS,;t t
 s,@ac_ct_CXX@,$ac_ct_CXX,;t t
 s,@TTYDEVDIRS@,$TTYDEVDIRS,;t t
 s,@OTHERDEVDIRS@,$OTHERDEVDIRS,;t t
+s,@CPP@,$CPP,;t t
+s,@X_CFLAGS@,$X_CFLAGS,;t t
+s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t
+s,@X_LIBS@,$X_LIBS,;t t
+s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
+s,@XDEVDIRS@,$XDEVDIRS,;t t
+s,@XPROGDIRS@,$XPROGDIRS,;t t
+s,@XLIBDIRS@,$XLIBDIRS,;t t
 s,@LPR@,$LPR,;t t
 s,@LP@,$LP,;t t
 s,@LPQ@,$LPQ,;t t
@@ -8981,7 +10458,6 @@ s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
 s,@INSTALL_DATA@,$INSTALL_DATA,;t t
 s,@LN_S@,$LN_S,;t t
 s,@SH_SCRIPT_SED_CMD@,$SH_SCRIPT_SED_CMD,;t t
-s,@CPP@,$CPP,;t t
 s,@GREP@,$GREP,;t t
 s,@EGREP@,$EGREP,;t t
 s,@LIBC@,$LIBC,;t t
@@ -9499,24 +10975,3 @@ if test "$no_create" != yes; then
   $ac_cs_success || { (exit 1); exit 1; }
 fi
 
-
-{ echo "$as_me:$LINENO:
-
-  Configuration completed.
-
-  You can now say \`make' to compile the groff package and \`make install'
-  to install it afterwards.
-
-  If you want to compile xditview, change the directory to \`src/xditview'
-  and follow the instructions given in the file \`INSTALL'.
-" >&5
-echo "$as_me:
-
-  Configuration completed.
-
-  You can now say \`make' to compile the groff package and \`make install'
-  to install it afterwards.
-
-  If you want to compile xditview, change the directory to \`src/xditview'
-  and follow the instructions given in the file \`INSTALL'.
-" >&6;}
diff --git a/configure.ac b/configure.ac
index 101bd2eb..a39592cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,6 +10,7 @@ AC_PROG_CXX
 GROFF_CXX_CHECK
 GROFF_EBCDIC
 GROFF_OS390
+GROFF_X11
 GROFF_PRINT
 AC_PATH_PROG([PERLPATH], [perl], [/usr/bin/perl])
 GROFF_PROG_YACC
@@ -91,17 +92,6 @@ GROFF_HTML_PROGRAMS
 GROFF_PNMTOPS_NOSETPAGE
 
 AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h])
-AC_CONFIG_FILES([Makefile doc/Makefile src/xditview/Imakefile])
+AC_CONFIG_FILES([Makefile doc/Makefile])
 AC_CONFIG_FILES([test-groff], [chmod +x test-groff])
 AC_OUTPUT
-
-AC_MSG_NOTICE([
-
-  Configuration completed.
-
-  You can now say `make' to compile the groff package and `make install'
-  to install it afterwards.
-
-  If you want to compile xditview, change the directory to `src/xditview'
-  and follow the instructions given in the file `INSTALL'.
-])
diff --git a/src/xditview/DviChar.h b/src/include/DviChar.h
index b075240d..a77f0361 100644
--- a/src/xditview/DviChar.h
+++ b/src/include/DviChar.h
@@ -16,22 +16,22 @@
 
 typedef struct _dviCharNameHash {
 	struct _dviCharNameHash	*next;
-	char			*name;
+	const char		*name;
 	int			position;
 } DviCharNameHash;
 
 typedef struct _dviCharNameMap {
-    char		*encoding;
+    const char		*encoding;
     int			special;
-    char		*dvi_names[DVI_MAP_SIZE][DVI_MAX_SYNONYMS];
+    const char		*dvi_names[DVI_MAP_SIZE][DVI_MAX_SYNONYMS];
     DviCharNameHash	*buckets[DVI_HASH_SIZE];
 } DviCharNameMap;
 
-extern DviCharNameMap	*DviFindMap ( /* char *encoding */ );
-extern void		DviRegisterMap ( /* DviCharNameMap *map */ );
+DviCharNameMap		*DviFindMap (char *);
+void			DviRegisterMap (DviCharNameMap *);
 #ifdef NOTDEF
-extern char		*DviCharName ( /* DviCharNameMap *map, int index, int synonym */ );
+char			*DviCharName (DviCharNameMap *, int, int);
 #else
 #define DviCharName(map,index,synonym)	((map)->dvi_names[index][synonym])
 #endif
-extern int		DviCharIndex ( /* DviCharNameMap *map, char *name */ );
+int			DviCharIndex (DviCharNameMap *, const char *);
diff --git a/src/include/Makefile.sub b/src/include/Makefile.sub
index a0ab6e14..9fceb0fc 100644
--- a/src/include/Makefile.sub
+++ b/src/include/Makefile.sub
@@ -5,6 +5,7 @@ HDRS=\
   color.h \
   device.h \
   driver.h \
+  DviChar.h \
   errarg.h \
   error.h \
   font.h \
@@ -24,7 +25,8 @@ HDRS=\
   searchpath.h \
   stringclass.h \
   symbol.h \
-  unicode.h
+  unicode.h \
+  XFontName.h
 GENHDRS=defs.h
 
 all depend: $(GENHDRS)
diff --git a/src/xditview/XFontName.h b/src/include/XFontName.h
index efe9eb16..4e9c6944 100644
--- a/src/xditview/XFontName.h
+++ b/src/include/XFontName.h
@@ -42,4 +42,9 @@ typedef struct _xFontName {
 #define SpacingProportional	"P"
 #define SpacingCharacterCell	"C"
 
-typedef char	XFontNameString[256];
+typedef char	*XFontNameString;
+
+Bool XParseFontName (XFontNameString, XFontName *, unsigned int *);
+Bool XFormatFontName (XFontName *, unsigned int, XFontNameString);
+Bool XCompareFontName (XFontName *, XFontName *, unsigned int);
+Bool XCopyFontName (XFontName *, XFontName *, unsigned int);
diff --git a/src/xditview/.cvsignore b/src/xditview/.cvsignore
deleted file mode 100644
index cdcfb67b..00000000
--- a/src/xditview/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Imakefile
-Makefile
-gxditview
-xtotroff
diff --git a/src/xditview/ChangeLog b/src/xditview/ChangeLog
deleted file mode 100644
index 401d4d11..00000000
--- a/src/xditview/ChangeLog
+++ /dev/null
@@ -1,536 +0,0 @@
-2004-05-13  Werner LEMBERG  <wl@gnu.org>
-
-Version 1.19.1 released
-=======================
-
-2004-04-17  Werner LEMBERG  <wl@gnu.org>
-
-	* device.c (scale_round): Round correctly for negative values
-	(this is the same function as in src/libs/libgroff/font.c).
-	Found by Paul Eggert.
-
-2003-11-10  Werner LEMBERG  <wl@gnu.org>
-
-	* Imakefile.in: s/@top_srcdir@/@abs_top_srcdir@/,
-	s/@groff_top_builddir@/@abs_top_builddir@/.
-
-Version 1.19 released
-=====================
-
-2003-03-03  Werner LEMBERG  <wl@gnu.org>
-
-	* Imakefile.in (extraclean): Added gxditview._man.
-
-2003-01-28  Werner LEMBERG  <wl@gnu.org>
-
-	* Imakefile.in (SEP): New variable; set to @PATH_SEPARATOR@.
-	(GROFF_FONTPATH): Use it.
-
-2003-01-07  Werner LEMBERG  <wl@gnu.org>
-
-	* DviChar.c (Adobe_Symbol_map): Add `sqrt'.
-
-2003-01-06  Werner LEMBERG  <wl@gnu.org>
-
-	* DviChar.c (Adobe_Symbol_map): Add `integral'.
-
-2002-12-29  Werner LEMBERG  <wl@gnu.org>
-
-	* DviChar.c (ISO_8859_1_map): Remove `ap' and `eq'.
-
-2002-12-20  Werner LEMBERG  <wl@gnu.org>
-
-	* DviChar.c (Adobe_Symbol_map): Don't include `or'.
-	* draw.c (AdjustCharDeltas): Apply correction only if nadj > 1.
-	(DoCharacter): Call FlushCharCache if font size and font number
-	differ.
-	Reset `dw->dvi.cache.adjustable' properly.
-
-2002-12-09  Werner LEMBERG  <wl@gnu.org>
-
-	* DviChar.c (ISO_8859_1_map): Use `tno' symbol instead of `no'.
-
-2002-12-01  Werner LEMBERG  <wl@gnu.org>
-
-	* Imakefile.in: Use `InstallAppDefaultsLong' instead of
-	`InstallAppDefaults' to make it work if build directory isn't
-	$srcdir.
-
-2002-11-24  Werner LEMBERG  <wl@gnu.org>
-
-	* DviChar.c (Adobe_Symbol_map): Add glyph `braceex'.
-
-2002-11-14  Werner LEMBERG  <wl@gnu.org>
-
-	* DviChar.c (ISO_8859_1_map): Don't include `or'.
-
-Version 1.18.1 released
-=======================
-
-2002-09-16  Werner LEMBERG  <wl@gnu.org>
-
-	* Imakefile.in (GROFF_LOCALFONTDIR): New variable.
-	(GROFF_FONTPATH): Use it.
-	Remove /usr/local/lib/font.
-
-Version 1.18.0 released
-=======================
-
-2002-06-22  Werner LEMBERG  <wl@gnu.org>
-
-	* gxditview.c (main): Handle `-help' and `--help' correctly.
-
-2002-06-17  Colin Watson  <cjwatson@debian.org>
-
-	* Imakefile.in: s/@top_builddir@/@groff_top_builddir@/.
-
-2002-04-06  Werner LEMBERG  <wl@gnu.org>
-
-	* DviChar.c (ISO_8859_1_map, Adobe_Symbol_map): Remove all
-	characters > 0x80.
-	* parse.c (ParseInput): Ignore `m' command.
-	(ParseDrawFunction): Don't move for unknown drawing functions.
-	Don't move for `f' drawing function.
-
-2002-03-25  Werner LEMBERG  <wl@gnu.org>
-
-	* DviChar.c (ISO_8859_1_map): Use `t+-', `tmu', and `tdi' symbols
-	instead of `+-', `mu', and `di', respectively.
-
-2002-02-23  Werner LEMBERG  <wl@gnu.org>
-
-	* DviChar.c (ISO_8859_1_map): Add `mc' symbol.
-
-2001-09-22  Werner LEMBERG  <wl@gnu.org>
-
-	* Imakefile.in: Redefine `ProgramTargetHelper' as
-	`ProgramTargetHelperNoMan' and add a call to `InstallManPageLong'
-	to make the `install.man' target work if the build directory isn't
-	$srcdir.
-
-Version 1.17.2 released
-=======================
-
-Version 1.17.1 released
-=======================
-
-2001-04-21  Albert Chin-A-Young  <china@thewrittenword.com>
-
-	* Imakefile.in: Add support for recent HP architectures.
-
-Version 1.17 released
-=====================
-
-2001-01-04  Rob Daasch  <daasch@ece.pdx.edu>
-
-	* parse.c (ParseInput): Added 'F' to command switch to swallow
-	filename strings as ignored comments.
-
-2000-12-02  Werner LEMBERG  <wl@gnu.org>
-
-	* device.c (find_file): Remove home directory in search path.
-
-2000-11-14  Werner LEMBERG  <wl@gnu.org>
-
-	* device.c (open_device_file): Remove `path' parameter.
-	(find_file): Construct font path similar to groff: First the contents
-	of GROFF_FONT_PATH, then the home directory, and finally the default
-	font path.
-	* Imakefile.in: Fix GROFF_DATAPROGRAMDIR and GROFF_FONTPATH.
-
-2000-10-23  Werner LEMBERG  <wl@gnu.org>
-
-	Change installation structure for data files from .../groff/... to
-	.../groff/<version><revision>/... to be conform with other GNU
-	programs.
-
-	* Imakefile.in: Implement it.
-
-Version 1.16.1 released
-=======================
-
-Version 1.16 released
-=====================
-
-2000-05-18  Werner LEMBERG  <wl@gnu.org>
-
-	* DviChar.c: Adding `cq' as an alias for "'" in latin-1 map.
-
-2000-05-03  Werner LEMBERG  <wl@gnu.org>
-
-	* DviChar.c: Adding `dq' as an alias for `"' in latin-1 map.
-
-2000-04-28  Werner LEMBERG  <wl@gnu.org>
-
-	* DviChar.c: Replacing `md' glyph name with `pc' in latin-1 map to
-	make it distinct from the `md' glyph in the symbol font.
-
-2000-03-03  Werner LEMBERG  <wl@gnu.org>
-
-	* Imakefile replaced with Imakefile.in which will be configured by
-	the main configure script of groff.  This will set the correct font
-	path, and it will make it possible to build xditview in a directory
-	different from $srcdir.
-
-2000-03-01  Colin Phipps  <crp22@cam.ac.uk>
-
-	* Dvi.c (OpenFile): Use tmpdir() for security reasons.
-	* xtotroff.c (MapFont): Avoid race while opening file.
-
-2000-02-06  Werner LEMBERG  <wl@gnu.org>
-
-	* Imakefile: Adapted to new directory structure.
-
-	* README: Updated.
-
-Version 1.15 released
-=====================
-
-1999-12-21  Werner LEMBERG  <wl@gnu.org>
-
-	* README: Fixed ftp GNU address.
-
-1999-12-13  Werner LEMBERG  <wl@gnu.org>
-
-	* device.c: Use extern declarations of strtok(), strchr(), and
-	getenv() only if not defined as macros.
-
-1999-11-18  Larry Jones  <larry.jones@sdrc.com>
-
-	* xditview.c: Add fallback_resources to allow running without
-	access to the app-defaults file.
-
-	* Imakefile: Added rule to create app-defaults to a C header file.
-
-	* GXditview-ad.h: New file containing fallback default resources.
-
-	* ad2c: New file to do the app-defaults -> C header file
-	conversion.
-
-1999-10-27  Larry Jones  <larry.jones@sdrc.com>
-
-	* font.c (DisposeFontSizes): If there's a problem loading a font,
-	xditview will fall-back and use the default font, but it hasn't
-	checked before unloading fonts which could result in unloading the
-	default font (possibly multiple times) and then X errors.
-
-1999-09-13  Werner LEMBERG  <wl@gnu.org>
-
-	* Imakefile (extraclean): Added Makefile.
-
-	* xditview.c (main, MakePrompt): Fixing compilation warnings.
-
-	* TODO: Imakefile should be replaced with a configure script.
-
-1999-09-13  Werner LEMBERG  <wl@gnu.org>
-
-	* Makefile: Removed.
-
-1999-09-12  Werner LEMBERG  <wl@gnu.org>
-
-	* Imakefile (GROFF_FONTPATH): Another addition.
-
-	* device.c (FONTPATH): Update to match current groff version.
-
-1999-09-11  Larry Jones  <larry.jones@sdrc.com>
-
-	* Imakefile (GROFF_LIBDIR, GROFF_FONTPATH): Update to match
-	current groff version.
-
-	* Dvi.c (Realize, Destroy), DviP.h, draw.c (setFillGC), gray*.bm:
-	Allow 8 levels of gray rather than just 1.
-
-	* draw.c (DrawFilledCircle, DrawFilledEllipse, DrawFilledPolygon):
-	Draw outlines to prevent gaps between abutting figures.
-
-1999-05-27  Werner LEMBERG  <wl@gnu.org>
-
-	* xtotroff.c (usage): Fixed typo.
-
-Mon Sep 11 10:40:33 1995  James Clark  <jjc@jclark.com>
-
-	* device.c (INT_MIN, INT_MAX): Don't define if already defined.
-
-Mon Aug  8 11:14:11 1994  James Clark  (jjc@jclark.com)
-
-	* DviChar.c (Adobe_Symbol_map): Use \(nb for notsubset.
-
-Tue Apr 19 04:41:16 1994  James Clark  (jjc@jclark.com)
-
-	* Dvi.c (resources): Change default for background and foreground
-	to "XtDefaultBackground" and "XtDefaultForeground".
-
-Sat Feb 12 10:38:47 1994  James Clark  (jjc@jclark.com)
-
-	* DviChar.c (Adobe_Symbol_map): Rename radicalex to rn.
-
-Thu May 27 20:30:12 1993  James Clark  (jjc@jclark.com)
-
-	* device.c (isascii): Define if necessary.
-	(canonicalize_name): Cast argument to isdigit() to unsigned char.
-
-Thu Apr 29 18:36:57 1993  James Clark  (jjc at jclark.com)
-
-	* xditview.c: Include <X11/Xos.h>.
-	(NewFile): Don't declare rindex(). Use strrchr() rather than
-	rindex().
-
-Tue Mar 30 15:12:09 1993  James Clark  (jjc at jclark)
-
-	* draw.c (charExists): Check that fi->per_char is not NULL.
-
-Sat Dec 12 17:42:40 1992  James Clark  (jjc at jclark)
-
-	* Dvi.c (SetGeometry): Cast XtMakeGeometryRequest arguments.
-
-	* draw.c (DrawPolygon, DrawFilledPolygon): Cast Xtfree argument.
-
-	* font.c (DisposeFontSizes): Add declaration.
-
-	* draw.c (FakeCharacter): Add declaration.
-
-Wed Oct 28 13:24:00 1992  James Clark  (jjc at jclark)
-
-	* Imakefile (install.dev): Deleted.
-	(fonts): New target.
-
-Mon Oct 12 10:50:44 1992  James Clark  (jjc at jclark)
-
-	* Imakefile (install.dev): Say when we're installing devX*-12.
-
-	* Imakefile (install.dev): Depends on DESC and FontMap.
-
-Thu Oct  1 20:03:45 1992  James Clark  (jjc at jclark)
-
-	* xditview.c (Syntax): Mention -filename option.
-
-Sat Aug 15 12:56:39 1992  James Clark  (jjc at jclark)
-
-	* GXditview.ad: Bind space and return to NextPage. Bind backspace
-	and delete to previous page.
-
-	* DviChar.c (Adobe_Symbol_map): Add `an'.
-
-	* DviChar.c (Adobe_Symbol_map): Add arrowvertex, arrowverttp, and
-	arrowvertbt.
-
-Mon Aug 10 11:54:27 1992  James Clark  (jjc at jclark)
-
-	* FontMap: Add m/p fields to the fonts names.
-
-Sat Aug  8 12:00:28 1992  James Clark  (jjc at jclark)
-
-	* DESC: Leave font positions 5-9 blank.
-
-Tue Jul 28 11:37:05 1992  James Clark  (jjc at jclark)
-
-	* Imakefile: Don't use gendef.  Pass definition of FONTPATH using
-	DEFINES.
-	(path.h): Deleted.
-	(device.c): Don't include path.h.  Provide default definition of
-	FONTPATH.
-
-Mon Jul  6 14:06:53 1992  James Clark  (jjc at jclark)
-
-	* Imakefile: Don't install tmac.X and tmac.Xps.
-	* tmac.X, tmac.Xps: Moved to ../macros.
-
-	* Imakefile: Don't install eqnchar.
-	* eqnchar: Deleted.
-
-Sun Jun 14 12:55:02 1992  James Clark  (jjc@jclark)
-
-	* tmac.Xps: Handle OE, oe, lq, rq.
-	* draw.c (FakeCharacter): Don't handle these.
-
-	* draw.c (FakeCharacter): Don't handle f/. 
-
-Mon Jun  8 11:46:37 1992  James Clark  (jjc@jclark)
-
-	* tmac.X: Translate char160 to space.
-
-Sun Jun  7 14:39:53 1992  James Clark  (jjc@jclark)
-
-	* tmac.X: Do `mso tmac.psic' before restoring compatibility mode.
-
-	* tmac.X: Add \(OE, \(oe, \(ah, \(ao, \(ho.
-
-	* tmac.Xps: Make it work in compatibility mode.
-	Redo existing character definitions with .Xps-char.
-	Add more character definitions.
-	(Xps-char): New macro.
-
-Sat Jun  6 21:46:03 1992  James Clark  (jjc@jclark)
-
-	* DviChar.c (Adobe_Symbol_map): Add +h, +f, +p, Fn, lz.
-	* tmac.X: Add \(bq, \(Bq, \(aq.
-	* tmac.Xps: Handle \(aq, \(bq, \(Bq, \(Fn.
-
-Wed Jun  3 11:11:15 1992  James Clark  (jjc@jclark)
-
-	* DviChar.c (Adobe_Symbol_map): Add wp.
-
-Tue Apr 21 09:21:59 1992  James Clark  (jjc at jclark)
-
-	* GXditview.ad: Bind n, p, q keys to NextPage, PreviousPage and
-	Quit actions.
-
-	* xditview.c (RerasterizeAction): New function.
-	(xditview_actions): Add RerasterizeAction.
-	* GXditview.ad: Bind r key to Rerasterize action.
-
-Fri Apr 17 08:25:36 1992  James Clark  (jjc at jclark)
-
-	* xditview.c: Add -filename option.
-	(main): Copy any -filename argument into current_file_name.
-
-Mon Mar 16 10:21:58 1992  James Clark  (jjc at jclark)
-
-	* tmac.X: Load tmac.pspic.
-
-Sun Mar  8 11:27:19 1992  James Clark  (jjc at jclark)
-
-	* Lex.c (GetLine, GetWord, GetNumber): Rewrite.
-
-Sat Oct 12 22:58:52 1991  James Clark  (jjc at jclark)
-
-	* Dvi.c (SetDevice): If the size change request is refused but a
-	larger geometry is offered, request that.
-
-Wed Oct  9 12:27:48 1991  James Clark  (jjc at jclark)
-
-	* font.c (InstallFontSizes): Ignore FontNameAverageWidth component.
-
-	* Dvi.c (default_font_map): Add `adobe' to font names to avoid
-	ambiguity.
-
-	* FontMap: New file.
-	* FontMap.X100, FontMap.X75: Deleted.
-	* xtotroff.c (main, usage): Add -s and -r options.
-	(MapFont): Change the font pattern to have the selected resolution and
-	size.
-	* Imakefile (install.dev): Use FontMap and supply appropriate -s
-	and -r options.
-
-	* xtotroff.c (MapFont): Check for ambiguity by comparing canonicalized
-	font names.
-
-	* DviP.h (DviFontList): Add initialized and scalable members.
-	(font.c):  Add support for scalable fonts based on R5 xditview.
-
-	* DviChar.c: Use xmalloc rather than malloc.
-	* xditview.c (xmalloc): New function.
-	* xtotroff.c (xmalloc): New function.
-	* other files: Use XtMalloc and XtFree instead of malloc and free.
-
-Thu Aug 29 20:15:31 1991  James Clark  (jjc at jclark)
-
-	* draw.c (setGC): Do multiplication in floating point to avoid
-	overflow.
-
-Tue Aug 13 12:04:41 1991  James Clark  (jjc at jclark)
-
-	* draw.c (FakeCharacter): Remove casts in defintion of pack2.
-
-Tue Jul 30 11:42:39 1991  James Clark  (jjc at jclark)
-
-	* tmac.Xps: New file.
-	* Imakefile (install): Install tmac.Xps.
-
-Tue Jul  2 09:31:37 1991  James Clark  (jjc at jclark)
-
-	* xtotroff.c (main): Pass argv[0] to usage().
-
-Sun Jun 30 12:34:06 1991  James Clark  (jjc at jclark)
-
-	* xtotroff.c (MapFont): Handle the case where XLoadQueryFont
-	returns NULL.
-
-Sat Jun 29 12:32:52 1991  James Clark  (jjc at jclark)
-
-	* Imakefile: Use ../gendef to generate path.h.
-
-Sun Jun 16 13:26:34 1991  James Clark  (jjc at jclark)
-
-	* Imakefile (depend.o): Change to device.o.
-
-Sun Jun  2 12:17:56 1991  James Clark  (jjc at jclark)
-
-	* Imakefile: Remove spaces from the beginning of variable
-	assignment lines.
-
-Sun May 26 14:14:01 1991  James Clark  (jjc at jclark)
-
-	* xditview.c (Syntax): Update.
-
-	* Dvi.c (DviSaveToFile, SaveToFile): New functions.
-	(FindPage): Check that we're not readingTmp before checking for
-	end of file of normal input file.
-	(ClassPartInitialize): New function.
-	* Dvi.h: Add declaration of DviSaveToFile.
-	* DviP.h: Add save method to DviClassPart. Declare
-	InheritSaveToFile.
-	* xditview.c (DoPrint, Print, PrintAction): New functions.
-	* xditview.c: Add print menu entry.
-	* xditview.c: Provide printCommand application resource.
-	* lex.c: Don't output EOF to temporary file.
-
-	* Dvi.c (QueryGeometry): Check request->request_mode.
-
-	* Dvi.c (SetDevice): New function.
-	(SetDeviceResolution): Deleted.
-
-	* Dvi.c: Add resolution resource.
-	* DviP.h: Add definitions of XtNResolution and XtCResolution.
-	* xditview.c: Add -resolution argument.
-	* GXditview.ad: Add default for GXditview.height.
-	* Dvi.c (Initialize, SetDevice): Use default_resolution.
-
-	* Dvi.c: Make MY_HEIGHT and MY_WIDTH use the paperlength and
-	paperwidth commands in the DESC file.
-	
-	* Dvi.c: Add SS font to default font map.
-
-	* draw.c: Rewritten so as not to assume device and display
-	resolution is the same.
-	* DviP.h: Include device.h. Add device_font member to DviFontList.
-	Add adjustable array to DviCharCache. Add text_x_width,
-	text_device_width, word_flag, device_font, device_font_number,
-	device, native, device_resolution, display_resolution,
-	paperlength, paperwidth, scale_factor, sizescale members.
-	* Dvi.c (Initialize): Initialize new variable used by draw.c.
-	(Destroy): Call device_destroy.
-	* font.c (MaxFontPosition): New function.
-	(LookupFontSizeBySize): Handle sizescale.
-	(InstallFont): Load the device font.
-	(ForgetFonts): New function.
-	(QueryDeviceFont): New function.
-	* parse.c (ParseInput): Handle t and u commands. Split off
-	character output into draw.c.
-	(ParseDeviceControl): Ignore res command. Use the device argument
-	to the T command.
-
-	* font.c (MapXNameToDviName): Ifdefed out.
-
-	* path.h: New file.
-	* device.c, device.h: New files.
-
-	* DviChar.c: Add entries for lB, rB, oq, lC, rC, md.
-
-	* INSTALL: New file.
-
-	* libxdvi: Merged into main directory.
-	* xtotroff.c, xditview.c: Change includes accordingly.	
-
-	* devX75, devX100: Merged into main directory.
-	* xditview.man: Renamed to gxditview.man.
-
-	* Xditview.ad: Renamed to GXditview.ad.
-	* xditview.c (main): Use class of GXditview rather than xditview.
-
-	* Imakefile: New file.
-	* Makefile: Deleted.
-
-	* xtotroff.c (MapFont): Unlink output file before opening it.
-
-	* Started separate ChangeLog.
diff --git a/src/xditview/DESC b/src/xditview/DESC
deleted file mode 100644
index 172170c9..00000000
--- a/src/xditview/DESC
+++ /dev/null
@@ -1,9 +0,0 @@
-styles R I B BI
-fonts 6 0 0 0 0 0 S
-sizes 8 10 12 14 18 24 0
-res 75
-X11
-hor 1
-vert 1
-unitwidth 10
-postpro gxditview
diff --git a/src/xditview/Dvi.c b/src/xditview/Dvi.c
deleted file mode 100644
index b577b9aa..00000000
--- a/src/xditview/Dvi.c
+++ /dev/null
@@ -1,588 +0,0 @@
-#ifndef SABER
-#ifndef lint
-static char Xrcsid[] = "$XConsortium: Dvi.c,v 1.9 89/12/10 16:12:25 rws Exp $";
-#endif /* lint */
-#endif /* SABER */
-
-/*
- * Dvi.c - Dvi display widget
- *
- */
-
-#define XtStrlen(s)	((s) ? strlen(s) : 0)
-
-  /* The following are defined for the reader's convenience.  Any
-     Xt..Field macro in this code just refers to some field in
-     one of the substructures of the WidgetRec.  */
-
-#include <X11/IntrinsicP.h>
-#include <X11/StringDefs.h>
-#include <X11/Xmu/Converters.h>
-#include <stdio.h>
-#include <ctype.h>
-#include "DviP.h"
-
-/****************************************************************
- *
- * Full class record constant
- *
- ****************************************************************/
-
-/* Private Data */
-
-static char default_font_map[] =  "\
-TR	-adobe-times-medium-r-normal--*-100-*-*-*-*-iso8859-1\n\
-TI	-adobe-times-medium-i-normal--*-100-*-*-*-*-iso8859-1\n\
-TB	-adobe-times-bold-r-normal--*-100-*-*-*-*-iso8859-1\n\
-TBI	-adobe-times-bold-i-normal--*-100-*-*-*-*-iso8859-1\n\
-CR	-adobe-courier-medium-r-normal--*-100-*-*-*-*-iso8859-1\n\
-CI	-adobe-courier-medium-o-normal--*-100-*-*-*-*-iso8859-1\n\
-CB	-adobe-courier-bold-r-normal--*-100-*-*-*-*-iso8859-1\n\
-CBI	-adobe-courier-bold-o-normal--*-100-*-*-*-*-iso8859-1\n\
-HR	-adobe-helvetica-medium-r-normal--*-100-*-*-*-*-iso8859-1\n\
-HI	-adobe-helvetica-medium-o-normal--*-100-*-*-*-*-iso8859-1\n\
-HB	-adobe-helvetica-bold-r-normal--*-100-*-*-*-*-iso8859-1\n\
-HBI	-adobe-helvetica-bold-o-normal--*-100-*-*-*-*-iso8859-1\n\
-NR	-adobe-new century schoolbook-medium-r-normal--*-100-*-*-*-*-iso8859-1\n\
-NI	-adobe-new century schoolbook-medium-i-normal--*-100-*-*-*-*-iso8859-1\n\
-NB	-adobe-new century schoolbook-bold-r-normal--*-100-*-*-*-*-iso8859-1\n\
-NBI	-adobe-new century schoolbook-bold-i-normal--*-100-*-*-*-*-iso8859-1\n\
-S	-adobe-symbol-medium-r-normal--*-100-*-*-*-*-adobe-fontspecific\n\
-SS	-adobe-symbol-medium-r-normal--*-100-*-*-*-*-adobe-fontspecific\n\
-";
-
-#define offset(field) XtOffset(DviWidget, field)
-
-#define MY_WIDTH(dw) ((int)(dw->dvi.paperwidth * dw->dvi.scale_factor + .5))
-#define MY_HEIGHT(dw) ((int)(dw->dvi.paperlength * dw->dvi.scale_factor + .5))
-
-static XtResource resources[] = { 
-	{XtNfontMap, XtCFontMap, XtRString, sizeof (char *),
-	 offset(dvi.font_map_string), XtRString, default_font_map},
-	{XtNforeground, XtCForeground, XtRPixel, sizeof (unsigned long),
-	 offset(dvi.foreground), XtRString, "XtDefaultForeground"},
-	{XtNbackground, XtCBackground, XtRPixel, sizeof (unsigned long),
-	 offset(dvi.background), XtRString, "XtDefaultBackground"},
-	{XtNpageNumber, XtCPageNumber, XtRInt, sizeof (int),
-	 offset(dvi.requested_page), XtRString, "1"},
-	{XtNlastPageNumber, XtCLastPageNumber, XtRInt, sizeof (int),
-	 offset (dvi.last_page), XtRString, "0"},
-	{XtNfile, XtCFile, XtRFile, sizeof (FILE *),
-	 offset (dvi.file), XtRFile, (char *) 0},
-	{XtNseek, XtCSeek, XtRBoolean, sizeof (Boolean),
-	 offset(dvi.seek), XtRString, "false"},
-	{XtNfont, XtCFont, XtRFontStruct, sizeof (XFontStruct *),
-	 offset(dvi.default_font), XtRString, "xtdefaultfont"},
-	{XtNbackingStore, XtCBackingStore, XtRBackingStore, sizeof (int),
-	 offset(dvi.backing_store), XtRString, "default"},
-	{XtNnoPolyText, XtCNoPolyText, XtRBoolean, sizeof (Boolean),
-	 offset(dvi.noPolyText), XtRString, "false"},
-	{XtNresolution, XtCResolution, XtRInt, sizeof(int),
-	 offset(dvi.default_resolution), XtRString, "75"},
-};
-
-#undef offset
-
-static void		ClassInitialize ();
-static void		ClassPartInitialize();
-static void		Initialize(), Realize (), Destroy (), Redisplay ();
-static Boolean		SetValues (), SetValuesHook ();
-static XtGeometryResult	QueryGeometry ();
-static void		ShowDvi ();
-static void		CloseFile (), OpenFile ();
-static void		FindPage ();
-
-static void		SaveToFile ();
-
-/* font.c */
-extern void ParseFontMap();
-extern void DestroyFontMap();
-extern void ForgetFonts();
-
-/* page.c */
-extern void DestroyFileMap();
-extern long SearchPagePosition();
-extern void FileSeek();
-extern void ForgetPagePositions();
-
-/* parse.c */
-extern int ParseInput();
-
-DviClassRec dviClassRec = {
-{
-	&widgetClassRec,		/* superclass		  */	
-	"Dvi",				/* class_name		  */
-	sizeof(DviRec),			/* size			  */
-	ClassInitialize,		/* class_initialize	  */
-	ClassPartInitialize,		/* class_part_initialize  */
-	FALSE,				/* class_inited		  */
-	Initialize,			/* initialize		  */
-	NULL,				/* initialize_hook	  */
-	Realize,			/* realize		  */
-	NULL,				/* actions		  */
-	0,				/* num_actions		  */
-	resources,			/* resources		  */
-	XtNumber(resources),		/* resource_count	  */
-	NULLQUARK,			/* xrm_class		  */
-	FALSE,				/* compress_motion	  */
-	TRUE,				/* compress_exposure	  */
-	TRUE,				/* compress_enterleave    */
-	FALSE,				/* visible_interest	  */
-	Destroy,			/* destroy		  */
-	NULL,				/* resize		  */
-	Redisplay,			/* expose		  */
-	SetValues,			/* set_values		  */
-	SetValuesHook,			/* set_values_hook	  */
-	NULL,				/* set_values_almost	  */
-	NULL,				/* get_values_hook	  */
-	NULL,				/* accept_focus		  */
-	XtVersion,			/* version		  */
-	NULL,				/* callback_private	  */
-	0,				/* tm_table		  */
-	QueryGeometry,			/* query_geometry	  */
-	NULL,				/* display_accelerator	  */
-	NULL				/* extension		  */
-},{
-	SaveToFile,			/* save    */
-},
-};
-
-WidgetClass dviWidgetClass = (WidgetClass) &dviClassRec;
-
-static void ClassInitialize ()
-{
-	XtAddConverter( XtRString, XtRBackingStore, XmuCvtStringToBackingStore,
-			NULL, 0 );
-}
-
-/****************************************************************
- *
- * Private Procedures
- *
- ****************************************************************/
-
-/* ARGSUSED */
-static void Initialize(request, new)
-	Widget request, new;
-{
-	DviWidget	dw = (DviWidget) new;
-
-	dw->dvi.current_page = 0;
-	dw->dvi.font_map = 0;
-	dw->dvi.cache.index = 0;
-	dw->dvi.text_x_width = 0;
-	dw->dvi.text_device_width = 0;
-	dw->dvi.word_flag = 0;
-	dw->dvi.file = 0;
-	dw->dvi.tmpFile = 0;
-	dw->dvi.state = 0;
-	dw->dvi.readingTmp = 0;
-	dw->dvi.cache.char_index = 0;
-	dw->dvi.cache.font_size = -1;
-	dw->dvi.cache.font_number = -1;
-	dw->dvi.cache.adjustable[0] = 0;
-	dw->dvi.file_map = 0;
-	dw->dvi.fonts = 0;
-	dw->dvi.seek = False;
-	dw->dvi.device_resolution = dw->dvi.default_resolution;
-	dw->dvi.display_resolution = dw->dvi.default_resolution;
-	dw->dvi.paperlength = dw->dvi.default_resolution*11;
-	dw->dvi.paperwidth = (dw->dvi.default_resolution*8
-			      + dw->dvi.default_resolution/2);
-	dw->dvi.scale_factor = 1.0;
-	dw->dvi.sizescale = 1;
-	dw->dvi.line_thickness = -1;
-	dw->dvi.line_width = 1;
-	dw->dvi.fill = DVI_FILL_MAX;
-	dw->dvi.device_font = 0;
-	dw->dvi.device_font_number = -1;
-	dw->dvi.device = 0;
-	dw->dvi.native = 0;
-}
-
-#include "gray1.bm"
-#include "gray2.bm"
-#include "gray3.bm"
-#include "gray4.bm"
-#include "gray5.bm"
-#include "gray6.bm"
-#include "gray7.bm"
-#include "gray8.bm"
-
-static void
-Realize (w, valueMask, attrs)
-	Widget			w;
-	XtValueMask		*valueMask;
-	XSetWindowAttributes	*attrs;
-{
-	DviWidget	dw = (DviWidget) w;
-	XGCValues	values;
-
-	if (dw->dvi.backing_store != Always + WhenMapped + NotUseful) {
-		attrs->backing_store = dw->dvi.backing_store;
-		*valueMask |= CWBackingStore;
-	}
-	XtCreateWindow (w, (unsigned)InputOutput, (Visual *) CopyFromParent,
-			*valueMask, attrs);
-	values.foreground = dw->dvi.foreground;
-	values.cap_style = CapRound;
-	values.join_style = JoinRound;
-	values.line_width = dw->dvi.line_width;
-	dw->dvi.normal_GC = XCreateGC (XtDisplay (w), XtWindow (w),
-				       GCForeground|GCCapStyle|GCJoinStyle
-				       |GCLineWidth,
-				       &values);
-	dw->dvi.gray[0] = XCreateBitmapFromData(XtDisplay (w), XtWindow (w),
-					     gray1_bits,
-					     gray1_width, gray1_height);
-	dw->dvi.gray[1] = XCreateBitmapFromData(XtDisplay (w), XtWindow (w),
-					     gray2_bits,
-					     gray2_width, gray2_height);
-	dw->dvi.gray[2] = XCreateBitmapFromData(XtDisplay (w), XtWindow (w),
-					     gray3_bits,
-					     gray3_width, gray3_height);
-	dw->dvi.gray[3] = XCreateBitmapFromData(XtDisplay (w), XtWindow (w),
-					     gray4_bits,
-					     gray4_width, gray4_height);
-	dw->dvi.gray[4] = XCreateBitmapFromData(XtDisplay (w), XtWindow (w),
-					     gray5_bits,
-					     gray5_width, gray5_height);
-	dw->dvi.gray[5] = XCreateBitmapFromData(XtDisplay (w), XtWindow (w),
-					     gray6_bits,
-					     gray6_width, gray6_height);
-	dw->dvi.gray[6] = XCreateBitmapFromData(XtDisplay (w), XtWindow (w),
-					     gray7_bits,
-					     gray7_width, gray7_height);
-	dw->dvi.gray[7] = XCreateBitmapFromData(XtDisplay (w), XtWindow (w),
-					     gray8_bits,
-					     gray8_width, gray8_height);
-	values.background = dw->dvi.background;
-	values.stipple = dw->dvi.gray[5];
-	dw->dvi.fill_GC = XCreateGC (XtDisplay (w), XtWindow (w),
-				     GCForeground|GCBackground|GCStipple,
-				     &values);
-
-	dw->dvi.fill_type = 9;
-
-	if (dw->dvi.file)
-		OpenFile (dw);
-	ParseFontMap (dw);
-}
-
-static void
-Destroy(w)
-	Widget w;
-{
-	DviWidget	dw = (DviWidget) w;
-
-	XFreeGC (XtDisplay (w), dw->dvi.normal_GC);
-	XFreeGC (XtDisplay (w), dw->dvi.fill_GC);
-	XFreePixmap (XtDisplay (w), dw->dvi.gray[0]);
-	XFreePixmap (XtDisplay (w), dw->dvi.gray[1]);
-	XFreePixmap (XtDisplay (w), dw->dvi.gray[2]);
-	XFreePixmap (XtDisplay (w), dw->dvi.gray[3]);
-	XFreePixmap (XtDisplay (w), dw->dvi.gray[4]);
-	XFreePixmap (XtDisplay (w), dw->dvi.gray[5]);
-	XFreePixmap (XtDisplay (w), dw->dvi.gray[6]);
-	XFreePixmap (XtDisplay (w), dw->dvi.gray[7]);
-	DestroyFontMap (dw->dvi.font_map);
-	DestroyFileMap (dw->dvi.file_map);
-	device_destroy (dw->dvi.device);
-}
-
-/*
- * Repaint the widget window
- */
-
-/* ARGSUSED */
-static void
-Redisplay(w, event, region)
-	Widget w;
-	XEvent *event;
-	Region region;
-{
-	DviWidget	dw = (DviWidget) w;
-	XRectangle	extents;
-	
-	XClipBox (region, &extents);
-	dw->dvi.extents.x1 = extents.x;
-	dw->dvi.extents.y1 = extents.y;
-	dw->dvi.extents.x2 = extents.x + extents.width;
-	dw->dvi.extents.y2 = extents.y + extents.height;
-	ShowDvi (dw);
-}
-
-/*
- * Set specified arguments into widget
- */
-/* ARGSUSED */
-static Boolean
-SetValues (current, request, new)
-	DviWidget current, request, new;
-{
-	Boolean		redisplay = FALSE;
-	char		*new_map;
-	int		cur, req;
-
-	if (current->dvi.font_map_string != request->dvi.font_map_string) {
-		new_map = XtMalloc (strlen (request->dvi.font_map_string) + 1);
-		if (new_map) {
-			redisplay = TRUE;
-			strcpy (new_map, request->dvi.font_map_string);
-			new->dvi.font_map_string = new_map;
-			if (current->dvi.font_map_string)
-				XtFree (current->dvi.font_map_string);
-			current->dvi.font_map_string = 0;
-			ParseFontMap (new);
-		}
-	}
-
-	req = request->dvi.requested_page;
-	cur = current->dvi.requested_page;
-	if (cur != req) {
-		if (!request->dvi.file)
-		    req = 0;
-		else {
-		    if (req < 1)
-			    req = 1;
-		    if (current->dvi.last_page != 0 &&
-			req > current->dvi.last_page)
-			    req = current->dvi.last_page;
-		}
-		if (cur != req)
-	    	    redisplay = TRUE;
-		new->dvi.requested_page = req;
-		if (current->dvi.last_page == 0 && req > cur)
-			FindPage (new);
-	}
-
-	return redisplay;
-}
-
-/*
- * use the set_values_hook entry to check when
- * the file is set
- */
-
-static Boolean
-SetValuesHook (dw, args, num_argsp)
-	DviWidget	dw;
-	ArgList		args;
-	Cardinal	*num_argsp;
-{
-	Cardinal	i;
-
-	for (i = 0; i < *num_argsp; i++) {
-		if (!strcmp (args[i].name, XtNfile)) {
-			CloseFile (dw);
-			OpenFile (dw);
-			return TRUE;
-		}
-	}
-	return FALSE;
-}
-
-static void CloseFile (dw)
-	DviWidget	dw;
-{
-	if (dw->dvi.tmpFile)
-		fclose (dw->dvi.tmpFile);
-	ForgetPagePositions (dw);
-}
-
-static void OpenFile (dw)
-	DviWidget	dw;
-{
-	dw->dvi.tmpFile = 0;
-	if (!dw->dvi.seek)
-		dw->dvi.tmpFile = tmpfile();
-	dw->dvi.requested_page = 1;
-	dw->dvi.last_page = 0;
-}
-
-static XtGeometryResult
-QueryGeometry (w, request, geometry_return)
-	Widget			w;
-	XtWidgetGeometry	*request, *geometry_return;
-{
-	XtGeometryResult	ret;
-	DviWidget		dw = (DviWidget) w;
-
-	ret = XtGeometryYes;
-	if (((request->request_mode & CWWidth)
-	     && request->width < MY_WIDTH(dw))
-	    || ((request->request_mode & CWHeight)
-		&& request->height < MY_HEIGHT(dw)))
-		ret = XtGeometryAlmost;
-	geometry_return->width = MY_WIDTH(dw);
-	geometry_return->height = MY_HEIGHT(dw);
-	geometry_return->request_mode = CWWidth|CWHeight;
-	return ret;
-}
-
-void
-SetDevice (dw, name)
-	DviWidget	dw;
-	char 		*name;
-{
-	XtWidgetGeometry	request, reply;
-	XtGeometryResult ret;
-
-	ForgetFonts (dw);
-	dw->dvi.device = device_load (name);
-	if (!dw->dvi.device)
-		return;
-	dw->dvi.sizescale = dw->dvi.device->sizescale;
-	dw->dvi.device_resolution = dw->dvi.device->res;
-	dw->dvi.native = dw->dvi.device->X11;
-	dw->dvi.paperlength = dw->dvi.device->paperlength;
-	dw->dvi.paperwidth = dw->dvi.device->paperwidth;
-	if (dw->dvi.native) {
-		dw->dvi.display_resolution = dw->dvi.device_resolution;
-		dw->dvi.scale_factor = 1.0;
-	}
-	else {
-		dw->dvi.display_resolution = dw->dvi.default_resolution;
-		dw->dvi.scale_factor = ((double)dw->dvi.display_resolution
-					/ dw->dvi.device_resolution);
-	}
-	request.request_mode = CWWidth|CWHeight;
-	request.width = MY_WIDTH(dw);
-	request.height = MY_HEIGHT(dw);
-	ret = XtMakeGeometryRequest ((Widget)dw, &request, &reply);
-	if (ret == XtGeometryAlmost
-	    && reply.height >= request.height
-	    && reply.width >= request.width) {
-		request.width = reply.width;
-		request.height = reply.height;
-		XtMakeGeometryRequest ((Widget)dw, &request, &reply);
-	}
-}
-
-static void
-ShowDvi (dw)
-	DviWidget	dw;
-{
-	if (!dw->dvi.file) {
-		static char Error[] = "No file selected";
-
-		XSetFont (XtDisplay(dw), dw->dvi.normal_GC,
-			  dw->dvi.default_font->fid);
-		XDrawString (XtDisplay (dw), XtWindow (dw), dw->dvi.normal_GC,
-			     20, 20, Error, strlen (Error));
-		return;
-	}
-
-	FindPage (dw);
-	
-	dw->dvi.display_enable = 1;
-	ParseInput (dw);
-	if (dw->dvi.last_page && dw->dvi.requested_page > dw->dvi.last_page)
-		dw->dvi.requested_page = dw->dvi.last_page;
-}
-
-static void
-FindPage (dw)
-	DviWidget	dw;
-{
-	int	i;
-	long	file_position;
-
-	if (dw->dvi.requested_page < 1)
-		dw->dvi.requested_page = 1;
-
-	if (dw->dvi.last_page != 0 && dw->dvi.requested_page > dw->dvi.last_page)
-		dw->dvi.requested_page = dw->dvi.last_page;
-
-	file_position = SearchPagePosition (dw, dw->dvi.requested_page);
-	if (file_position != -1) {
-		FileSeek(dw, file_position);
-		dw->dvi.current_page = dw->dvi.requested_page;
-	} else {
-		for (i=dw->dvi.requested_page; i > 0; i--) {
-			file_position = SearchPagePosition (dw, i);
-			if (file_position != -1)
-				break;
-		}
-		if (file_position == -1)
-			file_position = 0;
-		FileSeek (dw, file_position);
-
-		dw->dvi.current_page = i;
-		
-		dw->dvi.display_enable = 0;
-		while (dw->dvi.current_page != dw->dvi.requested_page) {
-			dw->dvi.current_page = ParseInput (dw);
-			/*
-			 * at EOF, seek back to the beginning of this page.
-			 */
-			if (!dw->dvi.readingTmp && feof (dw->dvi.file)) {
-				file_position = SearchPagePosition (dw,
-						dw->dvi.current_page);
-				if (file_position != -1)
-					FileSeek (dw, file_position);
-				dw->dvi.requested_page = dw->dvi.current_page;
-				break;
-			}
-		}
-	}
-}
-
-void DviSaveToFile(w, fp)
-	Widget w;
-	FILE *fp;
-{
-	XtCheckSubclass(w, dviWidgetClass, NULL);
-	(*((DviWidgetClass) XtClass(w))->command_class.save)(w, fp);
-}
-
-static
-void SaveToFile(w, fp)
-	Widget w;
-	FILE *fp;
-{
-	DviWidget dw = (DviWidget)w;
-	long pos;
-	int c;
-
-	if (dw->dvi.tmpFile) {
-		pos = ftell(dw->dvi.tmpFile);
-		if (dw->dvi.ungot) {
-			pos--;
-			dw->dvi.ungot = 0;
-			/* The ungot character is in the tmpFile, so we don't
-			   want to read it from file. */
-			(void)getc(dw->dvi.file);
-		}
-	}
-	else
-		pos = ftell(dw->dvi.file);
-	FileSeek(dw, 0L);
-	while (DviGetC(dw, &c) != EOF)
-		if (putc(c, fp) == EOF) {
-			/* XXX print error message */
-			break;
-		}
-	FileSeek(dw, pos);
-}
-
-static
-void ClassPartInitialize(widget_class)
-	WidgetClass widget_class;
-{
-	DviWidgetClass wc = (DviWidgetClass)widget_class;
-	DviWidgetClass super = (DviWidgetClass) wc->core_class.superclass;
-	if (wc->command_class.save == InheritSaveToFile)
-		wc->command_class.save = super->command_class.save;
-}
-	
-/*
-Local Variables:
-c-indent-level: 8
-c-continued-statement-offset: 8
-c-brace-offset: -8
-c-argdecl-indent: 8
-c-label-offset: -8
-c-tab-always-indent: nil
-End:
-*/
diff --git a/src/xditview/Dvi.h b/src/xditview/Dvi.h
deleted file mode 100644
index 5aab7d8c..00000000
--- a/src/xditview/Dvi.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-* $XConsortium: Dvi.h,v 1.4 89/07/21 14:22:06 jim Exp $
-*/
-
-#ifndef _XtDvi_h
-#define _XtDvi_h
-
-/***********************************************************************
- *
- * Dvi Widget
- *
- ***********************************************************************/
-
-/* Parameters:
-
- Name		     Class		RepType		Default Value
- ----		     -----		-------		-------------
- background	     Background		pixel		White
- foreground	     Foreground		Pixel		Black
- fontMap	     FontMap		char *		...
- pageNumber	     PageNumber		int		1
-*/
-
-#define XtNfontMap	"fontMap"
-#define XtNpageNumber	"pageNumber"
-#define XtNlastPageNumber   "lastPageNumber"
-#define XtNnoPolyText	"noPolyText"
-#define XtNseek		"seek"
-#define XtNresolution	"resolution"
-
-#define XtCFontMap	"FontMap"
-#define XtCPageNumber	"PageNumber"
-#define XtCLastPageNumber   "LastPageNumber"
-#define XtCNoPolyText	"NoPolyText"
-#define XtCSeek		"Seek"
-#define XtCResolution	"Resolution"
-
-typedef struct _DviRec *DviWidget;  /* completely defined in DviPrivate.h */
-typedef struct _DviClassRec *DviWidgetClass;    /* completely defined in DviPrivate.h */
-
-extern WidgetClass dviWidgetClass;
-
-extern void DviSaveToFile();
-
-#endif /* _XtDvi_h */
-/* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/src/xditview/DviChar.c b/src/xditview/DviChar.c
deleted file mode 100644
index fa37b24c..00000000
--- a/src/xditview/DviChar.c
+++ /dev/null
@@ -1,664 +0,0 @@
-/*
- * DviChar.c
- *
- * Map DVI (ditroff output) character names to
- * font indexes and back
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include "DviChar.h"
-
-extern char *xmalloc();
-
-#define allocHash() ((DviCharNameHash *) xmalloc (sizeof (DviCharNameHash)))
-
-struct map_list {
-	struct map_list	*next;
-	DviCharNameMap	*map;
-};
-
-static struct map_list	*world;
-
-static int	standard_maps_loaded = 0;
-static void	load_standard_maps ();
-static int	hash_name ();
-static void	dispose_hash(), compute_hash();
-
-DviCharNameMap *
-DviFindMap (encoding)
-	char	*encoding;
-{
-	struct map_list	*m;
-
-	if (!standard_maps_loaded)
-		load_standard_maps ();
-	for (m = world; m; m=m->next)
-		if (!strcmp (m->map->encoding, encoding))
-			return m->map;
-	return 0;
-}
-
-void
-DviRegisterMap (map)
-	DviCharNameMap	*map;
-{
-	struct map_list	*m;
-
-	if (!standard_maps_loaded)
-		load_standard_maps ();
-	for (m = world; m; m = m->next)
-		if (!strcmp (m->map->encoding, map->encoding))
-			break;
-	if (!m) {
-		m = (struct map_list *) xmalloc (sizeof *m);
-		m->next = world;
-		world = m;
-	}
-	dispose_hash (map);
-	m->map = map;
-	compute_hash (map);
-}
-
-static void
-dispose_hash (map)
-	DviCharNameMap	*map;
-{
-	DviCharNameHash	**buckets;
-	DviCharNameHash	*h, *next;
-	int		i;
-
-	buckets = map->buckets;
-	for (i = 0; i < DVI_HASH_SIZE; i++) {
-		for (h = buckets[i]; h; h=next) {
-			next = h->next;
-			free (h);
-		}
-	}
-}
-
-static int
-hash_name (name)
-	char	*name;
-{
-	int	i = 0;
-
-	while (*name)
-		i = (i << 1) ^ *name++;
-	if (i < 0)
-		i = -i;
-	return i;
-}
-
-static void
-compute_hash (map)
-	DviCharNameMap	*map;
-{
-	DviCharNameHash	**buckets;
-	int		c, s, i;
-	DviCharNameHash	*h;
-
-	buckets = map->buckets;
-	for (i = 0; i < DVI_HASH_SIZE; i++)
-		buckets[i] = 0;
-	for (c = 0; c < DVI_MAP_SIZE; c++)
-		for (s = 0; s < DVI_MAX_SYNONYMS; s++) {
-			if (!map->dvi_names[c][s])
-				break;
-			i = hash_name (map->dvi_names[c][s]) % DVI_HASH_SIZE;
-			h = allocHash ();
-			h->next = buckets[i];
-			buckets[i] = h;
-			h->name = map->dvi_names[c][s];
-			h->position = c;
-		}
-	
-}
-
-int
-DviCharIndex (map, name)
-	DviCharNameMap	*map;
-	char		*name;
-{
-	int		i;
-	DviCharNameHash	*h;
-
-	i = hash_name (name) % DVI_HASH_SIZE;
-	for (h = map->buckets[i]; h; h=h->next)
-		if (!strcmp (h->name, name))
-			return h->position;
-	return -1;
-}
-
-static DviCharNameMap ISO8859_1_map = {
-	"iso8859-1",
-	0,
-{
-{	0,			/* 0 */},
-{	0,			/* 1 */},
-{	0,			/* 2 */},
-{	0,			/* 3 */},
-{	0,			/* 4 */},
-{	0,			/* 5 */},
-{	0,			/* 6 */},
-{	0,			/* 7 */},
-{	0,			/* 8 */},
-{	0,			/* 9 */},
-{	0,			/* 10 */},
-{	0,			/* 11 */},
-{	0,			/* 12 */},
-{	0,			/* 13 */},
-{	0,			/* 14 */},
-{	0,			/* 15 */},
-{	0,			/* 16 */},
-{	0,			/* 17 */},
-{	0,			/* 18 */},
-{	0,			/* 19 */},
-{	0,			/* 20 */},
-{	0,			/* 21 */},
-{	0,			/* 22 */},
-{	0,			/* 23 */},
-{	0,			/* 24 */},
-{	0,			/* 25 */},
-{	0,			/* 26 */},
-{	0,			/* 27 */},
-{	0,			/* 28 */},
-{	0,			/* 29 */},
-{	0,			/* 30 */},
-{	0,			/* 31 */},
-{	0,			/* 32 */},
-{	"!",			/* 33 */},
-{	"\"", "dq",		/* 34 */},
-{	"#", "sh",		/* 35 */},
-{	"$", "Do",		/* 36 */},
-{	"%",			/* 37 */},
-{	"&",			/* 38 */},
-{	"'", "cq",		/* 39 */},
-{	"(",			/* 40 */},
-{	")",			/* 41 */},
-{	"*",			/* 42 */},
-{	"+",			/* 43 */},
-{	",",			/* 44 */},
-{	"\\-",			/* 45 */},
-{	".",			/* 46 */},
-{	"/", "sl",		/* 47 */},
-{	"0",			/* 48 */},
-{	"1",			/* 49 */},
-{	"2",			/* 50 */},
-{	"3",			/* 51 */},
-{	"4",			/* 52 */},
-{	"5",			/* 53 */},
-{	"6",			/* 54 */},
-{	"7",			/* 55 */},
-{	"8",			/* 56 */},
-{	"9",			/* 57 */},
-{	":",			/* 58 */},
-{	";",			/* 59 */},
-{	"<",			/* 60 */},
-{	"=",			/* 61 */},
-{	">",			/* 62 */},
-{	"?",			/* 63 */},
-{	"@", "at",		/* 64 */},
-{	"A",			/* 65 */},
-{	"B",			/* 66 */},
-{	"C",			/* 67 */},
-{	"D",			/* 68 */},
-{	"E",			/* 69 */},
-{	"F",			/* 70 */},
-{	"G",			/* 71 */},
-{	"H",			/* 72 */},
-{	"I",			/* 73 */},
-{	"J",			/* 74 */},
-{	"K",			/* 75 */},
-{	"L",			/* 76 */},
-{	"M",			/* 77 */},
-{	"N",			/* 78 */},
-{	"O",			/* 79 */},
-{	"P",			/* 80 */},
-{	"Q",			/* 81 */},
-{	"R",			/* 82 */},
-{	"S",			/* 83 */},
-{	"T",			/* 84 */},
-{	"U",			/* 85 */},
-{	"V",			/* 86 */},
-{	"W",			/* 87 */},
-{	"X",			/* 88 */},
-{	"Y",			/* 89 */},
-{	"Z",			/* 90 */},
-{	"[", "lB",		/* 91 */},
-{	"\\", "rs",		/* 92 */},
-{	"]", "rB",		/* 93 */},
-{	"^", "a^", "ha",	/* 94 */},
-{	"_",			/* 95 */},
-{	"`", "oq",		/* 96 */},
-{	"a",			/* 97 */},
-{	"b",			/* 98 */},
-{	"c",			/* 99 */},
-{	"d",			/* 100 */},
-{	"e",			/* 101 */},
-{	"f",			/* 102 */},
-{	"g",			/* 103 */},
-{	"h",			/* 104 */},
-{	"i",			/* 105 */},
-{	"j",			/* 106 */},
-{	"k",			/* 107 */},
-{	"l",			/* 108 */},
-{	"m",			/* 109 */},
-{	"n",			/* 110 */},
-{	"o",			/* 111 */},
-{	"p",			/* 112 */},
-{	"q",			/* 113 */},
-{	"r",			/* 114 */},
-{	"s",			/* 115 */},
-{	"t",			/* 116 */},
-{	"u",			/* 117 */},
-{	"v",			/* 118 */},
-{	"w",			/* 119 */},
-{	"x",			/* 120 */},
-{	"y",			/* 121 */},
-{	"z",			/* 122 */},
-{	"{", "lC",		/* 123 */},
-{	"|", "ba",		/* 124 */},
-{	"}", "rC",		/* 125 */},
-{	"~", "a~", "ti",	/* 126 */},
-{	0,			/* 127 */},
-{	0,			/* 128 */},
-{	0,			/* 129 */},
-{	0,			/* 130 */},
-{	0,			/* 131 */},
-{	0,			/* 132 */},
-{	0,			/* 133 */},
-{	0,			/* 134 */},
-{	0,			/* 135 */},
-{	0,			/* 136 */},
-{	0,			/* 137 */},
-{	0,			/* 138 */},
-{	0,			/* 139 */},
-{	0,			/* 140 */},
-{	0,			/* 141 */},
-{	0,			/* 142 */},
-{	0,			/* 143 */},
-{	0,			/* 144 */},
-{	0,			/* 145 */},
-{	0,			/* 146 */},
-{	0,			/* 147 */},
-{	0,			/* 148 */},
-{	0,			/* 149 */},
-{	0,			/* 150 */},
-{	0,			/* 151 */},
-{	0,			/* 152 */},
-{	0,			/* 153 */},
-{	0,			/* 154 */},
-{	0,			/* 155 */},
-{	0,			/* 156 */},
-{	0,			/* 157 */},
-{	0,			/* 158 */},
-{	0,			/* 159 */},
-{	0,			/* 160 */},
-{	"r!",			/* 161 */},
-{	"ct",			/* 162 */},
-{	"Po",			/* 163 */},
-{	"Cs",			/* 164 */},
-{	"Ye",			/* 165 */},
-{	"bb",			/* 166 */},
-{	"sc",			/* 167 */},
-{	"ad",			/* 168 */},
-{	"co",			/* 169 */},
-{	"Of",			/* 170 */},
-{	"Fo",			/* 171 */},
-{	"tno",			/* 172 */},
-{	"-", "hy",		/* 173 */},
-{	"rg",			/* 174 */},
-{	"a-",			/* 175 */},
-{	"de",			/* 176 */},
-{	"t+-",			/* 177 */},
-{	"S2",			/* 178 */},
-{	"S3",			/* 179 */},
-{	"aa",			/* 180 */},
-{	"mc",			/* 181 */},
-{	"ps",			/* 182 */},
-{	"pc",			/* 183 */},
-{	"ac",			/* 184 */},
-{	"S1",			/* 185 */},
-{	"Om",			/* 186 */},
-{	"Fc",			/* 187 */},
-{	"14",			/* 188 */},
-{	"12",			/* 189 */},
-{	"34",			/* 190 */},
-{	"r?",			/* 191 */},
-{	"`A",			/* 192 */},
-{	"'A",			/* 193 */},
-{	"^A",			/* 194 */},
-{	"~A",			/* 195 */},
-{	":A",			/* 196 */},
-{	"oA",			/* 197 */},
-{	"AE",			/* 198 */},
-{	",C",			/* 199 */},
-{	"`E",			/* 200 */},
-{	"'E",			/* 201 */},
-{	"^E",			/* 202 */},
-{	":E",			/* 203 */},
-{	"`I",			/* 204 */},
-{	"'I",			/* 205 */},
-{	"^I",			/* 206 */},
-{	":I",			/* 207 */},
-{	"-D",			/* 208 */},
-{	"~N",			/* 209 */},
-{	"`O",			/* 210 */},
-{	"'O",			/* 211 */},
-{	"^O",			/* 212 */},
-{	"~O",			/* 213 */},
-{	":O",			/* 214 */},
-{	"tmu",			/* 215 */},
-{	"/O",			/* 216 */},
-{	"`U",			/* 217 */},
-{	"'U",			/* 218 */},
-{	"^U",			/* 219 */},
-{	":U",			/* 220 */},
-{	"'Y",			/* 221 */},
-{	"TP",			/* 222 */},
-{	"ss",			/* 223 */},
-{	"`a",			/* 224 */},
-{	"'a",			/* 225 */},
-{	"^a",			/* 226 */},
-{	"~a",			/* 227 */},
-{	":a",			/* 228 */},
-{	"oa",			/* 229 */},
-{	"ae",			/* 230 */},
-{	",c",			/* 231 */},
-{	"`e",			/* 232 */},
-{	"'e",			/* 233 */},
-{	"^e",			/* 234 */},
-{	":e",			/* 235 */},
-{	"`i",			/* 236 */},
-{	"'i",			/* 237 */},
-{	"^i",			/* 238 */},
-{	":i",			/* 239 */},
-{	"Sd",			/* 240 */},
-{	"~n",			/* 241 */},
-{	"`o",			/* 242 */},
-{	"'o",			/* 243 */},
-{	"^o",			/* 244 */},
-{	"~o",			/* 245 */},
-{	":o",			/* 246 */},
-{	"tdi",			/* 247 */},
-{	"/o",			/* 248 */},
-{	"`u",			/* 249 */},
-{	"'u",			/* 250 */},
-{	"^u",			/* 251 */},
-{	":u",			/* 252 */},
-{	"'y",			/* 253 */},
-{	"Tp",			/* 254 */},
-{	":y",			/* 255 */},
-}};
-
-static DviCharNameMap Adobe_Symbol_map = {
-	"adobe-fontspecific",
-	1,
-{
-{	0,						/* 0 */},
-{	0,						/* 1 */},
-{	0,						/* 2 */},
-{	0,						/* 3 */},
-{	0,						/* 4 */},
-{	0,						/* 5 */},
-{	0,						/* 6 */},
-{	0,						/* 7 */},
-{	0,						/* 8 */},
-{	0,						/* 9 */},
-{	0,						/* 10 */},
-{	0,						/* 11 */},
-{	0,						/* 12 */},
-{	0,						/* 13 */},
-{	0,						/* 14 */},
-{	0,						/* 15 */},
-{	0,						/* 16 */},
-{	0,						/* 17 */},
-{	0,						/* 18 */},
-{	0,						/* 19 */},
-{	0,						/* 20 */},
-{	0,						/* 21 */},
-{	0,						/* 22 */},
-{	0,						/* 23 */},
-{	0,						/* 24 */},
-{	0,						/* 25 */},
-{	0,						/* 26 */},
-{	0,						/* 27 */},
-{	0,						/* 28 */},
-{	0,						/* 29 */},
-{	0,						/* 30 */},
-{	0,						/* 31 */},
-{	0,						/* 32 */},
-{	"!",						/* 33 */},
-{	"fa",						/* 34 */},
-{	"#", "sh",					/* 35 */},
-{	"te",						/* 36 */},
-{	"%",						/* 37 */},
-{	"&",						/* 38 */},
-{	"st",						/* 39 */},
-{	"(",						/* 40 */},
-{	")",						/* 41 */},
-{	"**",						/* 42 */},
-{	"+", "pl",					/* 43 */},
-{	",",						/* 44 */},
-{	"\\-", "mi",					/* 45 */},
-{	".",						/* 46 */},
-{	"/", "sl",					/* 47 */},
-{	"0",						/* 48 */},
-{	"1",						/* 49 */},
-{	"2",						/* 50 */},
-{	"3",						/* 51 */},
-{	"4",						/* 52 */},
-{	"5",						/* 53 */},
-{	"6",						/* 54 */},
-{	"7",						/* 55 */},
-{	"8",						/* 56 */},
-{	"9",						/* 57 */},
-{	":",						/* 58 */},
-{	";",						/* 59 */},
-{	"<",						/* 60 */},
-{	"=", "eq",					/* 61 */},
-{	">",						/* 62 */},
-{	"?",						/* 63 */},
-{	"=~",						/* 64 */},
-{	"*A",						/* 65 */},
-{	"*B",						/* 66 */},
-{	"*X",						/* 67 */},
-{	"*D",						/* 68 */},
-{	"*E",						/* 69 */},
-{	"*F",						/* 70 */},
-{	"*G",						/* 71 */},
-{	"*Y",						/* 72 */},
-{	"*I",						/* 73 */},
-{	"+h",						/* 74 */},
-{	"*K",						/* 75 */},
-{	"*L",						/* 76 */},
-{	"*M",						/* 77 */},
-{	"*N",						/* 78 */},
-{	"*O",						/* 79 */},
-{	"*P",						/* 80 */},
-{	"*H",						/* 81 */},
-{	"*R",						/* 82 */},
-{	"*S",						/* 83 */},
-{	"*T",						/* 84 */},
-{	0,						/* 85 */},
-{	"ts",						/* 86 */},
-{	"*W",						/* 87 */},
-{	"*C",						/* 88 */},
-{	"*Q",						/* 89 */},
-{	"*Z",						/* 90 */},
-{	"[", "lB",					/* 91 */},
-{	"tf", "3d",					/* 92 */},
-{	"]", "rB",					/* 93 */},
-{	"pp",						/* 94 */},
-{	"_",						/* 95 */},
-{	"radicalex",					/* 96 */},
-{	"*a",						/* 97 */},
-{	"*b",						/* 98 */},
-{	"*x",						/* 99 */},
-{	"*d",						/* 100 */},
-{	"*e",						/* 101 */},
-{	"*f",						/* 102 */},
-{	"*g",						/* 103 */},
-{	"*y",						/* 104 */},
-{	"*i",						/* 105 */},
-{	"+f",						/* 106 */},
-{	"*k",						/* 107 */},
-{	"*l",						/* 108 */},
-{	"*m",						/* 109 */},
-{	"*n",						/* 110 */},
-{	"*o",						/* 111 */},
-{	"*p",						/* 112 */},
-{	"*h",						/* 113 */},
-{	"*r",						/* 114 */},
-{	"*s",						/* 115 */},
-{	"*t",						/* 116 */},
-{	"*u",						/* 117 */},
-{	"+p",						/* 118 */},
-{	"*w",						/* 119 */},
-{	"*c",						/* 120 */},
-{	"*q",						/* 121 */},
-{	"*z",						/* 122 */},
-{	"lC", "{",					/* 123 */},
-{	"ba", "|",					/* 124 */},
-{	"rC", "}",					/* 125 */},
-{	"ap",						/* 126 */},
-{	0,						/* 127 */},
-{	0,						/* 128 */},
-{	0,						/* 129 */},
-{	0,						/* 130 */},
-{	0,						/* 131 */},
-{	0,						/* 132 */},
-{	0,						/* 133 */},
-{	0,						/* 134 */},
-{	0,						/* 135 */},
-{	0,						/* 136 */},
-{	0,						/* 137 */},
-{	0,						/* 138 */},
-{	0,						/* 139 */},
-{	0,						/* 140 */},
-{	0,						/* 141 */},
-{	0,						/* 142 */},
-{	0,						/* 143 */},
-{	0,						/* 144 */},
-{	0,						/* 145 */},
-{	0,						/* 146 */},
-{	0,						/* 147 */},
-{	0,						/* 148 */},
-{	0,						/* 149 */},
-{	0,						/* 150 */},
-{	0,						/* 151 */},
-{	0,						/* 152 */},
-{	0,						/* 153 */},
-{	0,						/* 154 */},
-{	0,						/* 155 */},
-{	0,						/* 156 */},
-{	0,						/* 157 */},
-{	0,						/* 158 */},
-{	0,						/* 159 */},
-{	0,						/* 160 */},
-{	"*U",						/* 161 */},
-{	"fm",						/* 162 */},
-{	"<=",						/* 163 */},
-{	"f/",						/* 164 */},
-{	"if",						/* 165 */},
-{	"Fn",						/* 166 */},
-{	"CL",						/* 167 */},
-{	"DI",						/* 168 */},
-{	"HE",						/* 169 */},
-{	"SP",						/* 170 */},
-{	"<>",						/* 171 */},
-{	"<-",						/* 172 */},
-{	"ua", "arrowverttp",				/* 173 */},
-{	"->",						/* 174 */},
-{	"da", "arrowvertbt",				/* 175 */},
-{	"de",						/* 176 */},
-{	"+-",						/* 177 */},
-{	"sd",						/* 178 */},
-{	">=",						/* 179 */},
-{	"mu",						/* 180 */},
-{	"pt",						/* 181 */},
-{	"pd",						/* 182 */},
-{	"bu",						/* 183 */},
-{	"di",						/* 184 */},
-{	"!=",						/* 185 */},
-{	"==",						/* 186 */},
-{	"~=", "~~",					/* 187 */},
-{	0,						/* 188 */},
-{	"arrowvertex",					/* 189 */},
-{	"an",						/* 190 */},
-{	"CR",						/* 191 */},
-{	"Ah",						/* 192 */},
-{	"Im",						/* 193 */},
-{	"Re",						/* 194 */},
-{	"wp",						/* 195 */},
-{	"c*",						/* 196 */},
-{	"c+",						/* 197 */},
-{	"es",						/* 198 */},
-{	"ca",						/* 199 */},
-{	"cu",						/* 200 */},
-{	"sp",						/* 201 */},
-{	"ip",						/* 202 */},
-{	"nb",						/* 203 */},
-{	"sb",						/* 204 */},
-{	"ib",						/* 205 */},
-{	"mo",						/* 206 */},
-{	"nm",						/* 207 */},
-{	"/_",						/* 208 */},
-{	"gr",						/* 209 */},
-{	"rg",						/* 210 */},
-{	"co",						/* 211 */},
-{	"tm",						/* 212 */},
-{	0,						/* 213 */},
-{	"sr", "sqrt",					/* 214 */},
-{	"md",						/* 215 */},
-{	"no",						/* 216 */},
-{	"AN",						/* 217 */},
-{	"OR",						/* 218 */},
-{	"hA",						/* 219 */},
-{	"lA",						/* 220 */},
-{	"uA",						/* 221 */},
-{	"rA",						/* 222 */},
-{	"dA",						/* 223 */},
-{	"lz",						/* 224 */},
-{	"la",						/* 225 */},
-{	0,						/* 226 */},
-{	0,						/* 227 */},
-{	0,						/* 228 */},
-{	0,						/* 229 */},
-{	"parenlefttp",					/* 230 */},
-{	"parenleftex",					/* 231 */},
-{	"parenleftbt",					/* 232 */},
-{	"bracketlefttp", "lc",				/* 233 */},
-{	"bracketleftex",				/* 234 */},
-{	"bracketleftbt", "lf",				/* 235 */},
-{	"bracelefttp", "lt",				/* 236 */},
-{	"braceleftmid", "lk",				/* 237 */},
-{	"braceleftbt", "lb",				/* 238 */},
-{	"bracerightex", "braceleftex", "braceex", "bv",	/* 239 */},
-{	0,						/* 240 */},
-{	"ra",						/* 241 */},
-{	"is", "integral",				/* 242 */},
-{	0,						/* 243 */},
-{	0,						/* 244 */},
-{	0,						/* 245 */},
-{	"parenrighttp",					/* 246 */},
-{	"parenrightex",					/* 247 */},
-{	"parenrightbt",					/* 248 */},
-{	"bracketrighttp", "rc",				/* 249 */},
-{	"bracketrightex",				/* 250 */},
-{	"bracketrightbt", "rf",				/* 251 */},
-{	"bracerighttp", "rt",				/* 252 */},
-{	"bracerightmid", "rk",				/* 253 */},
-{	"bracerightbt", "rb",				/* 254 */},
-{	0,						/* 255 */},
-}};
-
-
-static void
-load_standard_maps ()
-{
-	standard_maps_loaded = 1;
-	DviRegisterMap (&ISO8859_1_map);
-	DviRegisterMap (&Adobe_Symbol_map);
-}
diff --git a/src/xditview/DviP.h b/src/xditview/DviP.h
deleted file mode 100644
index 825d42b3..00000000
--- a/src/xditview/DviP.h
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * $XConsortium: DviP.h,v 1.5 89/07/22 19:44:08 keith Exp $
- */
-
-/* 
- * DviP.h - Private definitions for Dvi widget
- */
-
-#ifndef _XtDviP_h
-#define _XtDviP_h
-
-#include "Dvi.h"
-#include "DviChar.h"
-#include "device.h"
-
-/***********************************************************************
- *
- * Dvi Widget Private Data
- *
- ***********************************************************************/
-
-/************************************
- *
- *  Class structure
- *
- ***********************************/
-
-/* Type for save method. */
-
-typedef void (*DviSaveProc)();
-
-/*
- * New fields for the Dvi widget class record
- */
-
-
-typedef struct _DviClass {
-      DviSaveProc	save;
-} DviClassPart;
-
-/*
- * Full class record declaration
- */
-
-typedef struct _DviClassRec {
-	CoreClassPart	core_class;
-	DviClassPart	command_class;
-} DviClassRec;
-
-extern DviClassRec dviClassRec;
-
-/***************************************
- *
- *  Instance (widget) structure 
- *
- **************************************/
-
-/*
- * a list of fonts we've used for this widget
- */
-
-typedef struct _dviFontSizeList {
-	struct _dviFontSizeList	*next;
-	int			size;
-	char			*x_name;
-	XFontStruct		*font;
-	int			doesnt_exist;
-} DviFontSizeList;
-
-typedef struct _dviFontList {
-	struct _dviFontList	*next;
-	char			*dvi_name;
-	char			*x_name;
-	int			dvi_number;
-	Boolean			initialized;
-	Boolean			scalable;
-	DviFontSizeList		*sizes;
-	DviCharNameMap		*char_map;
-	DeviceFont		*device_font;
-} DviFontList;
-
-typedef struct _dviFontMap {
-	struct _dviFontMap	*next;
-	char			*dvi_name;
-	char			*x_name;
-} DviFontMap;
-
-#define DVI_TEXT_CACHE_SIZE	256
-#define DVI_CHAR_CACHE_SIZE	1024
-
-typedef struct _dviCharCache {
-	XTextItem	cache[DVI_TEXT_CACHE_SIZE];
-	char		adjustable[DVI_TEXT_CACHE_SIZE];
-	char		char_cache[DVI_CHAR_CACHE_SIZE];
-	int		index;
-	int		max;
-	int		char_index;
-	int		font_size;
-	int		font_number;
-	XFontStruct	*font;
-	int		start_x, start_y;
-	int		x, y;
-} DviCharCache;
-
-typedef struct _dviState {
-	struct _dviState	*next;
-	int			font_size;
-	int			font_number;
-	int			x;
-	int			y;
-} DviState;
-
-typedef struct _dviFileMap {
-	struct _dviFileMap	*next;
-	long			position;
-	int			page_number;
-} DviFileMap;
-
-/*
- * New fields for the Dvi widget record
- */
-
-typedef struct {
-	/*
-	 * resource specifiable items
-	 */
-	char		*font_map_string;
-	unsigned long	foreground;
-	unsigned long	background;
-	int		requested_page;
-	int		last_page;
-	XFontStruct	*default_font;
-	FILE		*file;
-	Boolean		noPolyText;
-	Boolean		seek;		/* file is "seekable" */
-	int		default_resolution;
-	/*
- 	 * private state
- 	 */
-	FILE		*tmpFile;	/* used when reading stdin */
-	char		readingTmp;	/* reading now from tmp */
-	char		ungot;		/* have ungetc'd a char */
-	GC		normal_GC;
-	GC		fill_GC;
-	DviFileMap	*file_map;
-	DviFontList	*fonts;
-	DviFontMap	*font_map;
-	int		current_page;
-	int		font_size;
-	int		font_number;
-	DeviceFont	*device_font;
-	int		device_font_number;
-	Device		*device;
-	int		native;
-	int		device_resolution;
-	int		display_resolution;
-	int		paperlength;
-	int		paperwidth;
-	double		scale_factor;	/* display res / device res */
-	int		sizescale;
-	int		line_thickness;
-	int		line_width;
-
-#define DVI_FILL_MAX 1000
-
-	int		fill;
-#define DVI_FILL_WHITE 0
-#define DVI_FILL_GRAY 1
-#define DVI_FILL_BLACK 2
-	int		fill_type;
-	Pixmap		gray[8];
-	int		backing_store;
-	XFontStruct	*font;
-	int		display_enable;
-	struct ExposedExtents {
-	    int x1, y1, x2, y2;
-	}		extents;
-	DviState	*state;
-	DviCharCache	cache;
-	int		text_x_width;
-	int		text_device_width;
-	int		word_flag;
-} DviPart;
-
-extern int DviGetAndPut();
-#define DviGetIn(dw,cp)\
-    (dw->dvi.tmpFile ? (\
-	DviGetAndPut (dw, cp) \
-    ) :\
-	(*cp = getc (dw->dvi.file))\
-)
-
-#define DviGetC(dw, cp)\
-    (dw->dvi.readingTmp ? (\
-	((*cp = getc (dw->dvi.tmpFile)) == EOF) ? (\
-	    fseek (dw->dvi.tmpFile, 0l, 2),\
-	    (dw->dvi.readingTmp = 0),\
-	    DviGetIn (dw,cp)\
-	) : (\
-	    *cp\
-	)\
-    ) : (\
-	DviGetIn(dw,cp)\
-    )\
-)
-
-#define DviUngetC(dw, c)\
-    (dw->dvi.readingTmp ? (\
-	ungetc (c, dw->dvi.tmpFile)\
-    ) : ( \
-	(dw->dvi.ungot = 1),\
-	ungetc (c, dw->dvi.file)))
-
-/*
- * Full widget declaration
- */
-
-typedef struct _DviRec {
-	CorePart	core;
-	DviPart		dvi;
-} DviRec;
-
-#define InheritSaveToFile ((DviSaveProc)_XtInherit)
-
-extern XFontStruct	*QueryFont ();
-
-extern DviCharNameMap	*QueryFontMap ();
-
-extern DeviceFont	*QueryDeviceFont ();
-
-extern char *GetWord(), *GetLine();
-#endif /* _XtDviP_h */
-
-
diff --git a/src/xditview/FontMap b/src/xditview/FontMap
deleted file mode 100644
index 90911f04..00000000
--- a/src/xditview/FontMap
+++ /dev/null
@@ -1,17 +0,0 @@
-TR	-adobe-times-medium-r-normal--*-*-*-*-p-*-iso8859-1
-TI	-adobe-times-medium-i-normal--*-*-*-*-p-*-iso8859-1
-TB	-adobe-times-bold-r-normal--*-*-*-*-p-*-iso8859-1
-TBI	-adobe-times-bold-i-normal--*-*-*-*-p-*-iso8859-1
-CR	-adobe-courier-medium-r-normal--*-*-*-*-m-*-iso8859-1
-CI	-adobe-courier-medium-o-normal--*-*-*-*-m-*-iso8859-1
-CB	-adobe-courier-bold-r-normal--*-*-*-*-m-*-iso8859-1
-CBI	-adobe-courier-bold-o-normal--*-*-*-*-m-*-iso8859-1
-HR	-adobe-helvetica-medium-r-normal--*-*-*-*-p-*-iso8859-1
-HI	-adobe-helvetica-medium-o-normal--*-*-*-*-p-*-iso8859-1
-HB	-adobe-helvetica-bold-r-normal--*-*-*-*-p-*-iso8859-1
-HBI	-adobe-helvetica-bold-o-normal--*-*-*-*-p-*-iso8859-1
-NR	-adobe-new century schoolbook-medium-r-normal--*-*-*-*-p-*-iso8859-1
-NI	-adobe-new century schoolbook-medium-i-normal--*-*-*-*-p-*-iso8859-1
-NB	-adobe-new century schoolbook-bold-r-normal--*-*-*-*-p-*-iso8859-1
-NBI	-adobe-new century schoolbook-bold-i-normal--*-*-*-*-p-*-iso8859-1
-S	-adobe-symbol-medium-r-normal--*-*-*-*-p-*-adobe-fontspecific
diff --git a/src/xditview/GXditview-ad.h b/src/xditview/GXditview-ad.h
deleted file mode 100644
index d9be3da2..00000000
--- a/src/xditview/GXditview-ad.h
+++ /dev/null
@@ -1,52 +0,0 @@
-"GXditview.height: 840",
-"GXditview.paned.allowResize:		true",
-"GXditview.paned.viewport.allowVert:	true",
-"GXditview.paned.viewport.allowHoriz:	true",
-"GXditview.paned.viewport.skipAdjust:	false",
-"GXditview.paned.viewport.width:		600",
-"GXditview.paned.viewport.height:	800",
-"GXditview.paned.viewport.showGrip:	false",
-"GXditview.paned.label.skipAdjust:	true",
-"GXditview.paned.viewport.dvi.translations: #augment \
-	<Btn1Down>:	XawPositionSimpleMenu(menu) MenuPopup(menu)\\n\
-	<Key>Next:	NextPage()\\n\
-	<Key>n:		NextPage()\\n\
-	<Key>space:	NextPage()\\n\
-	<Key>Return:	NextPage()\\n\
-	<Key>Prior:	PreviousPage()\\n\
-	<Key>p:		PreviousPage()\\n\
-	<Key>BackSpace:	PreviousPage()\\n\
-	<Key>Delete:	PreviousPage()\\n\
-	<Key>Select:	SelectPage()\\n\
-	<Key>Find:	OpenFile()\\n\
-	<Key>r:		Rerasterize()\\n\
-	<Key>q:		Quit()",
-"GXditview.paned.label.translations: #augment \
-	<Btn1Down>:	XawPositionSimpleMenu(menu) MenuPopup(menu)\\n\
-	<Key>Next:	NextPage()\\n\
-	<Key>n:		NextPage()\\n\
-	<Key>space:	NextPage()\\n\
-	<Key>Return:	NextPage()\\n\
-	<Key>Prior:	PreviousPage()\\n\
-	<Key>p:		PreviousPage()\\n\
-	<Key>BackSpace:	PreviousPage()\\n\
-	<Key>Delete:	PreviousPage()\\n\
-	<Key>Select:	SelectPage()\\n\
-	<Key>Find:	OpenFile()\\n\
-	<Key>r:		Rerasterize()\\n\
-	<Key>q:		Quit()",
-"GXditview.menu.nextPage.label:		Next Page",
-"GXditview.menu.previousPage.label:	Previous Page",
-"GXditview.menu.selectPage.label:	Select Page",
-"GXditview.menu.print.label:		Print",
-"GXditview.menu.openFile.label:		Open",
-"GXditview.menu.quit.label:		Quit",
-"GXditview.promptShell.allowShellResize:	true",
-"GXditview.promptShell.promptDialog.value.translations: #override \
-	<Key>Return:	Accept()",
-"GXditview.promptShell.promptDialog.accept.label: Accept",
-"GXditview.promptShell.promptDialog.accept.translations: #override \
-	<BtnUp>:	Accept() unset()",
-"GXditview.promptShell.promptDialog.cancel.label: Cancel",
-"GXditview.promptShell.promptDialog.cancel.translations: #override \
-	<BtnUp>:	Cancel() unset()",
diff --git a/src/xditview/GXditview.ad b/src/xditview/GXditview.ad
deleted file mode 100644
index e99ff5e1..00000000
--- a/src/xditview/GXditview.ad
+++ /dev/null
@@ -1,57 +0,0 @@
-GXditview.height: 840
-
-GXditview.paned.allowResize:		true
-GXditview.paned.viewport.allowVert:	true
-GXditview.paned.viewport.allowHoriz:	true
-GXditview.paned.viewport.skipAdjust:	false
-GXditview.paned.viewport.width:		600
-GXditview.paned.viewport.height:	800
-GXditview.paned.viewport.showGrip:	false
-GXditview.paned.label.skipAdjust:	true
-
-GXditview.paned.viewport.dvi.translations: #augment \
-	<Btn1Down>:	XawPositionSimpleMenu(menu) MenuPopup(menu)\n\
-	<Key>Next:	NextPage()\n\
-	<Key>n:		NextPage()\n\
-	<Key>space:	NextPage()\n\
-	<Key>Return:	NextPage()\n\
-	<Key>Prior:	PreviousPage()\n\
-	<Key>p:		PreviousPage()\n\
-	<Key>BackSpace:	PreviousPage()\n\
-	<Key>Delete:	PreviousPage()\n\
-	<Key>Select:	SelectPage()\n\
-	<Key>Find:	OpenFile()\n\
-	<Key>r:		Rerasterize()\n\
-	<Key>q:		Quit()
-GXditview.paned.label.translations: #augment \
-	<Btn1Down>:	XawPositionSimpleMenu(menu) MenuPopup(menu)\n\
-	<Key>Next:	NextPage()\n\
-	<Key>n:		NextPage()\n\
-	<Key>space:	NextPage()\n\
-	<Key>Return:	NextPage()\n\
-	<Key>Prior:	PreviousPage()\n\
-	<Key>p:		PreviousPage()\n\
-	<Key>BackSpace:	PreviousPage()\n\
-	<Key>Delete:	PreviousPage()\n\
-	<Key>Select:	SelectPage()\n\
-	<Key>Find:	OpenFile()\n\
-	<Key>r:		Rerasterize()\n\
-	<Key>q:		Quit()
-GXditview.menu.nextPage.label:		Next Page
-GXditview.menu.previousPage.label:	Previous Page
-GXditview.menu.selectPage.label:	Select Page
-GXditview.menu.print.label:		Print
-GXditview.menu.openFile.label:		Open
-GXditview.menu.quit.label:		Quit
-
-GXditview.promptShell.allowShellResize:	true
-GXditview.promptShell.promptDialog.value.translations: #override \
-	<Key>Return:	Accept()
-
-GXditview.promptShell.promptDialog.accept.label: Accept
-GXditview.promptShell.promptDialog.accept.translations: #override \
-	<BtnUp>:	Accept() unset()
-
-GXditview.promptShell.promptDialog.cancel.label: Cancel
-GXditview.promptShell.promptDialog.cancel.translations: #override \
-	<BtnUp>:	Cancel() unset()
diff --git a/src/xditview/INSTALL b/src/xditview/INSTALL
deleted file mode 100644
index 144118fd..00000000
--- a/src/xditview/INSTALL
+++ /dev/null
@@ -1,20 +0,0 @@
-This version of gxditview uses imake.
-
-Here are the steps needed to install gxditview:
-
-- edit the Imakefile if necessary
-
-- xmkmf
-
-- make depend
-
-- make
-
-- make install
-
-- make install.man (installs the man page)
-
-The gxditview binary will be installed in the usual place for X
-binaries (eg /usr/bin/X11).  Previous versions of gxditview were
-installed along with the other groff binaries (eg in /usr/local/bin);
-you will need to remove these by hand.
diff --git a/src/xditview/Imakefile.in b/src/xditview/Imakefile.in
deleted file mode 100644
index 4af28828..00000000
--- a/src/xditview/Imakefile.in
+++ /dev/null
@@ -1,120 +0,0 @@
-srcdir=@srcdir@
-top_srcdir=@abs_top_srcdir@
-VPATH=@srcdir@
-top_builddir=@abs_top_builddir@
-SEP=@PATH_SEPARATOR@
-
-version=`cat $(top_srcdir)/VERSION`
-# No additional number if revision is zero
-revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' $(top_srcdir)/REVISION`
-
-GROFF_PREFIX = @prefix@
-GROFF_DATADIR = $(GROFF_PREFIX)/share
-GROFF_DATAPROGRAMDIR = $(GROFF_DATADIR)/groff
-GROFF_DATASUBDIR = $(GROFF_DATAPROGRAMDIR)/$(version)$(revision)
-GROFF_FONTDIR = $(GROFF_DATASUBDIR)/font
-GROFF_LOCALFONTDIR = $(GROFF_DATAPROGRAMDIR)/site-font
-GROFF_FONTPATH = $(GROFF_FONTDIR)$(SEP)$(GROFF_LOCALFONTDIR)$(SEP)/usr/lib/font
-DPIS = 75 100
-
-PROGRAMS = \
-  gxditview \
-  xtotroff
-DEPLIBS = XawClientDepLibs
-#if defined(HPArchitecture) && (OSMajorVersion > 9)
-LOCAL_LIBRARIES = -L/usr/contrib/X11R6/lib XawClientLibs
-#else
-LOCAL_LIBRARIES = XawClientLibs
-#endif
-SRCS1 = \
-  $(srcdir)/xditview.c \
-  $(srcdir)/Dvi.c \
-  $(srcdir)/draw.c \
-  $(srcdir)/font.c \
-  $(srcdir)/lex.c \
-  $(srcdir)/page.c \
-  $(srcdir)/parse.c \
-  $(srcdir)/XFontName.c \
-  $(srcdir)/DviChar.c \
-  $(srcdir)/device.c
-OBJS1 = \
-  xditview.o \
-  Dvi.o \
-  draw.o \
-  font.o \
-  lex.o \
-  page.o \
-  parse.o \
-  XFontName.o \
-  DviChar.o \
-  device.o
-SRCS2 = \
-  $(srcdir)/xtotroff.c \
-  $(srcdir)/XFontName.c \
-  $(srcdir)/DviChar.c
-OBJS2 = \
-  xtotroff.o \
-  XFontName.o \
-  DviChar.o
-#if defined(HPArchitecture) && (OSMajorVersion > 9)
-INCLUDES = \
-  -I/usr/contrib/X11R6/include \
-  -I$(TOOLKITSRC) \
-  -I$(TOP)
-#else
-INCLUDES = \
-  -I$(TOOLKITSRC) \
-  -I$(TOP)
-#endif
-MATHLIB = -lm
-DEFINES = \
-  $(SIGNAL_DEFINES) \
-  -DFONTPATH=\"$(GROFF_FONTPATH)\" # -DX_NOT_STDC_ENV
-
-DEVDIR = $(top_builddir)/font
-MKINSTALLDIRS = $(top_srcdir)/mkinstalldirs
-
-#undef ProgramTargetHelper
-#define ProgramTargetHelper ProgramTargetHelperNoMan
-ComplexProgramTarget_1(gxditview,$(LOCAL_LIBRARIES),$(MATHLIB))
-InstallManPageLong($(srcdir)/gxditview,$(MANDIR),gxditview)
-NormalProgramTarget(xtotroff,$(OBJS2),$(DEPXLIB),$(XLIB), /**/)
-
-InstallAppDefaultsLong($(srcdir)/GXditview,GXditview)
-
-fonts: xtotroff $(srcdir)/DESC $(srcdir)/FontMap
-	@dir=`pwd`; \
-	fonts=`sed -e 's/[	 ].*//' $(srcdir)/FontMap`; \
-	for dpi in $(DPIS); do \
-	  echo Making devX$$dpi; \
-	  test -d $(DEVDIR)/devX$$dpi || \
-	    $(MKINSTALLDIRS) $(DEVDIR)/devX$$dpi; \
-	  rm -f $(DEVDIR)/devX$$dpi/DESC; \
-	  sed -e "s/res 75/res $$dpi/" $(srcdir)/DESC \
-	    >$(DEVDIR)/devX$$dpi/DESC; \
-	  (cd $(DEVDIR)/devX$$dpi; \
-	  rm -f Makefile.sub; \
-	  echo DEV=X$$dpi >Makefile.sub; \
-	  echo DEVFILES=DESC $$fonts >>Makefile.sub; \
-	  $$dir/xtotroff -g -r $$dpi -s 10 $(srcdir)/FontMap); \
-	  echo Making devX$$dpi-12; \
-	  test -d $(DEVDIR)/devX$$dpi-12 || \
-	    $(MKINSTALLDIRS) $(DEVDIR)/devX$$dpi-12; \
-	  rm -f $(DEVDIR)/devX$$dpi-12/DESC; \
-	  sed -e "s/res 75/res $$dpi/" \
-	      -e 's/unitwidth 10/unitwidth 12/' $(srcdir)/DESC \
-	    >$(DEVDIR)/devX$$dpi-12/DESC; \
-	  (cd $(DEVDIR)/devX$$dpi-12; \
-	  rm -f Makefile.sub; \
-	  echo DEV=X$$dpi-12 >Makefile.sub; \
-	  echo DEVFILES=DESC $$fonts >>Makefile.sub; \
-	  $$dir/xtotroff -g -r $$dpi -s 12 $(srcdir)/FontMap); \
-	done
-
-GXditview-ad.h: $(srcdir)/GXditview.ad
-	/bin/sh $(srcdir)/ad2c $(srcdir)/GXditview.ad >GXditview-ad.h
-
-extraclean: clean
-	-rm -f junk tmp grot old Makefile Imakefile $(srcdir)/gxditview._man
-
-FORCE:
diff --git a/src/xditview/Menu.h b/src/xditview/Menu.h
deleted file mode 100644
index c306b274..00000000
--- a/src/xditview/Menu.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * $XConsortium: Menu.h,v 1.2 89/07/21 14:22:10 jim Exp $
- */
-
-#ifndef _XtMenu_h
-#define _XtMenu_h
-
-/***********************************************************************
- *
- * Menu Widget
- *
- ***********************************************************************/
-
-/* Parameters:
-
- Name		     Class		RepType		Default Value
- ----		     -----		-------		-------------
- background	     Background		pixel		White
- border		     BorderColor	pixel		Black
- borderWidth	     BorderWidth	int		1
- height		     Height		int		120
- mappedWhenManaged   MappedWhenManaged	Boolean		True
- reverseVideo	     ReverseVideo	Boolean		False
- width		     Width		int		120
- x		     Position		int		0
- y		     Position		int		0
-
-*/
-
-#define XtNmenuEntries		"menuEntries"
-#define XtNhorizontalPadding	"horizontalPadding"
-#define XtNverticalPadding	"verticalPadding"
-#define XtNselection		"Selection"
-
-#define XtCMenuEntries		"MenuEntries"
-#define XtCPadding		"Padding"
-#define XtCSelection		"Selection"
-
-typedef struct _MenuRec *MenuWidget;  /* completely defined in MenuPrivate.h */
-typedef struct _MenuClassRec *MenuWidgetClass;    /* completely defined in MenuPrivate.h */
-
-extern WidgetClass menuWidgetClass;
-
-extern Widget	XawMenuCreate ();
-#endif /* _XtMenu_h */
-/* DON'T ADD STUFF AFTER THIS #endif */
diff --git a/src/xditview/README b/src/xditview/README
deleted file mode 100644
index b18f64a7..00000000
--- a/src/xditview/README
+++ /dev/null
@@ -1,14 +0,0 @@
-This is gxditview, a X11 previewer for groff based on MIT's xditview.
-This version can be used with the output of gtroff -Tps as well as
-with -TX75 and -TX100.  You will need X11R5 or newer to install it (it
-might work on X11R4, but I haven't tested it.)
-
-See the file INSTALL in this directory for installation instructions.
-
-xditview is copyrighted by MIT under the usual X terms (see
-gxditview.man); my changes to it are in the public domain.
-
-Please report bugs to bug-groff@gnu.org.
-
-James Clark
-jjc@jclark.com
diff --git a/src/xditview/TODO b/src/xditview/TODO
deleted file mode 100644
index 161a7cf1..00000000
--- a/src/xditview/TODO
+++ /dev/null
@@ -1,17 +0,0 @@
-Replace Imakefile with a configure script.
-
-Better error handling.
-
-Resource and command-line option to specify font path.
-
-Resource to specify name of environment variable from which to get the
-font path.
-
-Have character substitutions (currently done in draw.c:FakeCharacter)
-specified in a resource (similar format to FontMap).
-
-The initial width of the dialog box should expand to accommodate the
-default value.
-
-Option in Print dialog to specify that only the current page should be
-printed.
diff --git a/src/xditview/XFontName.c b/src/xditview/XFontName.c
deleted file mode 100644
index 9de68eda..00000000
--- a/src/xditview/XFontName.c
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * XFontName.c
- *
- * build/parse X Font name strings
- */
-
-#include <X11/Xlib.h>
-#include <X11/Xos.h>
-#include "XFontName.h"
-#include <ctype.h>
-
-static char *
-extractStringField (name, buffer, size, attrp, bit)
-	char		*name;
-	char		*buffer;
-	int		size;
-	unsigned int	*attrp;
-	unsigned int	bit;
-{
-	char	*buf = buffer;
-
-	if (!*name)
-		return 0;
-	while (*name && *name != '-' && size > 0) {
-		*buf++ = *name++;
-		--size;
-	}
-	if (size <= 0)
-		return 0;
-	*buf = '\0';
-	if (buffer[0] != '*' || buffer[1] != '\0')
-		*attrp |= bit;
-	if (*name == '-')
-		return name+1;
-	return name;
-}
-
-static char *
-extractUnsignedField (name, result, attrp, bit)
-	char		*name;
-	unsigned int	*result;
-	unsigned int	*attrp;
-	unsigned int	bit;
-{
-	char		buf[256];
-	char		*c;
-	unsigned int	i;
-
-	name = extractStringField (name, buf, sizeof (buf), attrp, bit);
-	if (!name)
-		return 0;
-	if (!(*attrp & bit))
-		return name;
-	i = 0;
-	for (c = buf; *c; c++) {
-		if (!isdigit (*c))
-			return 0;
-		i = i * 10 + (*c - '0');
-	}
-	*result = i;
-	return name;
-}
-
-Bool
-XParseFontName (fontNameString, fontName, fontNameAttributes)
-	XFontNameString	fontNameString;
-	XFontName	*fontName;
-	unsigned int	*fontNameAttributes;
-{
-	char		*name = fontNameString;
-	XFontName	temp;
-	unsigned int	attributes = 0;
-
-#define GetString(field,bit)\
-	if (!(name = extractStringField \
-		(name, temp.field, sizeof (temp.field),\
-		&attributes, bit))) \
-		return False;
-
-#define GetUnsigned(field,bit)\
-	if (!(name = extractUnsignedField \
-		(name, &temp.field, \
-		&attributes, bit))) \
-		return False;
-
-	GetString (Registry, FontNameRegistry)
-	GetString (Foundry, FontNameFoundry)
-	GetString (FamilyName, FontNameFamilyName)
-	GetString (WeightName, FontNameWeightName)
-	GetString (Slant, FontNameSlant)
-	GetString (SetwidthName, FontNameSetwidthName)
-	GetString (AddStyleName, FontNameAddStyleName)
-	GetUnsigned (PixelSize, FontNamePixelSize)
-	GetUnsigned (PointSize, FontNamePointSize)
-	GetUnsigned (ResolutionX, FontNameResolutionX)
-	GetUnsigned (ResolutionY, FontNameResolutionY)
-	GetString (Spacing, FontNameSpacing)
-	GetUnsigned (AverageWidth, FontNameAverageWidth)
-	GetString (CharSetRegistry, FontNameCharSetRegistry)
-	if (!*name) {
-		temp.CharSetEncoding[0] = '\0';
-		attributes |= FontNameCharSetEncoding;
-	} else {
-		GetString (CharSetEncoding, FontNameCharSetEncoding)
-	}
-	*fontName = temp;
-	*fontNameAttributes = attributes;
-	return True;
-}
-
-static char *
-utoa (u, s, size)
-	unsigned int	u;
-	char		*s;
-	int		size;
-{
-	char	*t;
-
-	t = s + size;
-	*--t = '\0';
-	do
-		*--t = (u % 10) + '0';
-	while (u /= 10);
-	return t;
-}
-
-Bool
-XFormatFontName (fontName, fontNameAttributes, fontNameString)
-	XFontName	*fontName;
-	unsigned int	fontNameAttributes;
-	XFontNameString	fontNameString;
-{
-	XFontNameString	tmp;
-	char		*name = tmp, *f;
-	int		left = sizeof (tmp) - 1;
-	char		number[32];
-
-#define PutString(field, bit)\
-	f = (fontNameAttributes & bit) ? \
-		fontName->field \
-		: "*"; \
-	if ((left -= strlen (f)) < 0) \
-		return False; \
-	while (*f) \
-		if ((*name++ = *f++) == '-') \
-			return False; 
-#define PutHyphen()\
-	if (--left < 0) \
-		return False; \
-	*name++ = '-';
-
-#define PutUnsigned(field, bit) \
-	f = (fontNameAttributes & bit) ? \
-		utoa (fontName->field, number, sizeof (number)) \
-		: "*"; \
-	if ((left -= strlen (f)) < 0) \
-		return False; \
-	while (*f) \
-		*name++ = *f++;
-
-	PutString (Registry, FontNameRegistry)
-	PutHyphen ();
-	PutString (Foundry, FontNameFoundry)
-	PutHyphen ();
-	PutString (FamilyName, FontNameFamilyName)
-	PutHyphen ();
-	PutString (WeightName, FontNameWeightName)
-	PutHyphen ();
-	PutString (Slant, FontNameSlant)
-	PutHyphen ();
-	PutString (SetwidthName, FontNameSetwidthName)
-	PutHyphen ();
-	PutString (AddStyleName, FontNameAddStyleName)
-	PutHyphen ();
-	PutUnsigned (PixelSize, FontNamePixelSize)
-	PutHyphen ();
-	PutUnsigned (PointSize, FontNamePointSize)
-	PutHyphen ();
-	PutUnsigned (ResolutionX, FontNameResolutionX)
-	PutHyphen ();
-	PutUnsigned (ResolutionY, FontNameResolutionY)
-	PutHyphen ();
-	PutString (Spacing, FontNameSpacing)
-	PutHyphen ();
-	PutUnsigned (AverageWidth, FontNameAverageWidth)
-	PutHyphen ();
-	PutString (CharSetRegistry, FontNameCharSetRegistry)
-	PutHyphen ();
-	PutString (CharSetEncoding, FontNameCharSetEncoding)
-	*name = '\0';
-	strcpy (fontNameString, tmp);
-	return True;
-}
-
-Bool
-XCompareFontName (name1, name2, fontNameAttributes)
-	XFontName	*name1, *name2;
-	unsigned int	fontNameAttributes;
-{
-#define CompareString(field,bit) \
-	if (fontNameAttributes & bit) \
-		if (strcmp (name1->field, name2->field)) \
-			return False;
-
-#define CompareUnsigned(field,bit) \
-	if (fontNameAttributes & bit) \
-		if (name1->field != name2->field) \
-			return False;
-
-	CompareString (Registry, FontNameRegistry)
-	CompareString (Foundry, FontNameFoundry)
-	CompareString (FamilyName, FontNameFamilyName)
-	CompareString (WeightName, FontNameWeightName)
-	CompareString (Slant, FontNameSlant)
-	CompareString (SetwidthName, FontNameSetwidthName)
-	CompareString (AddStyleName, FontNameAddStyleName)
-	CompareUnsigned (PixelSize, FontNamePixelSize)
-	CompareUnsigned (PointSize, FontNamePointSize)
-	CompareUnsigned (ResolutionX, FontNameResolutionX)
-	CompareUnsigned (ResolutionY, FontNameResolutionY)
-	CompareString (Spacing, FontNameSpacing)
-	CompareUnsigned (AverageWidth, FontNameAverageWidth)
-	CompareString (CharSetRegistry, FontNameCharSetRegistry)
-	CompareString (CharSetEncoding, FontNameCharSetEncoding)
-	return True;
-}
-
-Bool
-XCopyFontName (name1, name2, fontNameAttributes)
-	XFontName	*name1, *name2;
-	unsigned int	fontNameAttributes;
-{
-#define CopyString(field,bit) \
-	if (fontNameAttributes & bit) \
-		strcpy (name2->field, name1->field);
-
-#define CopyUnsigned(field,bit) \
-	if (fontNameAttributes & bit) \
-		name2->field = name1->field;
-
-	CopyString (Registry, FontNameRegistry)
-	CopyString (Foundry, FontNameFoundry)
-	CopyString (FamilyName, FontNameFamilyName)
-	CopyString (WeightName, FontNameWeightName)
-	CopyString (Slant, FontNameSlant)
-	CopyString (SetwidthName, FontNameSetwidthName)
-	CopyString (AddStyleName, FontNameAddStyleName)
-	CopyUnsigned (PixelSize, FontNamePixelSize)
-	CopyUnsigned (PointSize, FontNamePointSize)
-	CopyUnsigned (ResolutionX, FontNameResolutionX)
-	CopyUnsigned (ResolutionY, FontNameResolutionY)
-	CopyString (Spacing, FontNameSpacing)
-	CopyUnsigned (AverageWidth, FontNameAverageWidth)
-	CopyString (CharSetRegistry, FontNameCharSetRegistry)
-	CopyString (CharSetEncoding, FontNameCharSetEncoding)
-	return True;
-}
diff --git a/src/xditview/ad2c b/src/xditview/ad2c
deleted file mode 100644
index 651ab8c4..00000000
--- a/src/xditview/ad2c
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-#
-#	ad2c : Convert app-defaults file to C strings decls.
-#
-#	George Ferguson, ferguson@cs.rcohester.edu, 12 Nov 1990.
-#	19 Mar 1991: gf
-#		Made it self-contained.
-#	6 Jan 1992: mycroft@gnu.ai.mit.edu (Charles Hannum)
-#		Removed use of "-n" and ":read" label since Gnu and
-#		IBM sed print pattern space on "n" command. Still works
-#		with Sun sed, of course.
-#	7 Jan 1992: matthew@sunpix.East.Sun.COM (Matthew Stier)
-#		Escape quotes after escaping backslashes.
-#	8 Jul 1992: Version 1.6
-#		Manpage fixes.
-#	19 Apr 1993: Version 1.7
-#		Remove comments that were inside the sed command since
-#		some versions of sed don't like them. The comments are
-#		now given here in the header.
-#
-# Comments on the script by line:
-# /^!/d		Remove comments
-# /^$/d		Remove blanks
-# s/\\/\\\\/g	Escape backslashes...
-# s/\\$//g	...except the line continuation ones
-# s/"/\\"/g	Escape quotes
-# s/^/"/	Add leading quote
-# : test	Establish label for later branch
-# /\\$/b slash	Branch to label "slash" if line ends in backslash
-# s/$/",/	Otherwise add closing quote and comma...
-# p		...output the line...
-# d		...and clear the pattern space so it's not printed again
-# : slash	Branch comes here if line ends in backslash
-# n		Read next line, append to pattern space
-# [...]		The "d" and "s" commands that follow just delete
-#		comments and blank lines and escape control sequences
-# b test	Branch up to see if the line ends in backslash or not
-#
-
-sed '
-/^!/d
-/^$/d
-s/\\/\\\\/g
-s/\\$//g
-s/"/\\"/g
-s/^/"/
-: test
-/\\$/b slash
-s/$/",/
-p
-d
-: slash
-n
-/^!/d
-/^$/d
-s/"/\\"/g
-s/\\\\/\\/g
-s/\\n/\\\\n/g
-s/\\t/\\\\t/g
-s/\\f/\\\\f/g
-s/\\b/\\\\b/g
-b test' "$@"
diff --git a/src/xditview/device.c b/src/xditview/device.c
deleted file mode 100644
index 88e5ae5e..00000000
--- a/src/xditview/device.c
+++ /dev/null
@@ -1,604 +0,0 @@
-/* device.c */
-
-#include <stdio.h>
-#include <ctype.h>
-#include <stdlib.h>
-
-#include <X11/Xos.h>
-#include <X11/Intrinsic.h>
-
-#include "device.h"
-
-#ifndef FONTPATH
-#define FONTPATH "/usr/local/share/groff/font:/usr/local/lib/font:/usr/lib/font"
-#endif
-
-#ifndef isascii
-#define isascii(c) (1)
-#endif
-
-extern void exit();
-#ifndef strtok
-extern char *strtok();
-#endif
-#ifndef strchr
-extern char *strchr();
-#endif
-#ifndef getenv
-extern char *getenv();
-#endif
-
-/* Name of environment variable containing path to be used for
-searching for device and font description files. */
-#define FONTPATH_ENV_VAR  "GROFF_FONT_PATH"
-
-#define WS " \t\r\n"
-
-#ifndef INT_MIN
-/* Minimum and maximum values a `signed int' can hold.  */
-#define INT_MIN (-INT_MAX-1)
-#define INT_MAX 2147483647
-#endif
-
-#define CHAR_TABLE_SIZE 307
-
-struct _DeviceFont {
-    char *name;
-    int special;
-    DeviceFont *next;
-    Device *dev;
-    struct charinfo *char_table[CHAR_TABLE_SIZE];
-    struct charinfo *code_table[256];
-};
-
-struct charinfo {
-    int width;
-    int code;
-    struct charinfo *next;
-    struct charinfo *code_next;
-    char name[1];
-};
-
-static char *current_filename = 0;
-static int current_lineno = -1;
-
-static void error();
-static FILE *open_device_file();
-static DeviceFont *load_font();
-static Device *new_device();
-static DeviceFont *new_font();
-static void delete_font();
-static unsigned hash_name();
-static struct charinfo *add_char();
-static int read_charset_section();
-static char *canonicalize_name();
-
-static
-Device *new_device(name)
-    char *name;
-{
-    Device *dev;
-
-    dev = XtNew(Device);
-    dev->sizescale = 1;
-    dev->res = 0;
-    dev->unitwidth = 0;
-    dev->fonts = 0;
-    dev->X11 = 0;
-    dev->paperlength = 0;
-    dev->paperwidth = 0;
-    dev->name = XtNewString(name);
-    return dev;
-}
-
-void device_destroy(dev)
-    Device *dev;
-{
-    DeviceFont *f;
-    
-    if (!dev)
-	return;
-    f = dev->fonts;
-    while (f) {
-	DeviceFont *tem = f;
-	f = f->next;
-	delete_font(tem);
-    }
-    
-    XtFree(dev->name);
-    XtFree((char *)dev);
-}
-
-Device *device_load(name)
-    char *name;
-{
-    Device *dev;
-    FILE *fp;
-    int err = 0;
-    char buf[256];
-
-    fp = open_device_file(name, "DESC", &current_filename);
-    if (!fp)
-	return 0;
-    dev = new_device(name);
-    current_lineno = 0;
-    while (fgets(buf, sizeof(buf), fp)) {
-	char *p;
-	current_lineno++;
-	p = strtok(buf, WS);
-	if (p) {
-	    int *np = 0;
-	    char *q;
-
-	    if (strcmp(p, "charset") == 0)
-		break;
-	    if (strcmp(p, "X11") == 0)
-		dev->X11 = 1;
-	    else if (strcmp(p, "sizescale") == 0)
-		np = &dev->sizescale;
- 	    else if (strcmp(p, "res") == 0)
-		np = &dev->res;
- 	    else if (strcmp(p, "unitwidth") == 0)
-		np = &dev->unitwidth;
- 	    else if (strcmp(p, "paperwidth") == 0)
-		np = &dev->paperwidth;
- 	    else if (strcmp(p, "paperlength") == 0)
-		np = &dev->paperlength;
-	    
-	    if (np) {
-		q = strtok((char *)0, WS);
-		if (!q || sscanf(q, "%d", np) != 1 || *np <= 0) {
-		    error("bad argument");
-		    err = 1;
-		    break;
-		}
-	    }	
-	}
-    }
-    fclose(fp);
-    current_lineno = -1;
-    if (!err) {
-	if (dev->res == 0) {
-	    error("missing res line");
-	    err = 1;
-	}
-	else if (dev->unitwidth == 0) {
-	    error("missing unitwidth line");
-	    err = 1;
-	}
-    }
-    if (dev->paperlength == 0)
-	dev->paperlength = dev->res*11;
-    if (dev->paperwidth == 0)
-	dev->paperwidth = dev->res*8 + dev->res/2;
-    if (err) {
-	device_destroy(dev);
-	dev = 0;
-    }
-    XtFree(current_filename);
-    current_filename = 0;
-    return dev;
-}
-
-
-DeviceFont *device_find_font(dev, name)
-    Device *dev;
-    char *name;
-{
-    DeviceFont *f;
-
-    if (!dev)
-	return 0;
-    for (f = dev->fonts; f; f = f->next)
-	if (strcmp(f->name, name) == 0)
-	    return f;
-    return load_font(dev, name);
-}
-
-static
-DeviceFont *load_font(dev, name)
-    Device *dev;
-    char *name;
-{
-    FILE *fp;
-    char buf[256];
-    DeviceFont *f;
-    int special = 0;
-
-    fp = open_device_file(dev->name, name, &current_filename);
-    if (!fp)
-	return 0;
-    current_lineno = 0;
-    for (;;) {
-	char *p;
-
-	if (!fgets(buf, sizeof(buf), fp)) {
-	    error("no charset line");
-	    return 0;
-	}
-	current_lineno++;
-	p = strtok(buf, WS);
-	/* charset must be on a line by itself */
-	if (p && strcmp(p, "charset") == 0 && strtok((char *)0, WS) == 0)
-	    break;
-	if (p && strcmp(p, "special") == 0)
-	    special = 1;
-    }
-    f = new_font(name, dev);
-    f->special = special;
-    if (!read_charset_section(f, fp)) {
-	delete_font(f);
-	f = 0;
-    }
-    else {
-	f->next = dev->fonts;
-	dev->fonts = f;
-    }
-    fclose(fp);
-    XtFree(current_filename);
-    current_filename = 0;
-    return f;
-}
-
-static
-DeviceFont *new_font(name, dev)
-    char *name;
-    Device *dev;
-{
-    int i;
-    DeviceFont *f;
-
-    f = XtNew(DeviceFont);
-    f->name = XtNewString(name);
-    f->dev = dev;
-    f->special = 0;
-    f->next = 0;
-    for (i = 0; i < CHAR_TABLE_SIZE; i++)
-	f->char_table[i] = 0;
-    for (i = 0; i < 256; i++)
-	f->code_table[i] = 0;
-    return f;
-}
-
-static
-void delete_font(f)
-    DeviceFont *f;
-{
-    int i;
-
-    if (!f)
-	return;
-    XtFree(f->name);
-    for (i = 0; i < CHAR_TABLE_SIZE; i++) {
-	struct charinfo *ptr = f->char_table[i];
-	while (ptr) {
-	    struct charinfo *tem = ptr;
-	    ptr = ptr->next;
-	    XtFree((char *)tem);
-	}
-    }
-    XtFree((char *)f);
-}
-
-
-static
-unsigned hash_name(name)
-    char *name;
-{
-    unsigned n = 0;
-    /* XXX do better than this */
-    while (*name)
-	n = (n << 1) ^ *name++;
-
-    return n;
-}
-
-static
-int scale_round(n, x, y)
-    int n, x, y;
-{
-  int y2;
-
-  if (x == 0)
-    return 0;
-  y2 = y/2;
-  if (n >= 0) {
-    if (n <= (INT_MAX - y2)/x)
-      return (n*x + y2)/y;
-    return (int)(n*(double)x/(double)y + .5);
-  }
-  else {
-    if (-(unsigned)n <= (-(unsigned)INT_MIN - y2)/x)
-      return (n*x - y2)/y;
-    return (int)(n*(double)x/(double)y + .5);
-  }
-}
-
-static
-char *canonicalize_name(s)
-    char *s;
-{
-    static char ch[2];
-    if (s[0] == 'c' && s[1] == 'h' && s[2] == 'a' && s[3] == 'r') {
-	char *p;
-	int n;
-
-	for (p = s + 4; *p; p++)
-	    if (!isascii(*p) || !isdigit((unsigned char)*p))
-		return s;
-	n = atoi(s + 4);
-	if (n >= 0 && n <= 0xff) {
-	    ch[0] = (char)n;
-	    return ch;
-	}
-    }
-    return s;
-}
-
-/* Return 1 if the character is present in the font; widthp gets the
-width if non-null. */
-
-int device_char_width(f, ps, name, widthp)
-    DeviceFont *f;
-    int ps;
-    char *name;
-    int *widthp;
-{
-    struct charinfo *p;
-
-    name = canonicalize_name(name);
-    for (p = f->char_table[hash_name(name) % CHAR_TABLE_SIZE];; p = p->next) {
-	if (!p)
-	    return 0;
-	if (strcmp(p->name, name) == 0)
-	    break;
-    }
-    *widthp = scale_round(p->width, ps, f->dev->unitwidth);
-    return 1;
-}
-
-int device_code_width(f, ps, code, widthp)
-    DeviceFont *f;
-    int ps;
-    int code;
-    int *widthp;
-{
-    struct charinfo *p;
-
-    for (p = f->code_table[code & 0xff];; p = p->code_next) {
-	if (!p)
-	    return 0;
-	if (p->code == code)
-	    break;
-    }
-    *widthp = scale_round(p->width, ps, f->dev->unitwidth);
-    return 1;
-}
-
-char *device_name_for_code(f, code)
-    DeviceFont *f;
-    int code;
-{
-    static struct charinfo *state = 0;
-    if (f)
-	state = f->code_table[code & 0xff];
-    for (; state; state = state->code_next)
-	if (state->code == code && state->name[0] != '\0') {
-	    char *name = state->name;
-	    state = state->code_next;
-	    return name;
-	}
-    return 0;
-}
-
-int device_font_special(f)
-    DeviceFont *f;
-{
-    return f->special;
-}
-    
-static
-struct charinfo *add_char(f, name, width, code)
-    DeviceFont *f;
-    char *name;
-    int width, code;
-{
-    struct charinfo **pp;
-    struct charinfo *ci;
-    
-    name = canonicalize_name(name);
-    if (strcmp(name, "---") == 0)
-	name = "";
-
-    ci = (struct charinfo *)XtMalloc(XtOffsetOf(struct charinfo, name[0])
-				     + strlen(name) + 1);
-    
-    strcpy(ci->name, name);
-    ci->width = width;
-    ci->code = code;
-    
-    if (*name != '\0') {
-	pp = &f->char_table[hash_name(name) % CHAR_TABLE_SIZE];
-	ci->next = *pp;
-	*pp = ci;
-    }
-    pp = &f->code_table[code & 0xff];
-    ci->code_next = *pp;
-    *pp = ci;
-    return ci;
-}
-
-/* Return non-zero for success. */
-
-static
-int read_charset_section(f, fp)
-    DeviceFont *f;
-    FILE *fp;
-{
-    struct charinfo *last_charinfo = 0;
-    char buf[256];
-
-    while (fgets(buf, sizeof(buf), fp)) {
-	char *name;
-	int width;
-	int code;
-	char *p;
-
-	current_lineno++;
-	name = strtok(buf, WS);
-	if (!name)
-	    continue;		/* ignore blank lines */
-	p = strtok((char *)0, WS);
-	if (!p)			/* end of charset section */
-	    break;
-	if (strcmp(p, "\"") == 0) {
-	    if (!last_charinfo) {
-		error("first line of charset section cannot use `\"'");
-		return 0;
-	    }
-	    else
-		(void)add_char(f, name,
-			       last_charinfo->width, last_charinfo->code);
-	}
-	else {
-	    char *q;
-	    if (sscanf(p, "%d", &width) != 1) {
-		error("bad width field");
-		return 0;
-	    }
-	    p = strtok((char *)0, WS);
-	    if (!p) {
-		error("missing type field");
-		return 0;
-	    }
-	    p = strtok((char *)0, WS);
-	    if (!p) {
-		error("missing code field");
-		return 0;
-	    }
-	    code = (int)strtol(p, &q, 0);
-	    if (q == p) {
-		error("bad code field");
-		return 0;
-	    }
-	    last_charinfo = add_char(f, name, width, code);
-	}
-    }
-    return 1;
-}
-
-static
-FILE *find_file(file, result)
-    char *file, **result;
-{
-  char *buf = NULL;
-  int bufsiz = 0;
-  int flen;
-  FILE *fp;
-  char *path;
-  char *env;
-
-  env = getenv(FONTPATH_ENV_VAR);
-  path = XtMalloc(((env && *env) ? strlen(env) + 1 : 0)
-		  + strlen(FONTPATH) + 1);
-  *path = '\0';
-  if (env && *env) {
-    strcat(path, env);
-    strcat(path, ":");
-  }
-  strcat(path, FONTPATH);
-
-  *result = NULL;
-  
-  if (file == NULL)
-    return NULL;
-  if (*file == '\0')
-    return NULL;
-  
-  if (*file == '/') {
-    fp = fopen(file, "r");
-    if (fp)
-      *result = XtNewString(file);
-    return fp;
-  }
-  
-  flen = strlen(file);
-  
-  while (*path) {
-    int len;
-    char *start, *end;
-    
-    start = path;
-    end = strchr(path, ':');
-    if (end)
-      path = end + 1;
-    else
-      path = end = strchr(path, '\0');
-    if (start >= end)
-      continue;
-    if (end[-1] == '/')
-      --end;
-    len = (end - start) + 1 + flen + 1;
-    if (len > bufsiz) {
-      if (buf)
-	buf = XtRealloc(buf, len);
-      else
-	buf = XtMalloc(len);
-      bufsiz = len;
-    }
-    memcpy(buf, start, end - start);
-    buf[end - start] = '/';
-    strcpy(buf + (end - start) + 1, file);
-    fp = fopen(buf, "r");
-    if (fp) {
-      *result = buf;
-      return fp;
-    }
-  }
-  XtFree(buf);
-  return NULL;
-}
-
-static
-FILE *open_device_file(device_name, file_name, result)
-     char *device_name, *file_name, **result;
-{
-  char *buf;
-  FILE *fp;
-
-  buf = XtMalloc(3 + strlen(device_name) + 1 + strlen(file_name) + 1);
-  sprintf(buf, "dev%s/%s", device_name, file_name);
-  fp = find_file(buf, result);
-  if (!fp) {
-      fprintf(stderr, "can't find device file `%s'\n", file_name);
-      fflush(stderr);
-  }
-  XtFree(buf);
-  return fp;
-}
-
-static
-void error(s)
-    char *s;
-{
-    if (current_filename) {
-	fprintf(stderr, "%s:", current_filename);
-	if (current_lineno > 0)
-	    fprintf(stderr, "%d:", current_lineno);
-	putc(' ', stderr);
-    }
-    fputs(s, stderr);
-    putc('\n', stderr);
-    fflush(stderr);
-}
-
-/*
-Local Variables:
-c-indent-level: 4
-c-continued-statement-offset: 4
-c-brace-offset: -4
-c-argdecl-indent: 4
-c-label-offset: -4
-c-tab-always-indent: nil
-End:
-*/
diff --git a/src/xditview/device.h b/src/xditview/device.h
deleted file mode 100644
index 2b9a64ba..00000000
--- a/src/xditview/device.h
+++ /dev/null
@@ -1,21 +0,0 @@
-
-typedef struct _DeviceFont DeviceFont;
-
-typedef struct _Device {
-    char *name;
-    int sizescale;
-    int res;
-    int unitwidth;
-    int paperlength;
-    int paperwidth;
-    int X11;
-    DeviceFont *fonts;
-} Device;
-
-extern void device_destroy();
-extern Device *device_load();
-extern DeviceFont *device_find_font();
-extern int device_char_width();
-extern char *device_name_for_code();
-extern int device_code_width();
-extern int device_font_special();
diff --git a/src/xditview/draw.c b/src/xditview/draw.c
deleted file mode 100644
index 77539509..00000000
--- a/src/xditview/draw.c
+++ /dev/null
@@ -1,745 +0,0 @@
-/*
- * draw.c
- *
- * accept dvi function calls and translate to X
- */
-
-#include <X11/Xos.h>
-#include <X11/IntrinsicP.h>
-#include <X11/StringDefs.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <math.h>
-
-/* math.h on a Sequent doesn't define M_PI, apparently */
-#ifndef M_PI
-#define M_PI	3.14159265358979323846
-#endif
-
-#include "DviP.h"
-
-#define DeviceToX(dw, n) ((int)((n) * (dw)->dvi.scale_factor + .5))
-#define XPos(dw) (DeviceToX((dw), (dw)->dvi.state->x - \
-                  (dw)->dvi.text_device_width) + (dw)->dvi.text_x_width)
-#define YPos(dw) (DeviceToX((dw), (dw)->dvi.state->y))
-
-static int FakeCharacter();
-
-/* font.c */
-extern int MaxFontPosition();
-
-void
-HorizontalMove(dw, delta)
-	DviWidget	dw;
-	int		delta;
-{
-	dw->dvi.state->x += delta;
-}
-
-void
-HorizontalGoto(dw, NewPosition)
-	DviWidget	dw;
-	int		NewPosition;
-{
-	dw->dvi.state->x = NewPosition;
-}
-
-void
-VerticalMove(dw, delta)
-	DviWidget	dw;
-	int		delta;
-{
-	dw->dvi.state->y += delta;
-}
-
-void
-VerticalGoto(dw, NewPosition)
-	DviWidget	dw;
-	int		NewPosition;
-{
-	dw->dvi.state->y = NewPosition;
-}
-
-void
-AdjustCacheDeltas (dw)
-	DviWidget	dw;
-{
-	int extra;
-	int nadj;
-	int i;
-
-	nadj = 0;
-	extra = DeviceToX(dw, dw->dvi.text_device_width)
-		- dw->dvi.text_x_width;
-	if (extra == 0)
-		return;
-	for (i = 0; i <= dw->dvi.cache.index; i++)
-		if (dw->dvi.cache.adjustable[i])
-			++nadj;
-	dw->dvi.text_x_width += extra;
-	if (nadj <= 1)
-		return;
-	for (i = 0; i <= dw->dvi.cache.index; i++)
-		if (dw->dvi.cache.adjustable[i]) {
-			int x;
-			int *deltap;
-
-			x = extra/nadj;
-			deltap = &dw->dvi.cache.cache[i].delta;
-#define MIN_DELTA 2
-			if (*deltap > 0 && x + *deltap < MIN_DELTA) {
-				x = MIN_DELTA - *deltap;
-				if (x <= 0)
-					*deltap = MIN_DELTA;
-				else
-					x = 0;
-			}
-			else
-				*deltap += x;
-			extra -= x;
-			--nadj;
-			dw->dvi.cache.adjustable[i] = 0;
-		}
-}
-
-void
-FlushCharCache (dw)
-	DviWidget	dw;
-{
-	if (dw->dvi.cache.char_index != 0) {
-		AdjustCacheDeltas (dw);
-		XDrawText (XtDisplay (dw), XtWindow (dw), dw->dvi.normal_GC,
-			   dw->dvi.cache.start_x, dw->dvi.cache.start_y,
-			   dw->dvi.cache.cache, dw->dvi.cache.index + 1);
-	}	
-	dw->dvi.cache.index = 0;
-	dw->dvi.cache.max = DVI_TEXT_CACHE_SIZE;
-#if 0
-	if (dw->dvi.noPolyText)
-	    dw->dvi.cache.max = 1;
-#endif
-	dw->dvi.cache.char_index = 0;
-	dw->dvi.cache.cache[0].nchars = 0;
-	dw->dvi.cache.start_x = dw->dvi.cache.x	= XPos (dw);
-	dw->dvi.cache.start_y = dw->dvi.cache.y = YPos (dw);
-}
-
-void
-Newline (dw)
-	DviWidget	dw;
-{
-	FlushCharCache (dw);
-	dw->dvi.text_x_width = dw->dvi.text_device_width = 0;
-	dw->dvi.word_flag = 0;
-}
-
-void
-Word (dw)
-	DviWidget	dw;
-{
-	dw->dvi.word_flag = 1;
-}
-
-#define charWidth(fi,c) (\
-    (fi)->per_char ?\
-	(fi)->per_char[(c) - (fi)->min_char_or_byte2].width\
-    :\
-	(fi)->max_bounds.width\
-)
- 
-
-static
-int charExists (fi, c)
-	XFontStruct	*fi;
-	int		c;
-{
-	XCharStruct *p;
-
-	if (fi->per_char == NULL ||
-	    c < fi->min_char_or_byte2 || c > fi->max_char_or_byte2)
-		return 0;
-	p = fi->per_char + (c - fi->min_char_or_byte2);
-	return (p->lbearing != 0 || p->rbearing != 0 || p->width != 0
-		|| p->ascent != 0 || p->descent != 0 || p->attributes != 0);
-}
-
-static void
-DoCharacter (dw, c, wid)
-	DviWidget dw;
-	int c;
-	int wid;    /* width in device units */
-{
-	register XFontStruct	*font;
-	register XTextItem	*text;
-	int	x, y;
-	
-	x = XPos(dw);
-	y = YPos(dw);
-
-	/*
-	 * quick and dirty extents calculation:
-	 */
-	if (!(y + 24 >= dw->dvi.extents.y1
-	      && y - 24 <= dw->dvi.extents.y2
-#if 0
-	      && x + 24 >= dw->dvi.extents.x1
-	      && x - 24 <= dw->dvi.extents.x2
-#endif
-	    ))
-		return;
-	
-	if (y != dw->dvi.cache.y
-	    || dw->dvi.cache.char_index >= DVI_CHAR_CACHE_SIZE) {
-		FlushCharCache (dw);
-		x = dw->dvi.cache.x;
-		dw->dvi.cache.adjustable[dw->dvi.cache.index] = 0;
-	}
-	/*
-	 * load a new font, if the current block is not empty,
-	 * step to the next.
-	 */
-	if (dw->dvi.cache.font_size != dw->dvi.state->font_size ||
-	    dw->dvi.cache.font_number != dw->dvi.state->font_number)
-	{
-		FlushCharCache (dw);
-		x = dw->dvi.cache.x;
-		dw->dvi.cache.font_size = dw->dvi.state->font_size;
-		dw->dvi.cache.font_number = dw->dvi.state->font_number;
-		dw->dvi.cache.font = QueryFont (dw,
-						dw->dvi.cache.font_number,
-						dw->dvi.cache.font_size);
-		if (dw->dvi.cache.cache[dw->dvi.cache.index].nchars != 0) {
-			++dw->dvi.cache.index;
-			if (dw->dvi.cache.index >= dw->dvi.cache.max)
-				FlushCharCache (dw);
-			dw->dvi.cache.cache[dw->dvi.cache.index].nchars = 0;
-			dw->dvi.cache.adjustable[dw->dvi.cache.index] = 0;
-		}
-	}
-	if (x != dw->dvi.cache.x || dw->dvi.word_flag) {
-		if (dw->dvi.cache.cache[dw->dvi.cache.index].nchars != 0) {
-			++dw->dvi.cache.index;
-			if (dw->dvi.cache.index >= dw->dvi.cache.max)
-				FlushCharCache (dw);
-			dw->dvi.cache.cache[dw->dvi.cache.index].nchars = 0;
-			dw->dvi.cache.adjustable[dw->dvi.cache.index] = 0;
-		}
-		dw->dvi.cache.adjustable[dw->dvi.cache.index]
-			= dw->dvi.word_flag;
-		dw->dvi.word_flag = 0;
-	}
-	font = dw->dvi.cache.font;
-	text = &dw->dvi.cache.cache[dw->dvi.cache.index];
-	if (text->nchars == 0) {
-		text->chars = &dw->dvi.cache.char_cache[dw->dvi.cache.char_index];
-		text->delta = x - dw->dvi.cache.x;
-		if (font != dw->dvi.font) {
-			text->font = font->fid;
-			dw->dvi.font = font;
-		} else
-			text->font = None;
-		dw->dvi.cache.x += text->delta;
-	}
-	if (charExists(font, c)) {
-		int w;
-		dw->dvi.cache.char_cache[dw->dvi.cache.char_index++] = (char) c;
-		++text->nchars;
-		w = charWidth(font, c);
-		dw->dvi.cache.x += w;
-		if (wid != 0) {
-			dw->dvi.text_x_width += w;
-			dw->dvi.text_device_width += wid;
-		}
-	}
-}
-
-static
-int FindCharWidth (dw, buf, widp)
-	DviWidget dw;
-	char *buf;
-	int *widp;
-{
-	int maxpos;
-	int i;
-
-	if (dw->dvi.device_font == 0
-	    || dw->dvi.state->font_number != dw->dvi.device_font_number) {
-		dw->dvi.device_font_number = dw->dvi.state->font_number;
-		dw->dvi.device_font
-			= QueryDeviceFont (dw, dw->dvi.device_font_number);
-	}
-	if (dw->dvi.device_font
-	    && device_char_width (dw->dvi.device_font,
-				  dw->dvi.state->font_size, buf, widp))
-		return 1;
-
-	maxpos = MaxFontPosition (dw);
-	for (i = 1; i <= maxpos; i++) {
-		DeviceFont *f = QueryDeviceFont (dw, i);
-		if (f && device_font_special (f)
-		    && device_char_width (f, dw->dvi.state->font_size,
-					  buf, widp)) {
-			dw->dvi.state->font_number = i;
-			return 1;
-		}
-	}
-	return 0;
-}
-
-/* Return the width of the character in device units. */
-
-int PutCharacter (dw, buf)
-	DviWidget dw;
-	char *buf;
-{
-	int		prevFont;
-	int		c = -1;
-	int		wid = 0;
-	DviCharNameMap	*map;
-
-	if (!dw->dvi.display_enable)
-		return 0;	/* The width doesn't matter in this case. */
-	prevFont = dw->dvi.state->font_number;
-	if (!FindCharWidth (dw, buf, &wid))
-		return 0;
-	map = QueryFontMap (dw, dw->dvi.state->font_number);
-	if (map)
-		c = DviCharIndex (map, buf);
-	if (c >= 0)
-		DoCharacter (dw, c, wid);
-	else
-		(void) FakeCharacter (dw, buf, wid);
-	dw->dvi.state->font_number = prevFont;
-	return wid;
-}
-
-/* Return 1 if we can fake it; 0 otherwise. */
-
-static
-int FakeCharacter (dw, buf, wid)
-	DviWidget dw;
-	char *buf;
-	int wid;
-{
-	int oldx, oldw;
-	char ch[2];
-	char *chars = 0;
-
-	if (buf[0] == '\0' || buf[1] == '\0' || buf[2] != '\0')
-		return 0;
-#define pack2(c1, c2) (((c1) << 8) | (c2))
-
-	switch (pack2(buf[0], buf[1])) {
-	case pack2('f', 'i'):
-		chars = "fi";
-		break;
-	case pack2('f', 'l'):
-		chars = "fl";
-		break;
-	case pack2('f', 'f'):
-		chars = "ff";
-		break;
-	case pack2('F', 'i'):
-		chars = "ffi";
-		break;
-	case pack2('F', 'l'):
-		chars = "ffl";
-		break;
-	}
-	if (!chars)
-		return 0;
-	oldx = dw->dvi.state->x;
-	oldw = dw->dvi.text_device_width;
-	ch[1] = '\0';
-	for (; *chars; chars++) {
-		ch[0] = *chars;
-		dw->dvi.state->x += PutCharacter (dw, ch);
-	}
-	dw->dvi.state->x = oldx;
-	dw->dvi.text_device_width = oldw + wid;
-	return 1;
-}
-
-void
-PutNumberedCharacter (dw, c)
-	DviWidget dw;
-	int c;
-{
-	char *name;
-	int wid;
-	DviCharNameMap	*map;
-
-	if (!dw->dvi.display_enable)
-		return;
-
-	if (dw->dvi.device_font == 0
-	    || dw->dvi.state->font_number != dw->dvi.device_font_number) {
-		dw->dvi.device_font_number = dw->dvi.state->font_number;
-		dw->dvi.device_font
-			= QueryDeviceFont (dw, dw->dvi.device_font_number);
-	}
-	
-	if (dw->dvi.device_font == 0
-	    || !device_code_width (dw->dvi.device_font,
-				   dw->dvi.state->font_size, c, &wid))
-		return;
-	if (dw->dvi.native) {
-		DoCharacter (dw, c, wid);
-		return;
-	}
-	map = QueryFontMap (dw, dw->dvi.state->font_number);
-	if (!map)
-		return;
-	for (name = device_name_for_code (dw->dvi.device_font, c);
-	     name;
-	     name = device_name_for_code ((DeviceFont *)0, c)) {
-		int code = DviCharIndex (map, name);
-		if (code >= 0) {
-			DoCharacter (dw, code, wid);
-			break;
-		}
-		if (FakeCharacter (dw, name, wid))
-			break;
-	}
-}
-
-void
-ClearPage (dw)
-	DviWidget	dw;
-{
-	XClearWindow (XtDisplay (dw), XtWindow (dw));
-}
-
-static void
-setGC (dw)
-	DviWidget	dw;
-{
-	int desired_line_width;
-	
-	if (dw->dvi.line_thickness < 0)
-		desired_line_width = (int)(((double)dw->dvi.device_resolution
-					    * dw->dvi.state->font_size)
-					   / (10.0*72.0*dw->dvi.sizescale));
-	else
-		desired_line_width = dw->dvi.line_thickness;
-	
-	if (desired_line_width != dw->dvi.line_width) {
-		XGCValues values;
-		values.line_width = DeviceToX(dw, desired_line_width);
-		if (values.line_width == 0)
-			values.line_width = 1;
-		XChangeGC(XtDisplay (dw), dw->dvi.normal_GC,
-			  GCLineWidth, &values);
-		dw->dvi.line_width = desired_line_width;
-	}
-}
-
-static void
-setFillGC (dw)
-	DviWidget	dw;
-{
-	int fill_type;
-	unsigned long mask = GCFillStyle | GCForeground;
-
-	fill_type = (dw->dvi.fill * 10) / (DVI_FILL_MAX + 1);
-	if (dw->dvi.fill_type != fill_type) {
-		XGCValues values;
-		if (fill_type <= 0) {
-			values.foreground = dw->dvi.background;
-			values.fill_style = FillSolid;
-		} else if (fill_type >= 9) {
-			values.foreground = dw->dvi.foreground;
-			values.fill_style = FillSolid;
-		} else {
-			values.foreground = dw->dvi.foreground;
-			values.fill_style = FillOpaqueStippled;
-			values.stipple = dw->dvi.gray[fill_type - 1];
-			mask |= GCStipple;
-		}
-		XChangeGC(XtDisplay (dw), dw->dvi.fill_GC, mask, &values);
-		dw->dvi.fill_type = fill_type;
-	}
-}
-
-void
-DrawLine (dw, x, y)
-	DviWidget	dw;
-	int		x, y;
-{
-	int xp, yp;
-
-	AdjustCacheDeltas (dw);
-	setGC (dw);
-	xp = XPos (dw);
-	yp = YPos (dw);
-	XDrawLine (XtDisplay (dw), XtWindow (dw), dw->dvi.normal_GC,
-		   xp, yp,
-		   xp + DeviceToX (dw, x), yp + DeviceToX (dw, y));
-}
-
-void
-DrawCircle (dw, diam)
-	DviWidget	dw;
-	int		diam;
-{
-	int d;
-
-	AdjustCacheDeltas (dw);
-	setGC (dw);
-	d = DeviceToX (dw, diam);
-	XDrawArc (XtDisplay (dw), XtWindow (dw), dw->dvi.normal_GC,
-		  XPos (dw), YPos (dw) - d/2,
-		  d, d, 0, 64*360);
-}
-
-void
-DrawFilledCircle (dw, diam)
-	DviWidget	dw;
-	int		diam;
-{
-	int d;
-
-	AdjustCacheDeltas (dw);
-	setFillGC (dw);
-	d = DeviceToX (dw, diam);
-	XFillArc (XtDisplay (dw), XtWindow (dw), dw->dvi.fill_GC,
-		  XPos (dw), YPos (dw) - d/2,
-		  d, d, 0, 64*360);
-	XDrawArc (XtDisplay (dw), XtWindow (dw), dw->dvi.fill_GC,
-		  XPos (dw), YPos (dw) - d/2,
-		  d, d, 0, 64*360);
-}
-
-void
-DrawEllipse (dw, a, b)
-	DviWidget	dw;
-	int		a, b;
-{
-	AdjustCacheDeltas (dw);
-	setGC (dw);
-	XDrawArc (XtDisplay (dw), XtWindow (dw), dw->dvi.normal_GC,
-		  XPos (dw), YPos (dw) - DeviceToX (dw, b/2),
-		  DeviceToX (dw, a), DeviceToX (dw, b), 0, 64*360);
-}
-
-void
-DrawFilledEllipse (dw, a, b)
-	DviWidget	dw;
-	int		a, b;
-{
-	AdjustCacheDeltas (dw);
-	setFillGC (dw);
-	XFillArc (XtDisplay (dw), XtWindow (dw), dw->dvi.fill_GC,
-		  XPos (dw), YPos (dw) - DeviceToX (dw, b/2),
-		  DeviceToX (dw, a), DeviceToX (dw, b), 0, 64*360);
-	XDrawArc (XtDisplay (dw), XtWindow (dw), dw->dvi.fill_GC,
-		  XPos (dw), YPos (dw) - DeviceToX (dw, b/2),
-		  DeviceToX (dw, a), DeviceToX (dw, b), 0, 64*360);
-}
-
-void
-DrawArc (dw, x0, y0, x1, y1)
-	DviWidget	dw;
-	int		x0, y0, x1, y1;
-{
-	int angle1, angle2;
-	int rad = (int)((sqrt ((double)x0*x0 + (double)y0*y0)
-			+ sqrt ((double)x1*x1 + (double)y1*y1) + 1.0)/2.0);
-	if ((x0 == 0 && y0 == 0) || (x1 == 0 && y1 == 0))
-		return;
-	angle1 = (int)(atan2 ((double)y0, (double)-x0)*180.0*64.0/M_PI);
-	angle2 = (int)(atan2 ((double)-y1, (double)x1)*180.0*64.0/M_PI);
-	
-	angle2 -= angle1;
-	if (angle2 < 0)
-		angle2 += 64*360;
-	
-	AdjustCacheDeltas (dw);
-	setGC (dw);
-
-	rad = DeviceToX (dw, rad);
-	XDrawArc (XtDisplay (dw), XtWindow (dw), dw->dvi.normal_GC,
-		  XPos (dw) + DeviceToX (dw, x0) - rad,
-		  YPos (dw) + DeviceToX (dw, y0) - rad,
-		  rad*2, rad*2, angle1, angle2);
-}
-
-void
-DrawPolygon (dw, v, n)
-	DviWidget	dw;
-	int		*v;
-	int		n;
-{
-	XPoint *p;
-	int i;
-	int dx, dy;
-	
-	n /= 2;
-	
-	AdjustCacheDeltas (dw);
-	setGC (dw);
-	p = (XPoint *)XtMalloc((n + 2)*sizeof(XPoint));
-	p[0].x = XPos (dw);
-	p[0].y = YPos (dw);
-	dx = 0;
-	dy = 0;
-	for (i = 0; i < n; i++) {
-		dx += v[2*i];
-		p[i + 1].x = DeviceToX (dw, dx) + p[0].x;
-		dy += v[2*i + 1];
-		p[i + 1].y = DeviceToX (dw, dy) + p[0].y;
-	}
-	p[n+1].x = p[0].x;
-	p[n+1].y = p[0].y;
-	XDrawLines (XtDisplay (dw), XtWindow (dw), dw->dvi.normal_GC,
-		   p, n + 2, CoordModeOrigin);
-	XtFree((char *)p);
-}
-
-void
-DrawFilledPolygon (dw, v, n)
-	DviWidget	dw;
-	int		*v;
-	int		n;
-{
-	XPoint *p;
-	int i;
-	int dx, dy;
-	
-	n /= 2;
-	if (n < 2)
-		return;
-	
-	AdjustCacheDeltas (dw);
-	setFillGC (dw);
-	p = (XPoint *)XtMalloc((n + 2)*sizeof(XPoint));
-	p[0].x = p[n+1].x = XPos (dw);
-	p[0].y = p[n+1].y = YPos (dw);
-	dx = 0;
-	dy = 0;
-	for (i = 0; i < n; i++) {
-		dx += v[2*i];
-		p[i + 1].x = DeviceToX (dw, dx) + p[0].x;
-		dy += v[2*i + 1];
-		p[i + 1].y = DeviceToX (dw, dy) + p[0].y;
-	}
-	XFillPolygon (XtDisplay (dw), XtWindow (dw), dw->dvi.fill_GC,
-		      p, n + 1, Complex, CoordModeOrigin);
-	XDrawLines (XtDisplay (dw), XtWindow (dw), dw->dvi.fill_GC,
-		      p, n + 2, CoordModeOrigin);
-	XtFree((char *)p);
-}
-
-#define POINTS_MAX 10000
-
-static void
-appendPoint(points, pointi, x, y)
-	XPoint	*points;
-	int	*pointi;
-	int	x, y;
-{
-	if (*pointi < POINTS_MAX) {
-		points[*pointi].x = x;
-		points[*pointi].y = y;
-		*pointi += 1;
-	}
-}
-
-#define FLATNESS 1
-
-static void
-flattenCurve(points, pointi, x2, y2, x3, y3, x4, y4)
-	XPoint	*points;
-	int	*pointi;
-	int	x2, y2, x3, y3, x4, y4;
-{
-	int x1, y1, dx, dy, n1, n2, n;
-
-	x1 = points[*pointi - 1].x;
-	y1 = points[*pointi - 1].y;
-	
-	dx = x4 - x1;
-	dy = y4 - y1;
-	
-	n1 = dy*(x2 - x1) - dx*(y2 - y1);
-	n2 = dy*(x3 - x1) - dx*(y3 - y1);
-	if (n1 < 0)
-		n1 = -n1;
-	if (n2 < 0)
-		n2 = -n2;
-	n = n1 > n2 ? n1 : n2;
-
-	if (n*n / (dy*dy + dx*dx) <= FLATNESS*FLATNESS)
-		appendPoint (points, pointi, x4, y4);
-	else {
-		flattenCurve (points, pointi,
-			      (x1 + x2)/2, (y1 + y2)/2,
-			      (x1 + x2*2 + x3)/4, (y1 + y2*2 + y3)/4,
-			      (x1 +3*x2 + 3*x3 + x4)/8, (y1 +3*y2 + 3*y3 + y4)/8);
-		flattenCurve (points, pointi,
-			      (x2 + x3*2 + x4)/4, (y2 + y3*2 + y4)/4,
-			      (x3 + x4)/2, (y3 + y4)/2,
-			      x4, y4);
-	}
-}
-
-void
-DrawSpline (dw, v, n)
-	DviWidget	dw;
-	int		*v;
-	int		n;
-{
-	int sx, sy, tx, ty;
-	int ox, oy, dx, dy;
-	int i;
-	int pointi;
-	XPoint points[POINTS_MAX];
-	
-	if (n == 0 || (n & 1) != 0)
-		return;
-	AdjustCacheDeltas (dw);
-	setGC (dw);
-	ox = XPos (dw);
-	oy = YPos (dw);
-	dx = v[0];
-	dy = v[1];
-	sx = ox;
-	sy = oy;
-	tx = sx + DeviceToX (dw, dx);
-	ty = sy + DeviceToX (dw, dy);
-	
-	pointi = 0;
-	
-	appendPoint (points, &pointi, sx, sy);
-	appendPoint (points, &pointi, (sx + tx)/2, (sy + ty)/2);
-	
-	for (i = 2; i < n; i += 2) {
-		int ux = ox + DeviceToX (dw, dx += v[i]);
-		int uy = oy + DeviceToX (dw, dy += v[i+1]);
-		flattenCurve (points, &pointi,
-			       (sx + tx*5)/6, (sy + ty*5)/6,
-			       (tx*5 + ux)/6, (ty*5 + uy)/6,
-			       (tx + ux)/2, (ty + uy)/2);
-		sx = tx;
-		sy = ty;
-		tx = ux;
-		ty = uy;
-	}
-	
-	appendPoint (points, &pointi, tx, ty);
-	
-	XDrawLines (XtDisplay (dw), XtWindow (dw), dw->dvi.normal_GC,
-		   points, pointi, CoordModeOrigin);
-}
-
-
-/*
-Local Variables:
-c-indent-level: 8
-c-continued-statement-offset: 8
-c-brace-offset: -8
-c-argdecl-indent: 8
-c-label-offset: -8
-c-tab-always-indent: nil
-End:
-*/
diff --git a/src/xditview/font.c b/src/xditview/font.c
deleted file mode 100644
index 8b4114af..00000000
--- a/src/xditview/font.c
+++ /dev/null
@@ -1,481 +0,0 @@
-/*
- * font.c
- *
- * map dvi fonts to X fonts
- */
-
-#include <X11/Xos.h>
-#include <X11/IntrinsicP.h>
-#include <X11/StringDefs.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include "DviP.h"
-#include "XFontName.h"
-
-static void DisposeFontSizes();
-void DestroyFontMap();
-
-/* XFontName.c */
-extern Bool XParseFontName();
-extern Bool XFormatFontName();
-
-static char *
-savestr (s)
-	char	*s;
-{
-	char	*n;
-
-	if (!s)
-		return 0;
-	n = XtMalloc (strlen (s) + 1);
-	if (n)
-		strcpy (n, s);
-	return n;
-}
-
-static DviFontList *
-LookupFontByPosition (dw, position)
-	DviWidget	dw;
-	int		position;
-{
-	DviFontList	*f;
-
-	for (f = dw->dvi.fonts; f; f = f->next)
-		if (f->dvi_number == position)
-			break;
-	return f;
-}
-
-int
-MaxFontPosition (dw)
-	DviWidget dw;
-{
-	DviFontList	*f;
-	int n = -1;
-
-	for (f = dw->dvi.fonts; f; f = f->next)
-		if (f->dvi_number > n)
-			n = f->dvi_number;
-	return n;
-}
-
-static DviFontSizeList *
-LookupFontSizeBySize (dw, f, size)
-	DviWidget	dw;
-	DviFontList	*f;
-	int		size;
-{
-	DviFontSizeList	*fs, *best = 0, *smallest = 0;
-	int		bestsize = 0;
-	XFontName	fontName;
-	unsigned int    fontNameAttributes;
-	char	    	fontNameString[2048];
-	int		decipointsize;
-	
-	if (f->scalable) {
-		decipointsize = (10*size)/dw->dvi.sizescale;
-		for (best = f->sizes; best; best = best->next)
-			if (best->size == decipointsize)
-				return best;
-		best = (DviFontSizeList *) XtMalloc(sizeof *best);
-		best->next = f->sizes;
-		best->size = decipointsize;
-		f->sizes = best;
-		XParseFontName (f->x_name, &fontName, &fontNameAttributes);
-		fontNameAttributes &= ~(FontNamePixelSize|FontNameAverageWidth);
-		fontNameAttributes |= FontNameResolutionX;
-		fontNameAttributes |= FontNameResolutionY;
-		fontNameAttributes |= FontNamePointSize;
-		fontName.ResolutionX = dw->dvi.display_resolution;
-		fontName.ResolutionY = dw->dvi.display_resolution;
-		fontName.PointSize = decipointsize;
-		XFormatFontName (&fontName, fontNameAttributes, fontNameString);
-		best->x_name = savestr (fontNameString);
-		best->doesnt_exist = 0;
-		best->font = 0;
-		return best;
-	}
-	for (fs = f->sizes; fs; fs=fs->next) {
-		if (dw->dvi.sizescale*fs->size <= 10*size
-		    && fs->size >= bestsize) {
-			best = fs;
-			bestsize = fs->size;
-		}
-		if (smallest == 0 || fs->size < smallest->size)
-			smallest = fs;
-	}
-	return best ? best : smallest;
-}
-
-static char *
-SkipFontNameElement (n)
-	char	*n;
-{
-	while (*n != '-')
-		if (!*++n)
-			return 0;
-	return n+1;
-}
-
-# define SizePosition		8
-# define EncodingPosition	13
-
-static int
-ConvertFontNameToSize (n)
-	char	*n;
-{
-	int	i, size;
-
-	for (i = 0; i < SizePosition; i++) {
-		n = SkipFontNameElement (n);
-		if (!n)
-			return -1;
-	}
-	size = atoi (n);
-	return size;
-}
-
-static char *
-ConvertFontNameToEncoding (n)
-	char	*n;
-{
-        int i;
-	for (i = 0; i < EncodingPosition; i++) {
-		n = SkipFontNameElement (n);
-		if (!n)
-			return 0;
-	}
-	return n;
-}
-
-DviFontSizeList *
-InstallFontSizes (dw, x_name, scalablep)
-	DviWidget	dw;
-	char		*x_name;
-	Boolean		*scalablep;
-{
-	char	fontNameString[2048];
-	char	**fonts;
-	int	i, count;
-	int	size;
-	DviFontSizeList	*sizes, *new;
-	XFontName	fontName;
-	unsigned int	fontNameAttributes;
-
-	*scalablep = FALSE;
-	if (!XParseFontName (x_name, &fontName, &fontNameAttributes))
-		return 0;
-	fontNameAttributes &= ~(FontNamePixelSize|FontNamePointSize
-				|FontNameAverageWidth);
-	fontNameAttributes |= FontNameResolutionX;
-	fontNameAttributes |= FontNameResolutionY;
-	fontName.ResolutionX = dw->dvi.display_resolution;
-	fontName.ResolutionY = dw->dvi.display_resolution;
-	XFormatFontName (&fontName, fontNameAttributes, fontNameString);
-	fonts = XListFonts (XtDisplay (dw), fontNameString, 10000000, &count);
-	sizes = 0;
-	for (i = 0; i < count; i++) {
-		size = ConvertFontNameToSize (fonts[i]);
-		if (size == 0) {
-			DisposeFontSizes (dw, sizes);
-			sizes = 0;
-			*scalablep = TRUE;
-			break;
-		}
-		if (size != -1) {
-			new = (DviFontSizeList *) XtMalloc (sizeof *new);
-			new->next = sizes;
-			new->size = size;
-			new->x_name = savestr (fonts[i]);
-			new->doesnt_exist = 0;
-			new->font = 0;
-			sizes = new;
-		}
-	}
-	XFreeFontNames (fonts);
-	return sizes;
-}
-
-static void
-DisposeFontSizes (dw, fs)
-	DviWidget	dw;
-	DviFontSizeList	*fs;
-{
-	DviFontSizeList	*next;
-
-	for (; fs; fs=next) {
-		next = fs->next;
-		if (fs->x_name)
-			XtFree (fs->x_name);
-		if (fs->font && fs->font != dw->dvi.default_font) {
-			XUnloadFont (XtDisplay (dw), fs->font->fid);
-			XFree ((char *)fs->font);
-		}
-		XtFree ((char *) fs);
-	}
-}
-
-static DviFontList *
-InstallFont (dw, position, dvi_name, x_name)
-	DviWidget	dw;
-	int		position;
-	char		*dvi_name;
-	char		*x_name;
-{
-	DviFontList	*f;
-	char		*encoding;
-
-	if ((f = LookupFontByPosition (dw, position)) != NULL) {
-		/*
-		 * ignore gratuitous font loading
-		 */
-		if (!strcmp (f->dvi_name, dvi_name) &&
-		    !strcmp (f->x_name, x_name))
-			return f;
-
-		DisposeFontSizes (dw, f->sizes);
-		if (f->dvi_name)
-			XtFree (f->dvi_name);
-		if (f->x_name)
-			XtFree (f->x_name);
-		f->device_font = 0;
-	} else {
-		f = (DviFontList *) XtMalloc (sizeof (*f));
-		f->next = dw->dvi.fonts;
-		dw->dvi.fonts = f;
-	}
-	f->initialized = FALSE;
-	f->dvi_name = savestr (dvi_name);
-	f->device_font = device_find_font (dw->dvi.device, dvi_name);
-	f->x_name = savestr (x_name);
-	f->dvi_number = position;
-	f->sizes = 0;
-	f->scalable = FALSE;
-	if (f->x_name) {
-		encoding = ConvertFontNameToEncoding (f->x_name);
-		f->char_map = DviFindMap (encoding);
-	} else
-		f->char_map = 0;
-	/* 
-	 * force requery of fonts
-	 */
-	dw->dvi.font = 0;
-	dw->dvi.font_number = -1;
-	dw->dvi.cache.font = 0;
-	dw->dvi.cache.font_number = -1;
-	dw->dvi.device_font = 0;
-	dw->dvi.device_font_number = -1;
-	return f;
-}
-
-void
-ForgetFonts (dw)
-	DviWidget dw;
-{
-	DviFontList *f = dw->dvi.fonts;
-	
-	while (f) {
-		DviFontList *tem = f;
-
-		if (f->sizes)
-			DisposeFontSizes (dw, f->sizes);
-		if (f->dvi_name)
-			XtFree (f->dvi_name);
-		if (f->x_name)
-			XtFree (f->x_name);
-		f = f->next;
-		XtFree ((char *) tem);
-	}
-	
-	/* 
-	 * force requery of fonts
-	 */
-	dw->dvi.font = 0;
-	dw->dvi.font_number = -1;
-	dw->dvi.cache.font = 0;
-	dw->dvi.cache.font_number = -1;
-	dw->dvi.device_font = 0;
-	dw->dvi.device_font_number = -1;
-	dw->dvi.fonts = 0;
-}
-
-
-static char *
-MapDviNameToXName (dw, dvi_name)
-	DviWidget	dw;
-	char		*dvi_name;
-{
-	DviFontMap	*fm;
-	
-	for (fm = dw->dvi.font_map; fm; fm=fm->next)
-		if (!strcmp (fm->dvi_name, dvi_name))
-			return fm->x_name;
-	return 0;
-}
-
-#if 0
-static char *
-MapXNameToDviName (dw, x_name)
-	DviWidget	dw;
-	char		*x_name;
-{
-	DviFontMap	*fm;
-	
-	for (fm = dw->dvi.font_map; fm; fm=fm->next)
-		if (!strcmp (fm->x_name, x_name))
-			return fm->dvi_name;
-	return 0;
-}
-#endif
-
-void
-ParseFontMap (dw)
-	DviWidget	dw;
-{
-	char		dvi_name[1024];
-	char		x_name[2048];
-	char		*m, *s;
-	DviFontMap	*fm, *new;
-
-	if (dw->dvi.font_map)
-		DestroyFontMap (dw->dvi.font_map);
-	fm = 0;
-	m = dw->dvi.font_map_string;
-	while (*m) {
-		s = m;
-		while (*m && !isspace (*m))
-			++m;
-		strncpy (dvi_name, s, m-s);
-		dvi_name[m-s] = '\0';
-		while (isspace (*m))
-			++m;
-		s = m;
-		while (*m && *m != '\n')
-			++m;
-		strncpy (x_name, s, m-s);
-		x_name[m-s] = '\0';
-		new = (DviFontMap *) XtMalloc (sizeof *new);
-		new->x_name = savestr (x_name);
-		new->dvi_name = savestr (dvi_name);
-		new->next = fm;
-		fm = new;
-		++m;
-	}
-	dw->dvi.font_map = fm;
-}
-
-void
-DestroyFontMap (font_map)
-	DviFontMap	*font_map;
-{
-	DviFontMap	*next;
-
-	for (; font_map; font_map = next) {
-		next = font_map->next;
-		if (font_map->x_name)
-			XtFree (font_map->x_name);
-		if (font_map->dvi_name)
-			XtFree (font_map->dvi_name);
-		XtFree ((char *) font_map);
-	}
-}
-
-/* ARGSUSED */
-
-void
-SetFontPosition (dw, position, dvi_name, extra)
-	DviWidget	dw;
-	int		position;
-	char		*dvi_name;
-	char		*extra;	/* unused */
-{
-	char	*x_name;
-
-	x_name = MapDviNameToXName (dw, dvi_name);
-	if (x_name)
-		(void) InstallFont (dw, position, dvi_name, x_name);
-}
-
-XFontStruct *
-QueryFont (dw, position, size)
-	DviWidget	dw;
-	int		position;
-	int		size;
-{
-	DviFontList	*f;
-	DviFontSizeList	*fs;
-
-	f = LookupFontByPosition (dw, position);
-	if (!f)
-		return dw->dvi.default_font;
-	if (!f->initialized) {
-		f->sizes = InstallFontSizes (dw, f->x_name, &f->scalable);
-		f->initialized = TRUE;
-	}
-	fs = LookupFontSizeBySize (dw, f, size);
-	if (!fs)
-		return dw->dvi.default_font;
-	if (!fs->font) {
-		if (fs->x_name)
-			fs->font = XLoadQueryFont (XtDisplay (dw), fs->x_name);
-		if (!fs->font)
-			fs->font = dw->dvi.default_font;
-	}
-	return fs->font;
-}
-
-DeviceFont *
-QueryDeviceFont (dw, position)
-	DviWidget	dw;
-	int		position;
-{
-	DviFontList	*f;
-
-	f = LookupFontByPosition (dw, position);
-	if (!f)
-		return 0;
-	return f->device_font;
-}
-
-DviCharNameMap *
-QueryFontMap (dw, position)
-	DviWidget	dw;
-	int		position;
-{
-	DviFontList	*f;
-
-	f = LookupFontByPosition (dw, position);
-	if (f)
-	    return f->char_map;
-	else
-	    return 0;
-}
-
-#if 0
-LoadFont (dw, position, size)
-	DviWidget	dw;
-	int		position;
-	int		size;
-{
-	XFontStruct	*font;
-
-	font = QueryFont (dw, position, size);
-	dw->dvi.font_number = position;
-	dw->dvi.font_size = size;
-	dw->dvi.font = font;
-	XSetFont (XtDisplay (dw), dw->dvi.normal_GC, font->fid);
-	return;
-}
-#endif
-
-/*
-Local Variables:
-c-indent-level: 8
-c-continued-statement-offset: 8
-c-brace-offset: -8
-c-argdecl-indent: 8
-c-label-offset: -8
-c-tab-always-indent: nil
-End:
-*/
diff --git a/src/xditview/gray1.bm b/src/xditview/gray1.bm
deleted file mode 100644
index c40a95e6..00000000
--- a/src/xditview/gray1.bm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define gray1_width 3
-#define gray1_height 3
-static char gray1_bits[] = {
-   0x00, 0x02, 0x00};
diff --git a/src/xditview/gray2.bm b/src/xditview/gray2.bm
deleted file mode 100644
index e87a1bcc..00000000
--- a/src/xditview/gray2.bm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define gray2_width 3
-#define gray2_height 3
-static char gray2_bits[] = {
-   0x00, 0x03, 0x00};
diff --git a/src/xditview/gray3.bm b/src/xditview/gray3.bm
deleted file mode 100644
index d9313ebd..00000000
--- a/src/xditview/gray3.bm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define gray3_width 3
-#define gray3_height 3
-static char gray3_bits[] = {
-   0x00, 0x03, 0x02};
diff --git a/src/xditview/gray4.bm b/src/xditview/gray4.bm
deleted file mode 100644
index dad142a9..00000000
--- a/src/xditview/gray4.bm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define gray4_width 3
-#define gray4_height 3
-static char gray4_bits[] = {
-   0x00, 0x07, 0x02};
diff --git a/src/xditview/gray5.bm b/src/xditview/gray5.bm
deleted file mode 100644
index 5f576184..00000000
--- a/src/xditview/gray5.bm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define gray5_width 3
-#define gray5_height 3
-static char gray5_bits[] = {
-   0x04, 0x07, 0x02};
diff --git a/src/xditview/gray6.bm b/src/xditview/gray6.bm
deleted file mode 100644
index b76701db..00000000
--- a/src/xditview/gray6.bm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define gray6_width 3
-#define gray6_height 3
-static char gray6_bits[] = {
-   0x04, 0x07, 0x03};
diff --git a/src/xditview/gray7.bm b/src/xditview/gray7.bm
deleted file mode 100644
index ef47bc69..00000000
--- a/src/xditview/gray7.bm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define gray7_width 3
-#define gray7_height 3
-static char gray7_bits[] = {
-   0x05, 0x07, 0x03};
diff --git a/src/xditview/gray8.bm b/src/xditview/gray8.bm
deleted file mode 100644
index 12de7cb6..00000000
--- a/src/xditview/gray8.bm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define gray8_width 3
-#define gray8_height 3
-static char gray8_bits[] = {
-   0x05, 0x07, 0x07};
diff --git a/src/xditview/gxditview.man b/src/xditview/gxditview.man
deleted file mode 100644
index 86800019..00000000
--- a/src/xditview/gxditview.man
+++ /dev/null
@@ -1,249 +0,0 @@
-.TH GXDITVIEW 1 "Release 5" "X Version 11"
-.SH NAME
-gxditview \- display gtroff output files
-.SH SYNOPSIS
-.B gxditview
-.RI [\fB\- toolkitoption\  .\|.\|.\|]
-.RI [\fB\- option\  .\|.\|.\|]
-.RI [ filename ]
-.SH DESCRIPTION
-The
-.I gxditview 
-program displays gtroff output on an X display.
-It uses the standard X11 fonts,
-so it does not require access to the server machine for font loading.
-.PP
-If
-.I filename
-is
-.BR \- ,
-.I gxditview
-will read the standard input.
-.PP
-The left mouse button brings up a menu with the following entries:
-.TP 8
-.B "Next Page"
-Display the next page.
-.TP
-.B "Previous Page"
-Display the previous page.
-.TP
-.B "Select Page"
-Select a particular numbered page specified by a dialog box.
-.TP
-.B Print
-Print the gtroff output using a command specified by a dialog box.
-The default command initially displayed is controlled by the
-.B printCommand
-application resource, and by the
-.B \-printCommand
-option.
-.TP
-.B Open
-Open for display a new file specified by a dialog box.
-The file should contain gtroff output.
-If the filename starts with
-.B |
-it will be taken to be a command to read from.
-.TP
-.B Quit
-Exit from
-.IR gxditview .
-.PP
-The
-.BR n ,
-Space
-and Return keys are bound to the
-.B Next\ Page
-action.
-The
-.BR p ,
-BackSpace
-and
-Delete
-keys are bound to the
-.B Previous\ Page
-action.
-The
-.B q
-key is bound to the
-.B Quit
-action.
-The
-.B r
-key is bound to the
-.B Rerasterize
-action which rereads the current file, and redisplays the current page;
-if the current file is a command, the command will be reexecuted.
-.PP
-The
-.B paperlength
-and
-.B paperwidth
-commands in the DESC file specify the length and width in machine units
-of the virtual page displayed by
-.IR gxditview .
-.SH OPTIONS
-.I Gxditview
-accepts all of the standard X Toolkit command line options along with the 
-additional options listed below:
-.TP 8
-.B \-help
-This option indicates that a brief summary of the allowed options should be
-printed.
-.TP
-.B \-page
-This option specifies the page number of the document to be displayed.
-.TP
-.BI \-backingStore\  backing-store-type
-Redisplay of the gtroff output window can take upto a second or so,
-this option causes the server to save the window contents so that when
-it is scrolled around the viewport, the window is painted from
-contents saved in backing store.
-.I backing-store-type
-can be one of
-.BR Always ,
-.B WhenMapped
-or 
-.BR NotUseful .
-.TP
-.BI \-printCommand\  command
-The default command displayed in the dialog box for the
-.B Print
-menu entry will be
-.IR command .
-.TP
-.BI \-resolution\  res
-The gtroff output file will be displayed at a resolution of
-.I res
-dpi,
-unless the DESC file contains the
-.B X11
-command, in which case the device resolution will be used.
-This corresponds the
-.I Dvi
-widget's
-.B resolution
-resource.
-The default is 75.
-.TP
-.BI \-filename\  string
-The default filename displayed in the dialog box for the
-.B Open
-menu entry will be
-.IR string .
-This can be either a filename, or a command starting with
-.BR | .
-.PP
-The following standard X Toolkit command line arguments are commonly used with 
-.IR gxditview :
-.TP 8
-.BI \-bg\  color
-This option specifies the color to use for the background of the window.  
-The default is \fIwhite\fP.
-.TP
-.BI \-bd\  color
-This option specifies the color to use for the border of the window.
-The default is \fIblack\fP.
-.TP
-.BI \-bw\  number
-This option specifies the width in pixels of the border surrounding the window.
-.TP
-.BI \-fg\  color
-This option specifies the color to use for displaying text.  The default is 
-\fIblack\fP.
-.TP
-.BI \-fn\  font
-This option specifies the font to be used for displaying widget text.  The
-default is \fIfixed\fP.
-.TP
-.B \-rv
-This option indicates that reverse video should be simulated by swapping
-the foreground and background colors.
-.TP
-.BI \-geometry\  geometry
-This option specifies the preferred size and position of the window.
-.TP
-.BI \-display\  host : display
-This option specifies the X server to contact.
-.TP
-.BI \-xrm\  resourcestring
-This option specifies a resource string to be used.
-.SH X DEFAULTS
-This program uses the 
-.I Dvi
-widget in the X Toolkit.  It understands all of the core resource names and
-classes as well as:
-.PP
-.TP 8
-.BR width\  (class\  Width )
-Specifies the width of the window.
-.TP
-.BR height\  (class\  Height )
-Specifies the height of the window.
-.TP
-.BR foreground\  (class\  Foreground )
-Specifies the default foreground color.
-.TP
-.BR font\  (class\  Font )
-Specifies the font to be used for error messages.
-.TP
-.BR fontMap\  (class\  FontMap )
-Specifies the mapping from groff font names to X font names.  This
-must be a string containing a sequence of lines.  Each line contains
-two whitespace separated fields: first the groff font name, and
-secondly the X font name.  The default is
-.nf
-"\e
-TR	-adobe-times-medium-r-normal--*-100-*-*-*-*-iso8859-1\en\e
-TI	-adobe-times-medium-i-normal--*-100-*-*-*-*-iso8859-1\en\e
-TB	-adobe-times-bold-r-normal--*-100-*-*-*-*-iso8859-1\en\e
-TBI	-adobe-times-bold-i-normal--*-100-*-*-*-*-iso8859-1\en\e
-CR	-adobe-courier-medium-r-normal--*-100-*-*-*-*-iso8859-1\en\e
-CI	-adobe-courier-medium-o-normal--*-100-*-*-*-*-iso8859-1\en\e
-CB	-adobe-courier-bold-r-normal--*-100-*-*-*-*-iso8859-1\en\e
-CBI	-adobe-courier-bold-o-normal--*-100-*-*-*-*-iso8859-1\en\e
-HR	-adobe-helvetica-medium-r-normal--*-100-*-*-*-*-iso8859-1\en\e
-HI	-adobe-helvetica-medium-o-normal--*-100-*-*-*-*-iso8859-1\en\e
-HB	-adobe-helvetica-bold-r-normal--*-100-*-*-*-*-iso8859-1\en\e
-HBI	-adobe-helvetica-bold-o-normal--*-100-*-*-*-*-iso8859-1\en\e
-NR	-adobe-new century schoolbook-medium-r-normal--*-100-*-*-*-*-iso8859-1\en\e
-NI	-adobe-new century schoolbook-medium-i-normal--*-100-*-*-*-*-iso8859-1\en\e
-NB	-adobe-new century schoolbook-bold-r-normal--*-100-*-*-*-*-iso8859-1\en\e
-NBI	-adobe-new century schoolbook-bold-i-normal--*-100-*-*-*-*-iso8859-1\en\e
-S	-adobe-symbol-medium-r-normal--*-100-*-*-*-*-adobe-fontspecific\en\e
-SS	-adobe-symbol-medium-r-normal--*-100-*-*-*-*-adobe-fontspecific\en\e
-"
-.fi
-
-.SH "SEE ALSO"
-.IR X (1),
-.IR xrdb (1),
-.IR gtroff (1),
-.IR groff (1)
-.SH ORIGIN
-This program is derived from xditview;
-portions of xditview originated in xtroff which was derived
-from suntroff.  
-.SH COPYRIGHT
-Copyright 1989, Massachusetts Institute of Technology.
-.br
-See
-.IR X (1)
-for a full statement of rights and permissions.
-.SH AUTHORS
-Keith Packard (MIT X Consortium)
-.br
-Richard L. Hyde (Purdue)
-.br
-David Slattengren (Berkeley)
-.br
-Malcolm Slaney (Schlumberger Palo Alto Research)
-.br
-Mark Moraes (University of Toronto)
-.br
-James Clark
-.
-.\" Local Variables:
-.\" mode: nroff
-.\" End:
diff --git a/src/xditview/lex.c b/src/xditview/lex.c
deleted file mode 100644
index 1f60bbbb..00000000
--- a/src/xditview/lex.c
+++ /dev/null
@@ -1,105 +0,0 @@
-#include <X11/Xos.h>
-#include <X11/IntrinsicP.h>
-#include <X11/StringDefs.h>
-#include <stdio.h>
-#include "DviP.h"
-
-int
-DviGetAndPut(dw, cp)
-    DviWidget	dw;
-    int		*cp;
-{
-	if (dw->dvi.ungot) {
-		dw->dvi.ungot =	0;
-		*cp = getc (dw->dvi.file);
-	}
-	else {
-		*cp = getc (dw->dvi.file);
-		if (*cp != EOF)
-			putc (*cp, dw->dvi.tmpFile);
-	}
-	return *cp;
-}
-
-char *
-GetLine(dw, Buffer, Length)
-	DviWidget	dw;
-	char	*Buffer;
-	int	Length;
-{
-	int 	i = 0, c;
-	
-	Length--;		     /* Save room for final '\0' */
-	
-	while (DviGetC (dw, &c) != EOF) {
-		if (Buffer && i < Length)
-			Buffer[i++] = c;
-		if (c == '\n') {
-			DviUngetC(dw, c);
-			break;
-		}
-	}
-	if (Buffer)
-		Buffer[i] = '\0';
-	return Buffer;
-} 
-
-char *
-GetWord(dw, Buffer, Length)
-	DviWidget	dw;
-	char	*Buffer;
-	int	Length;
-{
-	int 	i = 0, c;
-	
-	Length--;			    /* Save room for final '\0' */
-	while (DviGetC(dw, &c) == ' ' || c == '\n')
-		;
-	while (c != EOF) {
-		if (Buffer && i < Length)
-			Buffer[i++] = c;
-		if (DviGetC(dw, &c) == ' ' || c == '\n') {
-			DviUngetC(dw, c);
-			break;
-		}
-	}
-	if (Buffer)
-		Buffer[i] = '\0';
-	return Buffer;
-} 
-
-int
-GetNumber(dw)
-	DviWidget	dw;
-{
-	int	i = 0,  c;
-	int	negative = 0;
-
-	while (DviGetC(dw, &c) == ' ' || c == '\n')
-		;
-	if (c == '-') {
-		negative = 1;
-		DviGetC(dw, &c);
-	}
-
-	for (; c >= '0' && c <= '9'; DviGetC(dw, &c)) {
-		if (negative)
-			i = i*10 - (c - '0');
-		else
-			i = i*10 + c - '0';
-	}
-	if (c != EOF)
-		DviUngetC(dw, c);
-	return i;
-}
-	
-/*
-Local Variables:
-c-indent-level: 8
-c-continued-statement-offset: 8
-c-brace-offset: -8
-c-argdecl-indent: 8
-c-label-offset: -8
-c-tab-always-indent: nil
-End:
-*/
diff --git a/src/xditview/page.c b/src/xditview/page.c
deleted file mode 100644
index bd3bb60d..00000000
--- a/src/xditview/page.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * page.c
- *
- * map page numbers to file position
- */
-
-#include <X11/Xos.h>
-#include <X11/IntrinsicP.h>
-#include <X11/StringDefs.h>
-#include <stdio.h>
-#include <ctype.h>
-#include "DviP.h"
-
-#ifdef X_NOT_STDC_ENV
-extern long	ftell();
-#endif
-
-static DviFileMap *
-MapPageNumberToFileMap (dw, number)
-	DviWidget	dw;
-	int		number;
-{
-	DviFileMap	*m;
-
-	for (m = dw->dvi.file_map; m; m=m->next)
-		if (m->page_number == number)
-			break;
-	return m;
-}
-
-void
-DestroyFileMap (m)
-	DviFileMap	*m;
-{
-	DviFileMap	*next;
-
-	for (; m; m = next) {
-		next = m->next;
-		XtFree ((char *) m);
-	}
-}
-
-void
-ForgetPagePositions (dw)
-	DviWidget	dw;
-{
-	DestroyFileMap (dw->dvi.file_map);
-	dw->dvi.file_map = 0;
-}
-
-void
-RememberPagePosition(dw, number)
-	DviWidget	dw;
-	int		number;
-{
-	DviFileMap	*m;
-
-	if (!(m = MapPageNumberToFileMap (dw, number))) {
-		m = (DviFileMap *) XtMalloc (sizeof *m);
-		m->page_number = number;
-		m->next = dw->dvi.file_map;
-		dw->dvi.file_map = m;
-	}
-	if (dw->dvi.tmpFile)
-		m->position = ftell (dw->dvi.tmpFile);
-	else
-		m->position = ftell (dw->dvi.file);
-}
-
-long
-SearchPagePosition (dw, number)
-	DviWidget	dw;
-	int		number;
-{
-	DviFileMap	*m;
-
-	if (!(m = MapPageNumberToFileMap (dw, number)))
-		return -1;
-	return m->position;
-}
-
-void
-FileSeek(dw, position)
-DviWidget	dw;
-long		position;
-{
-	if (dw->dvi.tmpFile) {
-		dw->dvi.readingTmp = 1;
-		fseek (dw->dvi.tmpFile, position, 0);
-	} else
-		fseek (dw->dvi.file, position, 0);
-}
-
diff --git a/src/xditview/parse.c b/src/xditview/parse.c
deleted file mode 100644
index 4606438c..00000000
--- a/src/xditview/parse.c
+++ /dev/null
@@ -1,371 +0,0 @@
-/*
- * parse.c
- *
- * parse dvi input
- */
-
-#include <X11/Xos.h>
-#include <X11/IntrinsicP.h>
-#include <X11/StringDefs.h>
-#include <stdio.h>
-#include <ctype.h>
-#include "DviP.h"
-
-static int StopSeen = 0;
-static void ParseDrawFunction(), ParseDeviceControl();
-static void push_env(), pop_env();
-
-/* draw.c */
-extern int PutCharacter();
-extern int PutNumberedCharacter();
-extern void HorizontalGoto();
-extern void Word();
-extern void VerticalGoto();
-extern void VerticalMove();
-extern void FlushCharCache();
-extern void Newline();
-extern void DrawLine();
-extern void DrawCircle();
-extern void DrawFilledCircle();
-extern void DrawEllipse();
-extern void DrawFilledEllipse();
-extern void DrawArc();
-extern void DrawPolygon();
-extern void DrawFilledPolygon();
-extern void DrawSpline();
-
-/* Dvi.c */
-extern void SetDevice();
-
-/* page.c */
-extern void RememberPagePosition();
-
-/* font.c */
-extern void SetFontPosition();
-
-/* lex.c */
-extern int GetNumber();
-
-#define HorizontalMove(dw, delta)	((dw)->dvi.state->x += (delta))
-
-
-int
-ParseInput(dw)
-    register DviWidget	dw;
-{
-	int		n, k;
-	int		c;
-	char		Buffer[BUFSIZ];
-	int		NextPage;
-	int		otherc;
-
-	StopSeen = 0;
-
-	/*
-	 * make sure some state exists
-	 */
-
-	if (!dw->dvi.state)
-	    push_env (dw);
-	for (;;) {
-		switch (DviGetC(dw, &c)) {
-		case '\n':	
-			break;
-		case ' ':	/* when input is text */
-		case 0:		/* occasional noise creeps in */
-			break;
-		case '{':	/* push down current environment */
-			push_env(dw);
-			break;
-		case '}':
-			pop_env(dw);
-			break;
-		/*
-		 * two motion digits plus a character
-		 */
-		case '0': case '1': case '2': case '3': case '4':
-		case '5': case '6': case '7': case '8': case '9':
-			HorizontalMove(dw, (c-'0')*10 +
-					   DviGetC(dw,&otherc)-'0');
-			/* fall through */
-		case 'c':	/* single ascii character */
-			DviGetC(dw,&c);
-		    	if (c == ' ')
-			    break;
-			Buffer[0] = c;
-			Buffer[1] = '\0';
-			(void) PutCharacter (dw, Buffer);
-			break;
-		case 'C':
-			GetWord (dw, Buffer, BUFSIZ);
-			(void) PutCharacter (dw, Buffer);
-			break;
-		case 't':
-			Buffer[1] = '\0';
-			while (DviGetC (dw, &c) != EOF
-			       && c != ' ' && c != '\n') {
-				Buffer[0] = c;
-				HorizontalMove (dw, PutCharacter (dw, Buffer));
-			}
-			break;
-		case 'u':
-			n = GetNumber(dw);
-			Buffer[1] = '\0';
-			while (DviGetC (dw, &c) == ' ')
-				;
-			while (c != EOF && c != ' ' && c != '\n') {
-				Buffer[0] = c;
-				HorizontalMove (dw,
-						PutCharacter (dw, Buffer) + n);
-				DviGetC (dw, &c);
-			}
-			break;
-
-		case 'D':	/* draw function */
-			(void) GetLine(dw, Buffer, BUFSIZ);
-			if (dw->dvi.display_enable)
-				ParseDrawFunction(dw, Buffer);
-			break;
-		case 's':	/* ignore fractional sizes */
-			n = GetNumber(dw);
-			dw->dvi.state->font_size = n;
-			break;
-		case 'f':
-			n = GetNumber(dw);
-			dw->dvi.state->font_number = n;
-			break;
-		case 'H':	/* absolute horizontal motion */
-			k = GetNumber(dw);
-			HorizontalGoto(dw, k);
-			break;
-		case 'h':	/* relative horizontal motion */
-			k = GetNumber(dw);
-			HorizontalMove(dw, k);
-			break;
-		case 'w':	/* word space */
-			Word (dw);
-			break;
-		case 'V':
-			n = GetNumber(dw);
-			VerticalGoto(dw, n);
-			break;
-		case 'v':
-			n = GetNumber(dw);
-			VerticalMove(dw, n);
-			break;
-		case 'P':	/* new spread */
-			break;
-		case 'p':	/* new page */
-			(void) GetNumber(dw);
-			NextPage = dw->dvi.current_page + 1;
-			RememberPagePosition(dw, NextPage);
-			FlushCharCache (dw);
-			return(NextPage);
-		case 'N':
-			n = GetNumber(dw);
-			PutNumberedCharacter (dw, n);
-			break;
-		case 'n':	/* end of line */
-			GetNumber(dw);
-			GetNumber(dw);
-			Newline (dw);
-			HorizontalGoto(dw, 0);
-			break;
-		case 'F':       /* input files */
-		case '+':	/* continuation of X device control */
-		case 'm':	/* color */
-		case '#':	/* comment */
-			GetLine(dw, NULL, 0);
-			break;
-		case 'x':	/* device control */
-			ParseDeviceControl(dw);
-			break;
-		case EOF:
-			dw->dvi.last_page = dw->dvi.current_page;
-			FlushCharCache (dw);
-			return dw->dvi.current_page;
-		default:
-			break;
-		}
-	}
-}
-
-static void
-push_env(dw)
-	DviWidget	dw;
-{
-	DviState	*new;
-
-	new = (DviState *) XtMalloc (sizeof (*new));
-	if (dw->dvi.state)
-		*new = *(dw->dvi.state);
-	else {
-		new->font_size = 10;
-		new->font_number = 1;
-		new->x = 0;
-		new->y = 0;
-	}
-	new->next = dw->dvi.state;
-	dw->dvi.state = new;
-}
-
-static void
-pop_env(dw)
-	DviWidget	dw;
-{
-	DviState	*old;
-
-	old = dw->dvi.state;
-	dw->dvi.state = old->next;
-	XtFree ((char *) old);
-}
-
-static void
-InitTypesetter (dw)
-	DviWidget	dw;
-{
-	while (dw->dvi.state)
-		pop_env (dw);
-	push_env (dw);
-	FlushCharCache (dw);
-}
-
-#define DRAW_ARGS_MAX 128
-
-static void
-ParseDrawFunction(dw, buf)
-DviWidget	dw;
-char		*buf;
-{
-	int v[DRAW_ARGS_MAX];
-	int i, no_move = 0;
-	char *ptr;
-	
-	v[0] = v[1] = v[2] = v[3] = 0;
-	
-	if (buf[0] == '\0')
-		return;
-	ptr = buf+1;
-	
-	for (i = 0; i < DRAW_ARGS_MAX; i++) {
-		if (sscanf(ptr, "%d", v + i) != 1)
-			break;
-		while (*ptr == ' ')
-			ptr++;
-		while (*ptr != '\0' && *ptr != ' ')
-			ptr++;
-	}
-	
-	switch (buf[0]) {
-	case 'l':				/* draw a line */
-		DrawLine(dw, v[0], v[1]);
-		break;
-	case 'c':				/* circle */
-		DrawCircle(dw, v[0]);
-		break;
-	case 'C':
-		DrawFilledCircle(dw, v[0]);
-		break;
-	case 'e':				/* ellipse */
-		DrawEllipse(dw, v[0], v[1]);
-		break;
-	case 'E':
-		DrawFilledEllipse(dw, v[0], v[1]);
-		break;
-	case 'a':				/* arc */
-		DrawArc(dw, v[0], v[1], v[2], v[3]);
-		break;
-	case 'p':
-		DrawPolygon(dw, v, i);
-		break;
-	case 'P':
-		DrawFilledPolygon(dw, v, i);
-		break;
-	case '~':				/* wiggly line */
-		DrawSpline(dw, v, i);
-		break;
-	case 't':
-		dw->dvi.line_thickness = v[0];
-		break;
-	case 'f':
-		if (i > 0 && v[0] >= 0 && v[0] <= DVI_FILL_MAX)
-			dw->dvi.fill = v[0];
-		no_move = 1;
-		break;
-	default:
-#if 0
-		warning("unknown drawing function %s", buf);
-#endif
-		no_move = 1;
-		break;
-	}
-	
-	if (!no_move) {
-		if (buf[0] == 'e') {
-			if (i > 0)
-				dw->dvi.state->x += v[0];
-		}
-		else {
-			while (--i >= 0) {
-				if (i & 1)
-					dw->dvi.state->y += v[i];
-				else
-					dw->dvi.state->x += v[i];
-			}
-		}
-	}
-} 
-
-static void
-ParseDeviceControl(dw)				/* Parse the x commands */
-	DviWidget	dw;
-{
-        char str[20], str1[50];
-	int c, n;
-
-	GetWord (dw, str, 20);
-	switch (str[0]) {			/* crude for now */
-	case 'T':				/* output device */
-		GetWord (dw, str, 20);
-		SetDevice (dw, str);
-		break;
-	case 'i':				/* initialize */
-		InitTypesetter (dw);
-		break;
-	case 't':				/* trailer */
-		break;
-	case 'p':				/* pause -- can restart */
-		break;
-	case 's':				/* stop */
-		StopSeen = 1;
-		return;
-	case 'r':				/* resolution when prepared */
-		break;
-	case 'f':				/* font used */
-		n = GetNumber (dw);
-		GetWord (dw, str, 20);
-		GetLine (dw, str1, 50);
-		SetFontPosition (dw, n, str, str1);
-		break;
-	case 'H':				/* char height */
-		break;
-	case 'S':				/* slant */
-		break;
-	}
-	while (DviGetC (dw, &c) != '\n')	/* skip rest of input line */
-		if (c == EOF)
-			return;
-	return;
-}
-
-
-/*
-Local Variables:
-c-indent-level: 8
-c-continued-statement-offset: 8
-c-brace-offset: -8
-c-argdecl-indent: 8
-c-label-offset: -8
-c-tab-always-indent: nil
-End:
-*/
diff --git a/src/xditview/xdit.bm b/src/xditview/xdit.bm
deleted file mode 100644
index 67b9c8ab..00000000
--- a/src/xditview/xdit.bm
+++ /dev/null
@@ -1,14 +0,0 @@
-#define xdit_width 32
-#define xdit_height 32
-static char xdit_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0x03, 0x02, 0x00, 0x00, 0x02,
-   0x8a, 0xa2, 0xfc, 0x03, 0x52, 0x14, 0x03, 0x04, 0x02, 0x80, 0x00, 0x08,
-   0x52, 0x54, 0x00, 0x10, 0x8a, 0x22, 0x8f, 0x23, 0x02, 0x20, 0x06, 0x21,
-   0x8a, 0x12, 0x8c, 0x40, 0x52, 0x14, 0x8c, 0x40, 0x02, 0x10, 0x58, 0x40,
-   0x52, 0x14, 0x30, 0x40, 0x8a, 0x12, 0x30, 0x40, 0x02, 0x10, 0x70, 0x40,
-   0x8a, 0x12, 0xc8, 0x40, 0x52, 0x24, 0xc4, 0xe0, 0x02, 0x20, 0x84, 0xe1,
-   0x52, 0x54, 0xce, 0xf3, 0x8a, 0xa2, 0x00, 0xf8, 0x02, 0x00, 0x03, 0xfc,
-   0x8a, 0x22, 0xfc, 0xf3, 0x52, 0x14, 0x00, 0xc2, 0x02, 0x00, 0x00, 0x02,
-   0x52, 0x14, 0x45, 0x02, 0x8a, 0xa2, 0x28, 0x02, 0x02, 0x00, 0x00, 0x02,
-   0x02, 0x00, 0x00, 0x02, 0xfe, 0xff, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/src/xditview/xdit_mask.bm b/src/xditview/xdit_mask.bm
deleted file mode 100644
index f34a4f86..00000000
--- a/src/xditview/xdit_mask.bm
+++ /dev/null
@@ -1,14 +0,0 @@
-#define xdit_mask_width 32
-#define xdit_mask_height 32
-static char xdit_mask_bits[] = {
-   0xff, 0xff, 0xff, 0x07, 0xff, 0xff, 0xff, 0x07, 0xff, 0xff, 0xff, 0x07,
-   0xff, 0xff, 0xff, 0x07, 0xff, 0xff, 0xff, 0x0f, 0xff, 0xff, 0xff, 0x1f,
-   0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, 0xff, 0x7f, 0xff, 0xff, 0xff, 0x7f,
-   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-   0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf7, 0xff, 0xff, 0xff, 0xc7,
-   0xff, 0xff, 0xff, 0x07, 0xff, 0xff, 0xff, 0x07, 0xff, 0xff, 0xff, 0x07,
-   0xff, 0xff, 0xff, 0x07, 0xff, 0xff, 0xff, 0x07, 0xff, 0xff, 0xff, 0x07,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/src/xditview/xditview.c b/src/xditview/xditview.c
deleted file mode 100644
index eac2edd8..00000000
--- a/src/xditview/xditview.c
+++ /dev/null
@@ -1,600 +0,0 @@
-/*
- * Copyright 1991 Massachusetts Institute of Technology
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of M.I.T. not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission.  M.I.T. makes no representations about the
- * suitability of this software for any purpose.  It is provided "as is"
- * without express or implied warranty.
- *
- * M.I.T. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL M.I.T.
- * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- */
-/*
- * xditview -- 
- *
- *   Display ditroff output in an X window
- */
-
-#ifndef SABER
-#ifndef lint
-static char rcsid[] = "$XConsortium: xditview.c,v 1.17 89/12/10 17:05:08 rws Exp $";
-#endif /* lint */
-#endif /* SABER */
-
-#include <X11/Xatom.h>
-#include <X11/Xlib.h>
-#include <X11/Xos.h>
-#include <X11/Intrinsic.h>
-#include <X11/StringDefs.h>
-#include <X11/Shell.h>
-#include <X11/Xaw/Paned.h>
-#include <X11/Xaw/Viewport.h>
-#include <X11/Xaw/Box.h>
-#include <X11/Xaw/Command.h>
-#include <X11/Xaw/Dialog.h>
-#include <X11/Xaw/Label.h>
-#include <X11/Xaw/SimpleMenu.h>
-#include <X11/Xaw/SmeBSB.h>
-
-#include <stdlib.h>
-#include <signal.h>
-
-#include "Dvi.h"
-
-#include "xdit.bm"
-#include "xdit_mask.bm"
-#include "stdio.h"
-
-extern FILE *popen();
-extern void exit();
-
-static String fallback_resources[] = {
-#include "GXditview-ad.h"
-    NULL
-};
-
-static struct app_resources {
-    char *print_command;
-    char *filename;
-} app_resources;
-
-#define offset(field) XtOffset(struct app_resources *, field)
-
-/* Application resources. */
-
-static XtResource resources[] = {
-  {"printCommand", "PrintCommand", XtRString, sizeof(char*),
-       offset(print_command), XtRString, NULL},
-  {"filename", "Filename", XtRString, sizeof(char*),
-       offset(filename), XtRString, NULL},
-};
-
-#undef offset
-
-/* Command line options table.  Only resources are entered here...there is a
-   pass over the remaining options after XtParseCommand is let loose. */
-
-static XrmOptionDescRec options[] = {
-{"-page",	    "*dvi.pageNumber",	    XrmoptionSepArg,	NULL},
-{"-backingStore",   "*dvi.backingStore",    XrmoptionSepArg,	NULL},
-{"-resolution",	    "*dvi.resolution",      XrmoptionSepArg,	NULL},
-{"-printCommand",   ".printCommand",        XrmoptionSepArg,	NULL},
-{"-filename",       ".filename",            XrmoptionSepArg,	NULL},
-{"-noPolyText",	    "*dvi.noPolyText",	    XrmoptionNoArg,	"TRUE"},
-};
-
-static char current_print_command[1024];
-
-static char	current_file_name[1024];
-static FILE	*current_file;
-
-/*
- * Report the syntax for calling xditview.
- */
-
-static void
-Syntax(call)
-	char *call;
-{
-	(void) printf ("Usage: %s [-fg <color>] [-bg <color>]\n", call);
-	(void) printf ("       [-bd <color>] [-bw <pixels>] [-help]\n");
-	(void) printf ("       [-display displayname] [-geometry geom]\n");
-	(void) printf ("       [-page <page-number>] [-backing <backing-store>]\n");
-	(void) printf ("       [-resolution <res>] [-print <command>]\n");
-	(void) printf ("       [-filename <file>] [filename]\n\n");
-	exit(1);
-}
-
-static void	NewFile (), SetPageNumber ();
-static Widget	toplevel, paned, viewport, dvi;
-static Widget	page;
-static Widget	simpleMenu;
-
-static void	NextPage(), PreviousPage(), SelectPage(), OpenFile(), Quit();
-static void	Print();
-
-static struct menuEntry {
-    char    *name;
-    void    (*function)();
-} menuEntries[] = {
-    {"nextPage",	NextPage},
-    {"previousPage",	PreviousPage},
-    {"selectPage",	SelectPage},
-    {"print",		Print},
-    {"openFile",	OpenFile},
-    {"quit",		Quit},
-};
-
-static void	NextPageAction(), PreviousPageAction(), SelectPageAction();
-static void	OpenFileAction(), QuitAction();
-static void	AcceptAction(), CancelAction();
-static void	PrintAction();
-static void	RerasterizeAction();
-static void	MakePrompt();
-
-XtActionsRec xditview_actions[] = {
-    {"NextPage",	NextPageAction},
-    {"PreviousPage",	PreviousPageAction},
-    {"SelectPage",	SelectPageAction},
-    {"Print",		PrintAction},
-    {"OpenFile",	OpenFileAction},
-    {"Rerasterize",	RerasterizeAction},
-    {"Quit",		QuitAction},
-    {"Accept",		AcceptAction},
-    {"Cancel",		CancelAction},
-};
-
-#define MenuNextPage		0
-#define MenuPreviousPage	1
-#define MenuSelectPage		2
-#define MenuPrint		3
-#define MenuOpenFile		4
-#define	MenuQuit		5
-
-static char	pageLabel[256] = "Page <none>";
-
-int main(argc, argv)
-    int argc;
-    char **argv;
-{
-    char	    *file_name = 0;
-    int		    i;
-    static Arg	    labelArgs[] = {
-			{XtNlabel, (XtArgVal) pageLabel},
-    };
-    XtAppContext    xtcontext;
-    Arg		    topLevelArgs[2];
-    Widget          entry;
-    Arg		    pageNumberArgs[1];
-    int		    page_number;
-
-    toplevel = XtAppInitialize(&xtcontext, "GXditview",
-			    options, XtNumber (options),
- 			    &argc, argv, fallback_resources, NULL, 0);
-    if (argc > 2
-	|| (argc == 2 && (!strcmp(argv[1], "-help")
-			  || !strcmp(argv[1], "--help"))))
-	Syntax(argv[0]);
-
-    XtGetApplicationResources(toplevel, (XtPointer)&app_resources,
-			      resources, XtNumber(resources),
-			      NULL, (Cardinal) 0);
-    if (app_resources.print_command)
-	strcpy(current_print_command, app_resources.print_command);
-
-    XtAppAddActions(xtcontext, xditview_actions, XtNumber (xditview_actions));
-
-    XtSetArg (topLevelArgs[0], XtNiconPixmap,
-	      XCreateBitmapFromData (XtDisplay (toplevel),
-				     XtScreen(toplevel)->root,
-				     xdit_bits, xdit_width, xdit_height));
-				    
-    XtSetArg (topLevelArgs[1], XtNiconMask,
-	      XCreateBitmapFromData (XtDisplay (toplevel),
-				     XtScreen(toplevel)->root,
-				     xdit_mask_bits, 
-				     xdit_mask_width, xdit_mask_height));
-    XtSetValues (toplevel, topLevelArgs, 2);
-    if (argc > 1)
-	file_name = argv[1];
-
-    /*
-     * create the menu and insert the entries
-     */
-    simpleMenu = XtCreatePopupShell ("menu", simpleMenuWidgetClass, toplevel,
-				    NULL, 0);
-    for (i = 0; i < XtNumber (menuEntries); i++) {
-	entry = XtCreateManagedWidget(menuEntries[i].name, 
-				      smeBSBObjectClass, simpleMenu,
-				      NULL, (Cardinal) 0);
-	XtAddCallback(entry, XtNcallback, menuEntries[i].function, NULL);
-    }
-
-    paned = XtCreateManagedWidget("paned", panedWidgetClass, toplevel,
-				    NULL, (Cardinal) 0);
-    viewport = XtCreateManagedWidget("viewport", viewportWidgetClass, paned,
-				     NULL, (Cardinal) 0);
-    dvi = XtCreateManagedWidget ("dvi", dviWidgetClass, viewport, NULL, 0);
-    page = XtCreateManagedWidget ("label", labelWidgetClass, paned,
-					labelArgs, XtNumber (labelArgs));
-    XtSetArg (pageNumberArgs[0], XtNpageNumber, &page_number);
-    XtGetValues (dvi, pageNumberArgs, 1);
-    if (file_name)
-	NewFile (file_name);
-    /* NewFile modifies current_file_name, so do this here. */
-    if (app_resources.filename)
-	strcpy(current_file_name, app_resources.filename);
-    XtRealizeWidget (toplevel);
-    if (file_name)
-	SetPageNumber (page_number);
-    XtAppMainLoop(xtcontext);
-    return 0;
-}
-
-static void
-SetPageNumber (number)
-{
-    Arg	arg[2];
-    int	actual_number, last_page;
-
-    XtSetArg (arg[0], XtNpageNumber, number);
-    XtSetValues (dvi, arg, 1);
-    XtSetArg (arg[0], XtNpageNumber, &actual_number);
-    XtSetArg (arg[1], XtNlastPageNumber, &last_page);
-    XtGetValues (dvi, arg, 2);
-    if (actual_number == 0)
-	sprintf (pageLabel, "Page <none>");
-    else if (last_page > 0)
-	sprintf (pageLabel, "Page %d of %d", actual_number, last_page);
-    else
-	sprintf (pageLabel, "Page %d", actual_number);
-    XtSetArg (arg[0], XtNlabel, pageLabel);
-    XtSetValues (page, arg, 1);
-}
-
-static void
-SelectPageNumber (number_string)
-char	*number_string;
-{
-	SetPageNumber (atoi(number_string));
-}
-
-static int hadFile = 0;
-
-static void
-NewFile (name)
-char	*name;
-{
-    Arg	    arg[2];
-    char    *n;
-    FILE    *new_file;
-    Boolean seek = 0;
-
-    if (current_file) {
-	if (!strcmp (current_file_name, "-"))
-	    ;
-	else if (current_file_name[0] == '|')
-	    pclose (current_file);
-	else
-	    fclose (current_file);
-    }
-    if (!strcmp (name, "-"))
-	new_file = stdin;
-    else if (name[0] == '|')
-	new_file = popen (name+1, "r");
-    else {
-	new_file = fopen (name, "r");
-	seek = 1;
-    }
-    if (!new_file) {
-	/* XXX display error message */
-	return;
-    }
-    XtSetArg (arg[0], XtNfile, new_file);
-    XtSetArg (arg[1], XtNseek, seek);
-    XtSetValues (dvi, arg, 2);
-    if (hadFile || name[0] != '-' || name[1] != '\0') {
-	XtSetArg (arg[0], XtNtitle, name);
-	if (name[0] != '/' && (n = strrchr (name, '/')))
-	    n = n + 1;
-	else
-	    n = name;
-	XtSetArg (arg[1], XtNiconName, n);
-	XtSetValues (toplevel, arg, 2);
-    }
-    hadFile = 1;
-    SelectPageNumber ("1");
-    strcpy (current_file_name, name);
-    current_file = new_file;
-}
-
-static char fileBuf[1024];
-
-static void
-ResetMenuEntry (entry)
-    Widget  entry;
-{
-    Arg	arg[1];
-
-    XtSetArg (arg[0], XtNpopupOnEntry, entry);
-    XtSetValues (XtParent(entry) , arg, (Cardinal) 1);
-}
-
-/*ARGSUSED*/
-
-static void
-NextPage (entry, name, data)
-    Widget  entry;
-    caddr_t name, data;
-{
-    NextPageAction();
-    ResetMenuEntry (entry);
-}
-
-static void
-NextPageAction ()
-{
-    Arg	args[1];
-    int	number;
-
-    XtSetArg (args[0], XtNpageNumber, &number);
-    XtGetValues (dvi, args, 1);
-    SetPageNumber (number+1);
-}
-
-/*ARGSUSED*/
-
-static void
-PreviousPage (entry, name, data)
-    Widget  entry;
-    caddr_t name, data;
-{
-    PreviousPageAction ();
-    ResetMenuEntry (entry);
-}
-
-static void
-PreviousPageAction ()
-{
-    Arg	args[1];
-    int	number;
-
-    XtSetArg (args[0], XtNpageNumber, &number);
-    XtGetValues (dvi, args, 1);
-    SetPageNumber (number-1);
-}
-
-/* ARGSUSED */
-
-static void
-SelectPage (entry, name, data)
-    Widget  entry;
-    caddr_t name, data;
-{
-    SelectPageAction ();
-    ResetMenuEntry (entry);
-}
-
-static void
-SelectPageAction ()
-{
-    MakePrompt (toplevel, "Page number", SelectPageNumber, "");
-}
-
-
-static void
-DoPrint (name)
-    char *name;
-{
-    FILE *print_file;
-#ifdef SIGNALRETURNSINT
-    int (*handler)();
-#else
-    void (*handler)();
-#endif
-    /* Avoid dieing because of an invalid command. */
-    handler = signal(SIGPIPE, SIG_IGN);
-
-    print_file = popen(name, "w");
-    if (!print_file)
-	/* XXX print error message */
-	return;
-    DviSaveToFile(dvi, print_file);
-    pclose(print_file);
-    signal(SIGPIPE, handler);
-    strcpy(current_print_command, name);
-}
-
-static void
-RerasterizeAction()
-{
-    Arg	args[1];
-    int	number;
-
-    if (current_file_name[0] == 0) {
-	/* XXX display an error message */
-	return;
-    } 
-    XtSetArg (args[0], XtNpageNumber, &number);
-    XtGetValues (dvi, args, 1);
-    NewFile(current_file_name);
-    SetPageNumber (number);
-}
-
-/* ARGSUSED */
-
-static void
-Print (entry, name, data)
-    Widget  entry;
-    caddr_t name, data;
-{
-    PrintAction ();
-    ResetMenuEntry (entry);
-}
-
-static void
-PrintAction ()
-{
-    if (current_print_command[0])
-	strcpy (fileBuf, current_print_command);
-    else
-	fileBuf[0] = '\0';
-    MakePrompt (toplevel, "Print command:", DoPrint, fileBuf);
-}
-
-
-/* ARGSUSED */
-
-static void
-OpenFile (entry, name, data)
-    Widget  entry;
-    caddr_t name, data;
-{
-    OpenFileAction ();
-    ResetMenuEntry (entry);
-}
-
-static void
-OpenFileAction ()
-{
-    if (current_file_name[0])
-	strcpy (fileBuf, current_file_name);
-    else
-	fileBuf[0] = '\0';
-    MakePrompt (toplevel, "File to open:", NewFile, fileBuf);
-}
-
-/* ARGSUSED */
-
-static void
-Quit (entry, closure, data)
-    Widget  entry;
-    caddr_t closure, data;
-{
-    QuitAction ();
-}
-
-static void
-QuitAction ()
-{
-    exit (0);
-}
-
-Widget	promptShell, promptDialog;
-void	(*promptfunction)();
-
-/* ARGSUSED */
-static
-void CancelAction (widget, event, params, num_params)
-    Widget	widget;
-    XEvent	*event;
-    String	*params;
-    Cardinal	*num_params;
-{
-    if (promptShell) {
-	XtSetKeyboardFocus(toplevel, (Widget) None);
-	XtDestroyWidget(promptShell);
-	promptShell = (Widget) 0;
-    }
-}
-
-static
-void AcceptAction (widget, event, params, num_params)
-    Widget	widget;
-    XEvent	*event;
-    String	*params;
-    Cardinal	*num_params;
-{
-    (*promptfunction)(XawDialogGetValueString(promptDialog));
-    CancelAction (widget, event, params, num_params);
-}
-
-static void
-MakePrompt(centerw, prompt, func, def)
-Widget	centerw;
-char *prompt;
-void (*func)();
-char	*def;
-{
-    static Arg dialogArgs[] = {
-	{XtNlabel, 0},
-	{XtNvalue, 0},
-    };
-    Arg valueArgs[1];
-    Arg centerArgs[2];
-    Position	source_x, source_y;
-    Position	dest_x, dest_y;
-    Dimension center_width, center_height;
-    Dimension prompt_width, prompt_height;
-    Widget  valueWidget;
-    
-    CancelAction ((Widget)NULL, (XEvent *) 0, (String *) 0, (Cardinal *) 0);
-    promptShell = XtCreatePopupShell ("promptShell", transientShellWidgetClass,
-				      toplevel, NULL, (Cardinal) 0);
-    dialogArgs[0].value = (XtArgVal)prompt;
-    dialogArgs[1].value = (XtArgVal)def;
-    promptDialog = XtCreateManagedWidget( "promptDialog", dialogWidgetClass,
-		    promptShell, dialogArgs, XtNumber (dialogArgs));
-    XawDialogAddButton(promptDialog, "accept", NULL, (caddr_t) 0);
-    XawDialogAddButton(promptDialog, "cancel", NULL, (caddr_t) 0);
-    valueWidget = XtNameToWidget (promptDialog, "value");
-    if (valueWidget) {
-    	XtSetArg (valueArgs[0], XtNresizable, TRUE);
-    	XtSetValues (valueWidget, valueArgs, 1);
-	/*
-	 * as resizable isn't set until just above, the
-	 * default value will be displayed incorrectly.
-	 * rectify the situation by resetting the values
-	 */
-        XtSetValues (promptDialog, dialogArgs, XtNumber (dialogArgs));
-    }
-    XtSetKeyboardFocus (promptDialog, valueWidget);
-    XtSetKeyboardFocus (toplevel, valueWidget);
-    XtRealizeWidget (promptShell);
-    /*
-     * place the widget in the center of the "parent"
-     */
-    XtSetArg (centerArgs[0], XtNwidth, &center_width);
-    XtSetArg (centerArgs[1], XtNheight, &center_height);
-    XtGetValues (centerw, centerArgs, 2);
-    XtSetArg (centerArgs[0], XtNwidth, &prompt_width);
-    XtSetArg (centerArgs[1], XtNheight, &prompt_height);
-    XtGetValues (promptShell, centerArgs, 2);
-    source_x = (center_width - prompt_width) / 2;
-    source_y = (center_height - prompt_height) / 3;
-    XtTranslateCoords (centerw, source_x, source_y, &dest_x, &dest_y);
-    XtSetArg (centerArgs[0], XtNx, dest_x);
-    XtSetArg (centerArgs[1], XtNy, dest_y);
-    XtSetValues (promptShell, centerArgs, 2);
-    XtMapWidget(promptShell);
-    promptfunction = func;
-}
-
-/* For DviChar.c */
-
-char *xmalloc(n)
-    int n;
-{
-    return XtMalloc(n);
-}
-
-/*
-Local Variables:
-c-indent-level: 4
-c-continued-statement-offset: 4
-c-brace-offset: -4
-c-argdecl-indent: 4
-c-label-offset: -4
-c-tab-always-indent: nil
-End:
-*/
diff --git a/src/xditview/xtotroff.c b/src/xditview/xtotroff.c
deleted file mode 100644
index cea0e70b..00000000
--- a/src/xditview/xtotroff.c
+++ /dev/null
@@ -1,321 +0,0 @@
-/*
- * xtotroff
- *
- * convert X font metrics into troff font metrics
- */
-
-#include	<X11/Xlib.h>
-#include	<stdio.h>
-#include	<ctype.h>
-#include	<unistd.h>
-#include	<stdlib.h>
-#include	<string.h>
-#include	<fcntl.h>
-#include	"XFontName.h"
-#include	"DviChar.h"
-
-#ifdef X_NOT_STDC_ENV
-char *malloc();
-#else 
-#include <stdlib.h>
-#endif
-
-/* XFontName.c */
-extern Bool XParseFontName();
-extern Bool XFormatFontName();
-
-#define charWidth(fi,c)	((fi)->per_char[(c) - (fi)->min_char_or_byte2].width)
-#define charHeight(fi,c)	((fi)->per_char[(c) - (fi)->min_char_or_byte2].ascent)
-#define charDepth(fi,c)	((fi)->per_char[(c) - (fi)->min_char_or_byte2].descent)
-#define charLBearing(fi,c)	((fi)->per_char[(c) - (fi)->min_char_or_byte2].lbearing)
-#define charRBearing(fi,c)	((fi)->per_char[(c) - (fi)->min_char_or_byte2].rbearing)
-
-Display		*dpy;
-int		groff_flag = 0;
-unsigned	resolution = 75;
-unsigned	point_size = 10;
-
-int charExists (fi, c)
-	XFontStruct	*fi;
-	int		c;
-{
-	XCharStruct *p;
-
-	if (c < fi->min_char_or_byte2 || c > fi->max_char_or_byte2)
-		return 0;
-	p = fi->per_char + (c - fi->min_char_or_byte2);
-	return (p->lbearing != 0 || p->rbearing != 0 || p->width != 0
-		|| p->ascent != 0 || p->descent != 0 || p->attributes != 0);
-}
-
-/* Canonicalize the font name by replacing scalable parts by *s. */
-
-static int
-CanonicalizeFontName (font_name, canon_font_name)
-	char *font_name, *canon_font_name;
-{
-	unsigned int	attributes;
-	XFontName	parsed;
-
-	if (!XParseFontName(font_name, &parsed, &attributes)) {
-		fprintf (stderr, "not a standard name: %s\n", font_name);
-		return 0;
-	}
-
-	attributes &= ~(FontNamePixelSize|FontNameAverageWidth
-			|FontNamePointSize
-			|FontNameResolutionX|FontNameResolutionY);
-	XFormatFontName(&parsed, attributes, canon_font_name);
-	return 1;
-}
-
-static int
-FontNamesAmbiguous(font_name, names, count)
-char *font_name;
-char **names;
-int count;
-{
-	char name1[2048], name2[2048];
-	int i;
-
-	if (count == 1)
-		return 0;
-
-	for (i = 0; i < count; i++) {
-		if (!CanonicalizeFontName(names[i], i == 0 ? name1 : name2)) {
-			fprintf(stderr, "bad font name: %s\n", names[i]);
-			return 1;
-		}
-		if (i > 0 && strcmp(name1, name2) != 0) {
-			fprintf(stderr, "ambiguous font name: %s\n", font_name);
-			fprintf(stderr, "  matches %s\n", names[0]);
-			fprintf(stderr, "  and %s\n", names[i]);
-			return 1;
-		}
-
-	}
-	return 0;
-}
-
-static int
-MapFont (font_name, troff_name)
-	char	*font_name;
-	char	*troff_name;
-{
-	XFontStruct	*fi;
-	int		count;
-	char		**names;
-	FILE		*out;
-	int		c;
-	unsigned int	attributes;
-	XFontName	parsed;
-	int		j, k;
-	DviCharNameMap	*char_map;
-	char		encoding[256];
-	char		*s;
-	int		wid;
-	char		name_string[2048];
-
-	if (!XParseFontName(font_name, &parsed, &attributes)) {
-		fprintf (stderr, "not a standard name: %s\n", font_name);
-		return 0;
-	}
-
-	attributes &= ~(FontNamePixelSize|FontNameAverageWidth);
-	attributes |= FontNameResolutionX;
-	attributes |= FontNameResolutionY;
-	attributes |= FontNamePointSize;
-	parsed.ResolutionX = resolution;
-	parsed.ResolutionY = resolution;
-	parsed.PointSize = point_size*10;
-	XFormatFontName(&parsed, attributes, name_string);
-
-	names = XListFonts (dpy, name_string, 100000, &count);
-	if (count < 1) {
-		fprintf (stderr, "bad font name: %s\n", font_name);
-		return 0;
-	}
-
-	if (FontNamesAmbiguous(font_name, names, count))
-		return 0;
-
-	XParseFontName(names[0], &parsed, &attributes);
-	sprintf (encoding, "%s-%s", parsed.CharSetRegistry,
-				    parsed.CharSetEncoding);
-	for (s = encoding; *s; s++)
-		if (isupper (*s))
-			*s = tolower (*s);
-	char_map = DviFindMap (encoding);
-	if (!char_map) {
-		fprintf (stderr, "not a standard encoding: %s\n", encoding);
-		return 0;
-	}
-
-	fi = XLoadQueryFont (dpy, names[0]);
-	if (!fi) {
-		fprintf (stderr, "font does not exist: %s\n", names[0]);
-		return 0;
-	}
-		
-	printf ("%s -> %s\n", names[0], troff_name);
-
-	{ /* Avoid race while opening file */
-		int fd;
-		(void) unlink (troff_name);
-		fd = open (troff_name, O_WRONLY | O_CREAT | O_EXCL, 0600);
-		out = fdopen (fd, "w");
-	}
-
-	if (!out) {
-		perror (troff_name);
-		return 0;
-	}
-	fprintf (out, "name %s\n", troff_name);
-	if (!strcmp (char_map->encoding, "adobe-fontspecific"))
-		fprintf (out, "special\n");
-	if (charExists (fi, ' ')) {
-		int w = charWidth (fi, ' ');
-		if (w > 0)
-			fprintf (out, "spacewidth %d\n", w);
-	}
-	fprintf (out, "charset\n");
-	for (c = fi->min_char_or_byte2; c <= fi->max_char_or_byte2; c++) {
-		char *name = DviCharName (char_map,c,0);
-		if (charExists (fi, c) && (groff_flag || name)) {
-
-			wid = charWidth (fi, c);
-
-			fprintf (out, "%s\t%d",
-					name ? name : "---",
-	 				wid);
-			if (groff_flag) {
-				int	param[5];
-				param[0] = charHeight (fi, c);
-				param[1] = charDepth (fi, c);
-				param[2] = 0 /* charRBearing (fi, c) - wid */;
-				param[3] = 0 /* charLBearing (fi, c) */;
-				param[4] = 0; /* XXX */
-				for (j = 0; j < 5; j++)
-					if (param[j] < 0)
-						param[j] = 0;
-				for (j = 4; j >= 0; j--)
-					if (param[j] != 0)
-						break;
-				for (k = 0; k <= j; k++)
-					fprintf (out, ",%d", param[k]);
-			}
-			fprintf (out, "\t0\t0%o\n", c);
-			
-			if (name) {
-				for (k = 1; DviCharName(char_map,c,k); k++) {
-					fprintf (out, "%s\t\"\n",
-						 DviCharName (char_map,c,k));
-				}
-			}
-		}
-	}
-	XUnloadFont (dpy, fi->fid);
-	fclose (out);
-	return 1;
-}
-
-static void
-usage(prog)
-	char	*prog;
-{
-	fprintf (stderr,
-		 "usage: %s [-g] [-r resolution] [-s pointsize] FontMap\n",
-		 prog);
-	exit (1);
-}
-
-
-/* For use by DviChar.c */
-
-char *xmalloc(n)
-int n;
-{
-	char *p = malloc(n);
-	if (!p) {
-		fprintf(stderr, "Out of memory\n");
-		exit(1);
-	}
-	return p;
-}
-
-int
-main (argc, argv)
-	char	**argv;
-{
-	char	troff_name[1024];
-	char	font_name[1024];
-	char	line[1024];
-	char	*a, *b, c;
-	int	position;
-	FILE	*map;
-	int	opt;
-	extern int optind;
-	extern char *optarg;
-
-	while ((opt = getopt(argc, argv, "gr:s:")) != EOF) {
-		switch (opt) {
-		case 'g':
-			groff_flag = 1;
-			break;
-		case 'r':
-			sscanf(optarg, "%u", &resolution);
-			break;
-		case 's':
-			sscanf(optarg, "%u", &point_size);
-			break;
-		default:
-			usage(argv[0]);
-		}
-	}
-	if (argc - optind != 1)
-		usage(argv[0]);
-
-	dpy = XOpenDisplay (0);
-	if (!dpy) {
-		fprintf (stderr, "Can't connect to the X server.\n");
-		fprintf (stderr, "Make sure the DISPLAY environment variable is set correctly.\n");
-		exit (1);
-	}
-        position = 1;
-
-	map = fopen (argv[optind], "r");
-	if (map == NULL) {
-		perror (argv[optind]);
-		exit (1);
-	}
-
-	while (fgets (line, sizeof (line), map)) {
-		for (a=line,b=troff_name; *a; a++,b++) {
-			c = (*b = *a);
-			if (c == ' ' || c == '\t')
-				break;
-		}
-		*b = '\0';
-		while (*a && (*a == ' ' || *a == '\t'))
-			++a;
-		for (b=font_name; *a; a++,b++)
-			if ((*b = *a) == '\n')
-				break;
-		*b = '\0';
-		if (!MapFont (font_name, troff_name))
-			exit (1);
-		++position;
-	}
-	exit (0);
-}
-
-/*
-Local Variables:
-c-indent-level: 8
-c-continued-statement-offset: 8
-c-brace-offset: -8
-c-argdecl-indent: 8
-c-label-offset: -8
-c-tab-always-indent: nil
-End:
-*/
diff --git a/test-groff.in b/test-groff.in
index fc44d252..1941d029 100644
--- a/test-groff.in
+++ b/test-groff.in
@@ -29,11 +29,11 @@ $builddir/devices/grotty$SEP\
 $builddir/devices/grolj4$SEP\
 $builddir/devices/grolbp$SEP\
 $builddir/devices/grohtml$SEP\
-$srcdir/$builddir/xditview
+$builddir/devices/xditview
 
 test -n "$srcdir" || srcdir=.
 
-XENVIRONMENT=`cd $srcdir; pwd`/src/xditview/GXditview.ad
+XENVIRONMENT=`cd $srcdir; pwd`/src/devices/xditview/GXditview.ad
 export XENVIRONMENT
 
 GROFF_COMMAND_PREFIX=