* aclocal.m4 (GROFF_HTML_PROGRAMS): Add test for pnmtops.

(GROFF_PNMTOPS_NOSETPAGE): New macro.
* configure.ac: Use it.
* configure: Regenerated.
* Makefile.in: Updated.

* tmac/Makefile.sub (NORMALFILES): Remove www.tmac.
(CLEANADD): Add www.tmac-sed.
(pnmtops_nosetpage): Define default.
(install_data): Handle www.tmac-sed and substitute
@PNMTOPS_NOSETPAGE@.
(stamp-sed): Add www.tmac.
* tmac/www.tmac: Rewritten, based on a patch by Bernd Warken.
It now breaks URLs at suitable places.
(www:substring_ok): New register set by...
(www:@test_substring): New macro.
(www:error): New alias to www-error.
(www:lenstr, www:splitstr, www:url_breaks, www:url_breaks_splitted):
New macros.
(URL): Use www:url_breaks.
(PIMG, MPIMG): Use @PNMTOPS_NOSETPAGE@.
(CDS, CDE): New macros.

* src/devices/grops/ps.cc (ps_printer::define_encoding): Avoid
buffer overflow.

1 files changed, 55 insertions, 4 deletions

diff --git a/configure b/configure
index d2f1a912..b90dec19 100755
--- a/configure
+++ b/configure
@@ -305,7 +305,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 groff_top_builddir 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 EGREP LIBM LIBOBJS BROKEN_SPOOLER_FLAGS PAGE g sys_tmac_prefix tmac_wrap pnmcut pnmcrop pnmtopng gs psselect make_html make_install_html 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 groff_top_builddir 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 EGREP LIBM LIBOBJS BROKEN_SPOOLER_FLAGS PAGE g sys_tmac_prefix tmac_wrap pnmcut pnmcrop pnmtopng gs psselect pnmtops make_html make_install_html pnmtops_nosetpage LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -6001,25 +6001,74 @@ else
 echo "${ECHO_T}no" >&6
 fi
 
-case "x$pnmcut$pnmcrop$pnmtopng$gs$psselect" in
+# Extract the first word of "pnmtops", so it can be a program name with args.
+set dummy pnmtops; 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_pnmtops+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$pnmtops"; then
+  ac_cv_prog_pnmtops="$pnmtops" # 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_pnmtops="found"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_prog_pnmtops" && ac_cv_prog_pnmtops="missing"
+fi
+fi
+pnmtops=$ac_cv_prog_pnmtops
+if test -n "$pnmtops"; then
+  echo "$as_me:$LINENO: result: $pnmtops" >&5
+echo "${ECHO_T}$pnmtops" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+case "x$pnmcut$pnmcrop$pnmtopng$gs$psselect$pnmtops$pstopnm" in
 *missing*)
 	make_html=
 	make_install_html=
 	{ echo "$as_me:$LINENO: WARNING:
 
-  Since one or more of the above five programs can't be found in the path,
+  Since one or more of the above six programs can't be found in the path,
   the HTML backend of groff (grohtml) won't work properly.  Consequently,
   no documentation in HTML format is built and installed.
 " >&5
 echo "$as_me: WARNING:
 
-  Since one or more of the above five programs can't be found in the path,
+  Since one or more of the above six programs can't be found in the path,
   the HTML backend of groff (grohtml) won't work properly.  Consequently,
   no documentation in HTML format is built and installed.
 " >&2;} ;;
 esac
 
 
+echo "$as_me:$LINENO: checking whether pnmtops can handle the -nosetpage option" >&5
+echo $ECHO_N "checking whether pnmtops can handle the -nosetpage option... $ECHO_C" >&6
+if echo P1 2 2 0 1 1 0 | pnmtops -nosetpage > /dev/null 2>&1 ; then
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+    pnmtops_nosetpage="pnmtops -nosetpage"
+else
+    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+    pnmtops_nosetpage="pnmtops"
+fi
+
+
           ac_config_files="$ac_config_files stamp-h"
 
                               ac_config_files="$ac_config_files Makefile doc/Makefile src/xditview/Imakefile"
@@ -6656,8 +6705,10 @@ s,@pnmcrop@,$pnmcrop,;t t
 s,@pnmtopng@,$pnmtopng,;t t
 s,@gs@,$gs,;t t
 s,@psselect@,$psselect,;t t
+s,@pnmtops@,$pnmtops,;t t
 s,@make_html@,$make_html,;t t
 s,@make_install_html@,$make_install_html,;t t
+s,@pnmtops_nosetpage@,$pnmtops_nosetpage,;t t
 s,@LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF