Use docbook2txt to generate the text output instead of adhoc hacks.

configure

@@ -308,7 +308,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 WIN16_FILES WIN16_INSTALL LIBPTHREAD build build_cpu build_vendor build_os host host_cpu host_vendor host_os SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP TOOLSDIR X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS YACC LEX LEXLIB LEX_OUTPUT_ROOT XYACC XLEX AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP WINDRES ac_ct_WINDRES LN_S LN LDCONFIG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LINT LINTFLAGS DB2HTML DB2PDF DB2PS JPEGLIB EGREP GIFLIB XLIB XFILES OPENGLFILES GLU32FILES OPENGL_LIBS NASLIBS CURSESLIBS sane_devel SANELIBS SANEINCL ICULIBS ft_devel ft_devel2 FREETYPEINCL ARTSCCONFIG ARTSLIBS ARTSINCL ALSALIBS AUDIOIOLIBS EXTRACFLAGS DLLEXT DLLFLAGS DLLIBS LDDLLFLAGS LDSHARED LIBEXT IMPLIBEXT DLLTOOL ac_ct_DLLTOOL DLLWRAP ac_ct_DLLWRAP LDEXECFLAGS CROSSTEST CROSSCC CROSSWINDRES LDPATH CRTLIBS LDD ALLOCA LIBOBJS 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 WIN16_FILES WIN16_INSTALL LIBPTHREAD build build_cpu build_vendor build_os host host_cpu host_vendor host_os SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP TOOLSDIR X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS YACC LEX LEXLIB LEX_OUTPUT_ROOT XYACC XLEX AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP WINDRES ac_ct_WINDRES LN_S LN LDCONFIG INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LINT LINTFLAGS DB2HTML DB2PDF DB2PS DB2TXT JPEGLIB EGREP GIFLIB XLIB XFILES OPENGLFILES GLU32FILES OPENGL_LIBS NASLIBS CURSESLIBS sane_devel SANELIBS SANEINCL ICULIBS ft_devel ft_devel2 FREETYPEINCL ARTSCCONFIG ARTSLIBS ARTSINCL ALSALIBS AUDIOIOLIBS EXTRACFLAGS DLLEXT DLLFLAGS DLLIBS LDDLLFLAGS LDSHARED LIBEXT IMPLIBEXT DLLTOOL ac_ct_DLLTOOL DLLWRAP ac_ct_DLLWRAP LDEXECFLAGS CROSSTEST CROSSCC CROSSWINDRES LDPATH CRTLIBS LDD ALLOCA LIBOBJS LTLIBOBJS'
 ac_subst_files='MAKE_RULES MAKE_DLL_RULES MAKE_TEST_RULES MAKE_LIB_RULES MAKE_PROG_RULES'
 
 # Initialize some variables set by options.
@@ -4999,6 +4999,49 @@ test -n "$DB2PS" || DB2PS="false"
 
 
 
+for ac_prog in docbook2txt db2txt
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_DB2TXT+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$DB2TXT"; then
+  ac_cv_prog_DB2TXT="$DB2TXT" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DB2TXT="$ac_prog"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+fi
+fi
+DB2TXT=$ac_cv_prog_DB2TXT
+if test -n "$DB2TXT"; then
+  echo "$as_me:$LINENO: result: $DB2TXT" >&5
+echo "${ECHO_T}$DB2TXT" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$DB2TXT" && break
+done
+test -n "$DB2TXT" || DB2TXT="false"
+
+
+
 
 
 echo "$as_me:$LINENO: checking for sqrt in -lm" >&5
@@ -17697,6 +17740,7 @@ s,@LINTFLAGS@,$LINTFLAGS,;t t
 s,@DB2HTML@,$DB2HTML,;t t
 s,@DB2PDF@,$DB2PDF,;t t
 s,@DB2PS@,$DB2PS,;t t
+s,@DB2TXT@,$DB2TXT,;t t
 s,@JPEGLIB@,$JPEGLIB,;t t
 s,@EGREP@,$EGREP,;t t
 s,@GIFLIB@,$GIFLIB,;t t

configure.ac

@@ -121,6 +121,10 @@ dnl Check for db2ps
 AC_CHECK_PROGS(DB2PS, docbook2ps db2ps, false)
 AC_SUBST(DB2PS)
 
+dnl Check for db2txt
+AC_CHECK_PROGS(DB2TXT, docbook2txt db2txt, false)
+AC_SUBST(DB2TXT)
+
 dnl **** Check for some libraries ****
 
 dnl Check for -lm

documentation/Makefile.in

@@ -6,6 +6,7 @@ MODULE    = none
 DB2HTML   = @DB2HTML@
 DB2PDF    = @DB2PDF@
 DB2PS     = @DB2PS@
+DB2TXT    = @DB2TXT@
 
 EXTRASUBDIRS = samples
 
@@ -61,10 +62,11 @@ all: $(MAN_TARGETS)
 @MAKE_RULES@
 
 everything: $(MAN_TARGETS) doc
-doc: html pdf ps
+doc: html pdf ps txt
 html: $(ALLBOOKS:%=%.html) wine-faq.html
 pdf: $(ALLBOOKS:%=%.pdf)
 ps: $(ALLBOOKS:%=%.ps)
+txt: $(ALLBOOKS:%=%.txt)
 
 .PHONY: everything doc html pdf ps dist
 
@@ -79,13 +81,13 @@ ps: $(ALLBOOKS:%=%.ps)
 .sgml.ps:
 	$(DB2PS) $<
 
-.html.txt:
+.sgml.txt:
-	w3m -dump $< > $@ || ($(RM) $@ && false)
+	$(DB2TXT) $<
 
-wine-devel.pdf wine-devel.ps wine-devel.html: $(WINE_DEVEL_SRCS)
+wine-devel.pdf wine-devel.ps wine-devel.html wine-devel.txt: $(WINE_DEVEL_SRCS)
-wine-user.pdf wine-user.ps wine-user.html: $(WINE_USER_SRCS)
+wine-user.pdf wine-user.ps wine-user.html wine-user.txt: $(WINE_USER_SRCS)
-wine-faq.pdf wine-faq.ps wine-faq.html: $(WINE_FAQ_SRCS)
+wine-faq.pdf wine-faq.ps wine-faq.html wine-faq.txt: $(WINE_FAQ_SRCS)
-winelib-user.pdf winelib-user.ps winelib-user.html: $(WINELIB_USER_SRCS)
+winelib-user.pdf winelib-user.ps winelib-user.html winelib-user.txt: $(WINELIB_USER_SRCS)
 
 wine.man: wine.man.in
 	sed -e 's,@bindir\@,$(bindir),g' -e 's,@dlldir\@,$(dlldir),g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' $(SRCDIR)/wine.man.in >$@ || ($(RM) $@ && false)