From d01ce338f599c0e87ef496690524a4e2e01ac0e5 Mon Sep 17 00:00:00 2001 From: wl Date: Thu, 16 Dec 2004 13:09:54 +0000 Subject: Make `test-groff' work again -- previously, wrong paths have been used. Additionally, it can now be called from anywhere. * test-groff.in: Don't test for groff binary. This is no longer necessary since the proper paths are determined by `configure'. (EXEEXT): Removed. No longer used. (srcdir, builddir): Use values provided by the configure script. (XENVIRONMENT): Updated. * INSTALL: Updated. Make .tag and .taga work for all devices (but only grohtml actually handles them). * src/devices/grohtml/post-html.cpp: s/html-tag/devtag/. (text_glob::is_br, page::add_tag, html_printer::troff_tag, html_printer::handle_assertion): Don't use hard-coded string lengths. (html_printer::lookahead_for_table): Reset `tbl' properly if necessary. (html_printer::devtag): New function, handling `devtag'. (html_printer::special): Don't handle `html-tag'. * src/include/printer.h, src/libs/libdriver/printer.cpp (printer::devtag): New virtual function. * src/libs/libdriver/input.cpp (parse_x_command) <'X'>: Handle `devtag'. * src/roff/troff/env.cpp, src/roff/troff/mtsm.cpp, src/roff/troff/node.cpp: s/html-tag/devtag/. * src/roff/troff/input.cpp (tag, taga): Always call curenv->add_node. * tmac/an-old.tmac, tmac/s.tmac, tmac/troffrc-end: Use DEVTAG* macros instead of HTML-TAG*. * tmac/devtag.tmac: New file, defining the DEVTAG-* macros. * tmac/www.tmac: Load devtag.tmac. Replace HTML-TAG* macros with DEVTAG* macros. (HTML, HTML-NS): Changed definitions. (URL): Use HTML-NS. (HTML-TAG, HTML-TAG-NS, HTML-TAG-NEXT): Removed. * tmac/Makefile.sub (NORMALFILES): Add devtag.tmac. --- test-groff.in | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'test-groff.in') diff --git a/test-groff.in b/test-groff.in index 1941d029..013e1666 100644 --- a/test-groff.in +++ b/test-groff.in @@ -1,17 +1,9 @@ #! /bin/sh # This script runs groff without requiring that it be installed. -# The current directory must be the top build directory. SEP='@PATH_SEPARATOR@' -EXEEXT=@EXEEXT@ -builddir=./src -srcdir=`echo $0 | sed -e 's;/[^/]*$;;'` - -if test ! -d $builddir/roff/groff || \ - test ! -r $builddir/roff/groff/groff$EXEEXT; then - echo $0 must be run with the top build directory as the current directory 2>&1 - exit 1 -fi +builddir=@abs_top_builddir@/src +srcdir=@abs_top_srcdir@ GROFF_BIN_PATH=\ $builddir/roff/groff$SEP\ @@ -31,9 +23,7 @@ $builddir/devices/grolbp$SEP\ $builddir/devices/grohtml$SEP\ $builddir/devices/xditview -test -n "$srcdir" || srcdir=. - -XENVIRONMENT=`cd $srcdir; pwd`/src/devices/xditview/GXditview.ad +XENVIRONMENT=$srcdir/src/devices/xditview/GXditview.ad export XENVIRONMENT GROFF_COMMAND_PREFIX= -- cgit v1.2.1