From e0c6872cf40896c7be36b11dcc744620f10adf1d Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 2 Sep 2019 13:46:59 +0900 Subject: Initial commit --- obsolete/dviware/tkdvi/ChangeLog-0.1-0.2 | 70 ++ obsolete/dviware/tkdvi/ChangeLog-0.2-0.3 | 198 ++++++ obsolete/dviware/tkdvi/README | 167 +++++ obsolete/dviware/tkdvi/tkdvi-0.1-conf.patch | 863 +++++++++++++++++++++++++ obsolete/dviware/tkdvi/tkdvi-0.3.1-gamma.patch | 261 ++++++++ obsolete/dviware/tkdvi/tkdvi-et99.pdf | Bin 0 -> 127793 bytes obsolete/dviware/tkdvi/tkdvi-etcl2K.pdf | Bin 0 -> 235988 bytes obsolete/dviware/tkdvi/tkdvi_0.2-1.diff.gz | Bin 0 -> 4636 bytes obsolete/dviware/tkdvi/tkdvi_0.2-1.dsc | 22 + 9 files changed, 1581 insertions(+) create mode 100644 obsolete/dviware/tkdvi/ChangeLog-0.1-0.2 create mode 100644 obsolete/dviware/tkdvi/ChangeLog-0.2-0.3 create mode 100644 obsolete/dviware/tkdvi/README create mode 100644 obsolete/dviware/tkdvi/tkdvi-0.1-conf.patch create mode 100644 obsolete/dviware/tkdvi/tkdvi-0.3.1-gamma.patch create mode 100644 obsolete/dviware/tkdvi/tkdvi-et99.pdf create mode 100644 obsolete/dviware/tkdvi/tkdvi-etcl2K.pdf create mode 100644 obsolete/dviware/tkdvi/tkdvi_0.2-1.diff.gz create mode 100644 obsolete/dviware/tkdvi/tkdvi_0.2-1.dsc (limited to 'obsolete/dviware/tkdvi') diff --git a/obsolete/dviware/tkdvi/ChangeLog-0.1-0.2 b/obsolete/dviware/tkdvi/ChangeLog-0.1-0.2 new file mode 100644 index 0000000000..06148bea62 --- /dev/null +++ b/obsolete/dviware/tkdvi/ChangeLog-0.1-0.2 @@ -0,0 +1,70 @@ +1999-06-18 Anselm Lingnau + + * Released version 0.2. + + * lib/browser.tcl, lib/pagesel.tcl: Made sure the current page + is highlighted in the page selector even after a DVI file + reload. + + * dvi/dviFile.c: Fixed reference count bug which resulted in + files not being closed properly when opened multiple times. + + * lib/browser.tcl: Browser monster fix: Made measuring device + appear only in non-overview display modes. Fixed bug relating to + measuring device in scrolled canvas. Added keyboard shortcuts to + switch between display modes. Fixed wrap-around bug in paging + via keyboard and/or page selector arrow buttons where pages + would appear multiple times in non-single display modes. Changed + arrow buttons/keyboard scroll increment to scroll 16 pages in + overview mode. + +1999-06-16 Anselm Lingnau + + * configure.in: Bumped version number to 0.2 in preparation for + release. + + * tkdvi.in: Obtain program version number from configure.in. + +1999-06-15 Anselm Lingnau + + * Fixed segmentation fault during de-allocation of PK fonts, + which was due to uninitialized *charInfoPtr entries. + (dvi/fontPK.c) + + * Fixed bug where fonts would not be changed during a DVI file + reload. Now a DVI file carries a `generation number' which + counts the reloads, and this is checked during the reloading + operation to free and re-read the fonts if necessary. + (dvi/dvi.h, dvi/dviFile.c, dvi/image.c) + +1999-06-13 Anselm Lingnau + + * Prototype virtual font implementation. (touched lots of files + in dvi subdirectory) + +1999-06-14 Anselm Lingnau + + * Fixed error where it would not be possible to `make dist' in + a separate build directory -- the tests and test dvi files + would be looked for below the current directory rather than + $(srcdir). (Makefile.am) + +1999-06-12 Anselm Lingnau + + * Made build environment libtool-free, in favor of the Tcl + build information from tclConfig.sh. (configure.in, + dvi/Makefile.am) + +1999-06-11 Anselm Lingnau + + * Quoted the message in the 4-byte data type #error directive. + Thanks to Oliver Pust for pointing this out. (dvi/dvi.h) + +1999-06-10 Anselm Lingnau + + * Added configuration option `--with-kpathseainc=DIR' and extended + include path guessing conditionals to cope better with teTeX + being installed with differing `prefix' and `exec-prefix'. + Thanks to Jan Braun for helping to debug this. (configure.in, + dvi/Makefile.am, dvi/findFont.c, dvi/init.c) + diff --git a/obsolete/dviware/tkdvi/ChangeLog-0.2-0.3 b/obsolete/dviware/tkdvi/ChangeLog-0.2-0.3 new file mode 100644 index 0000000000..6d4e25ca49 --- /dev/null +++ b/obsolete/dviware/tkdvi/ChangeLog-0.2-0.3 @@ -0,0 +1,198 @@ +2000-07-07 Anselm Lingnau + + * Released version 0.3. + + * doc/tkdvi.1, doc/tkdvi::browser.3tcl: Improved man pages. + + * Makefile.in: Improved man page installation procedure. Got rid + of Makefile in doc/ subdirectory. + + * tkdvi.in: Added `-pr' (present) command line option. Options + which are not specially handled will be passed through to the + initial DVI window. + + * dvi/Makefile.in, lib/Makefile.in: Installation subdirectories + now contain program's version number. + + * Makefile.in, dvi/Makefile.in, lib/Makefile.in: Don't echo + file names when copying stuff to distribution directory. + + * dvi/pkgIndex.tcl.in, dvi/Makefile.in: Fix pkgIndex.tcl so that + library is picked up either from current directory or from + directory above. Make sure that pkgIndex.tcl is created when + library has been built. + + * dvi/configure.in: Make sure configure script looks at tkConfig.sh + as well as tclConfig.sh (which was a stupid oversight). + + * dvi/image.c: Removed spurious initialization of masterPtr->layer + in image instance command. + + * dvi/image.c: Hopefully fixed backward compatibility problems + with image type (esp. createProc) for good. Tk_InitImageArgs() + in Tcl/Tk 8.3.1 is broken. + + * lib/tkdvi.tcl: Fix bug where internal widget counter for name + generation would not be incremented on `clone window'. + + * lib/browser.tcl: Add check for event to quit program + when last DVI window is closed, unless the Tcl variable + tkdvi::browser::lastCloseExits is zero. + + * lib/browser.tcl: Use (patched) tk_optionMenu widget instead of + home-grown button w/menu. + + * lib/browser.tcl: Added `measureUnit' configuration option. + + * lib/browser.tcl: Make sure `-toplevel' option isn't passed to + configure method when widget is created. (This is handled + specially beforehand.) + + * lib/browser.tcl: Reintroduced reload-on-expose and layering. + + * lib/browser.tcl: Fixed bugs around button 3. + + * lib/browser.tcl: Added various key bindings, menu accelerators + and menu traversal keys. + + * lib/tkdvi.ad: Added accelerators and menu traversal keys. + Removed obsolete `Options' menu. + + * lib/menu.tcl: Added support for menu traversal keys and + accelerators. + + * lib/browser.tcl: Made the General Preferences dialog work. + + * lib/browser.tcl: Fixed a focus problem with presentations in + full-screen mode. + + * lib/browser.tcl, lib/tkdvi.tcl: Added support for cloning a + window as well as opening a new file in a new window. + + * lib/browser.tcl: Fixed various small bugs in + tkdvi::browser::Opopen; added option to specify a file name + rather than open a file selector box. + +2000-06-29 Anselm Lingnau + + * dvi/configure.in: Fixed bug in determination of `top_builddir'. + + * dvi/dvi.h, dvi/dviFile.c, dvi/dviCFTcl.c: Added C-level and + Tcl-level APIs for access to DVI file comment. + + * dvi/dviCFTcl.c, dvi/dviFontTcl.c, dvi/dviInterpTcl.c, + dvi/dviTcl.c, dvi/image.c: Added calls to Tcl_InitStubs() and + Tk_InitStubs() as appropriate. + + * dvi/image.c: Fixed Tcl_Obj API for image type as per Jan + Nijtmans' suggestions. + + * dvi/dviFontTcl.c, dvi/font.c, dvi/image.c: Added initial + support for obtaining document font lists. + + * dvi/image.c: Added more paper formats. + + * dvi/image.c: Re-enabled font reloading on document change. + + * lib/browser.tcl: Completely new implementation as a + `megawidget'. Various new features such as free-hand drawing + on top of a DVI page, cross-hair rulers for checking alignment, + initial support for source specials (not quite working yet), + optional menu bar and tool bar, etc. Generally revamped look + and feel to be more like Acrobat Reader rather than gv. + Configuration through X resources is now possible. + + * lib/pagesel.tcl: Completely new implementation as a + `megawidget'. + +2000-05-27 Anselm Lingnau + + * dvi/image.c: Changed image procedures to Tcl_Obj API for + compatibility with Tk 8.3. + + * dvi/dviCFTcl.c: Fixed segmentation fault due to + non-reconstruction of Dvi_Code structure after file reloading. + +2000-05-26 Anselm Lingnau + + * dvi/dviCFTcl.c: Added support for `$dviCode configure', + `$dviCode findanchor' and `$dvicode info anchors'. + + * dvi/dviCode.c: Added support for registering anchors during + pre-scan. + + * dvi/dviFile.c: Fixed bug where `generation' member of Dvi_File + structure would not be initialized. + + * lib/browser.tcl: Finished support for bookmarks and file + information à la PDF. Reinstated reloading code. + +2000-05-18 Anselm Lingnau + + * dvi/dviCFTcl.c, dvi/dviFontTcl.c, dvi/dviInterpTcl.c, + dvi/image.c: Replaced hard-coded version numbers in package + dependencies. + + * dvi/dviFile.c, dvi/dviInterp.c, dvi/font.c, dvi/fontPK.c, + dvi/fontTFM.c: Tightened up datatypes on memory + allocation/deallocation calls to remove compiler warnings. + + * dvi/image.c: Added Tk_ImagePostScriptProc member to DviImageType + for Tcl 8.2 compatibility. + + * Replaced Automake setup by more Tcl-like approach. This + simplifies the make process considerably. + +2000-02-15 Anselm Lingnau + + * dvi/dviOps.h: Changed DVI opcodes from #define to enum. + + * dvi/image.c: Added Tcl command callbacks for moving to/leaving + page (options `-precommand' and `-postcommand'). + + * dvi/image.c: Draft colour support (doesn't work quite right). + + * dvi/image.c: Added configuration option synonyms `-bg', `-fg', + and `-gray' for consistency to other Tk widgets. + + * dvi/image.c: Fixed bitmap shrinking bug. + + * lib/tkdvi.ad: Added menu items for info, bookmarks, and + display modes menu. + +1999-09-01 Anselm Lingnau + + * tkdvi.in: Revised Tcl-level API for DVI browser. + + * dvi/dviFontTcl.c, dvi/dviFont.c: Made generic font searching + code Tcl-independent; put Tcl glue into separate file. + + * dvi/dviFile.c, dvi/dviCode.c, dvi/dviCFTcl.c, dvi/dviInterp.c, + dvi/dviInterpTcl.c: Divided DVI code handling in file-specific + and general code parts. This makes it possible (in theory) to + have DVI code generated on the fly, in addition to separating + the two layers of functionality better. Improved separation + between Tcl-independent DVI file handling and Tcl glue + layer. Revised C-level API for consistency. Introduced callback + function for file errors so dviFile.c functions no longer need a + Tcl interpreter. + + * lib/browser.tcl: Adapted to new Tcl-level API. + + * lib/browser.tcl: Added pop-up-from-overview feature, full-screen + display and more flexible display modes. + + * lib/pagesel.tcl: Adapted to new Tcl-level API. + + * lib/pagesel.tcl: Fixed selector painting bug. + +1999-06-24 Anselm Lingnau + + * dvi/dviInterp.c, dvi/image.c: Revised handling of \special{} + commands. + + * lib/browser.tcl: Added scanning on mouse button 2. + + * lib/browser.tcl: Support for `layered' DVI files. + + * lib/browser.tcl: Added `p' and `n' shortcuts for paging. diff --git a/obsolete/dviware/tkdvi/README b/obsolete/dviware/tkdvi/README new file mode 100644 index 0000000000..112e3ab6a5 --- /dev/null +++ b/obsolete/dviware/tkdvi/README @@ -0,0 +1,167 @@ +TKDVI, A DVI PREVIEWER BASED ON TCL/TK +====================================== + +This is TkDVI, a DVI previewer built with the Tcl/Tk toolkit. The +previewer is built around a Tk extension, `dvi', which implements an +`image type' for displaying pages from DVI files (or DVI code in +general). + +This README file corresponds to TkDVI 0.3, an alpha release. + + +Features +-------- +Here are the basic features of the `dvi' Tk extension: + +* Implements re-usable Tk `image type'. DVI material can occur + wherever Tk allows images, e.g., on a canvas (which is the most + sensible place), but also in labels, buttons etc. +* Supports multiple windows displaying multiple pages from multiple + DVI files simultaneously. +* All DVI files share the same fonts (if resolution etc. allows). +* Supports fonts in PK format. (Virtual font support is forthcoming; + in the meantime dvicopy can be used to de-reference virtual fonts + in DVI files.) The standard Kpathsea library is used to locate + (and make) fonts. +* Supports arbitrary (integer-factor) image shrinking as in xdvi. +* Supports anti-aliasing as in xdvi. +* Supports simple uses of colour. +* Comes with an (incomplete) self-test suite. + +Here are the basic features of the TkDVI previewer: + +* Multiple DVI files. +* Multiple DVI file windows. +* Each DVI file window supports various display modes: + - `Single Page' as in xdvi + - `Two-page spread': Two facing pages, like a book. + - `16-page overview': Sixteen reduced pages at the same time, great + for looking at page breaks and floats. + - Full-screen mode for presentations. +* `Magnification glass' as in xdvi. +* `gv'-style page selector. +* PDF-style document info (experimental). +* PDF-style bookmarks when used with `hyperref' LaTeX extension + (experimental) +* `Layering' of DVI material for presentations, fill-in-the-blanks etc. + (experimental) +* Automatic reload of changed DVI files on Expose events as in xdvi. + This updates all windows that the DVI file is displayed in + (regardless of whether they are currently being exposed or not). +* Can be easily adapted, reconfigured or extended in Tcl. + +The most notable omissions to date are: + +* No support for EPS graphics inclusions. + +As of now there is little or no documentation for most of the +experimental features. Most of the \special commands supported by +TkDVI are explained in doc/README.specials. See the testdvi/ +subdirectory for some examples of TeX input and output. + + +Use and Distribution +-------------------- +TkDVI is copyrighted © by Anselm Lingnau +. + +TkDVI is NOT in the public domain but released as `free software' +under the same license as Tcl/Tk, meaning that you can use it for +whatever you want and also give away (possibly modified) copies to all +your relations, friends, and enemies (depending on how you like the +program). See the file COPYING for details. + +If you do make modifications or extensions of general interest, I +would appreciate hearing about this. I'd be happy to include your +contributions in the general distribution as long as their licensing +doesn't interfere with the rest of the distribution (e.g., I can't +integrate GPL patches into the main code base because that would +`infect' the rest of TkDVI with the GPL -- I'd be happy to include +such patches in a `DIY' corner of the distribution, though.). + +TkDVI uses the Kpathsea library by Karl Berry, which is licensed +unter the LGPL. Due to its size, Kpathsea is not distributed with +TkDVI but can be obtained separately. + + +Documentation and Other Resources +--------------------------------- +There is some documentation in the `doc' subdirectory of the +distribution. As usual, this could be vastly improved. + +TkDVI is available from + + ftp://ftp.tm.informatik.uni-frankfurt.de/pub/dist/tkdvi/ + +The current version is always available as `tkdvi-current.tar.gz', +which is a symbolic link to the real file, which will be called +something like `tkdvi-0.3.tar.gz'. + +There is a World-Wide Web page dedicated to TkDVI at + + http://www.tm.informatik.uni-frankfurt.de/~lingnau/tkdvi/ + +There are two mailing lists about TkDVI: + + tkdvi-announce@tm.informatik.uni-frankfurt.de + + This low-volume mailing list carries announcements of general + interest to TkDVI users, such as announcements of new releases or + significant patches. (This list is moderated by me.) + + tkdvi-users@tm.informatik.uni-frankfurt.de + + This is a mailing list for general discussion about TkDVI, its + use, its advantages and disadvantages, bugs, features etc. + Everybody can post to this list. Traffic from tkdvi-announce + also appears here. + +You can subscribe to either of these lists by sending a message with a +`Subject:' header of `subscribe' to + + tkdvi-announce-request@tm.informatik.uni-frankfurt.de or + tkdvi-users-request@tm.informatik.uni-frankfurt.de , + +respectively. You will be asked to confirm your subscription; just +follow the directions and everything should be fine and dandy. + +Bugs can also be reported to + + tkdvi-bugs@tm.informatik.uni-frankfurt.de + +Users of Debian GNU/Linux may feel free to use the Debian bug tracking +system. + + +Supported Platforms +------------------- +TkDVI has been tested on the following platforms: + + Debian GNU/Linux 2.2 (Tcl/Tk 8.2.3, gcc 2.9) + - Should run on other comparable Linuxes as well + +Success stories, failure reports, patches etc. for other environments +are most welcome. + + +Installation +------------ +Installation is described in the file INSTALL in the same directory. + + +History +------- +I have been working on this program off and on since early 1994, even +to the extent of giving talks on the software at DANTE conferences (in +Münster 1994 and Oldenburg 1998). The 1994 version was based on Tk 3.6 +and implemented a full-blown DVI widget. Some code was released for +this, but it was too incomplete and buggy to be generally useful. +After Tk 4.0 came out, featuring the new image subsystem, I decided to +re-implement my DVI stuff as an image type instead of a widget, in +order to be able to use Tk canvas features in conjunction with DVI +material rather than having to reimplement the canvas from scratch for +the purposes of the DVI widget. Due to other distractions, I didn't +have much time for this but finished a working version in time for the +DANTE conference in February 1998. Since then, the code has matured +somewhat, and the current code base seems solid enough to release as +an alpha version. diff --git a/obsolete/dviware/tkdvi/tkdvi-0.1-conf.patch b/obsolete/dviware/tkdvi/tkdvi-0.1-conf.patch new file mode 100644 index 0000000000..2dee93e653 --- /dev/null +++ b/obsolete/dviware/tkdvi/tkdvi-0.1-conf.patch @@ -0,0 +1,863 @@ +Index: configure.in +=================================================================== +RCS file: /usr/local/cvsroot/tkdvi/configure.in,v +retrieving revision 1.1.1.1 +retrieving revision 1.3 +diff -u -r1.1.1.1 -r1.3 +--- configure.in 1999/06/10 12:36:50 1.1.1.1 ++++ configure.in 1999/06/10 17:05:15 1.3 +@@ -1,4 +1,6 @@ ++dnl Configure.in script for TkDVI. + dnl Process this file with autoconf to produce a configure script. ++dnl $Id: configure.in,v 1.3 1999/06/10 17:05:15 lingnau Exp $ + AC_INIT(dvi/dviInt.h) + AM_INIT_AUTOMAKE(tkdvi, 0.1) + +@@ -114,17 +116,25 @@ + AC_MSG_RESULT(Using kpathsea library in $kpathsea_libdir) + AC_SUBST(kpathsea_libdir) + ++kpathsea_includedir=/usr/include ++AC_ARG_WITH(kpathseainc, ++ [ --with-kpathseainc=DIR 'kpathsea/proginit.h' is in DIR], ++ kpathsea_includedir=$withval) + AC_MSG_CHECKING(for Kpathsea include files) +-if test -f /usr/include/kpathsea/proginit.h; then +- kpathsea_includedir=/usr/include/kpathsea ++if test -f $kpathsea_includedir/kpathsea/proginit.h; then ++ true # all's well in the world ++elif test -f /usr/include/kpathsea/proginit.h; then ++ kpathsea_includedir=/usr/include + elif test -f $kpathsea_libdir/../kpathsea/proginit.h; then +- kpathsea_includedir=`cd $kpathsea_libdir/../kpathsea; pwd` ++ kpathsea_includedir=`cd $kpathsea_libdir/..; pwd` + elif test -f $kpathsea_libdir/../../kpathsea/proginit.h; then +- kpathsea_includedir=`cd $kpathsea_libdir/../../kpathsea; pwd` ++ kpathsea_includedir=`cd $kpathsea_libdir/../..; pwd` + elif test -f $kpathsea_libdir/../include/kpathsea/proginit.h; then +- kpathsea_includedir=`cd $kpathsea_libdir/../include/kpathsea; pwd` ++ kpathsea_includedir=`cd $kpathsea_libdir/../include; pwd` ++elif test -f $kpathsea_libdir/../../include/kpathsea/proginit.h; then ++ kpathsea_includedir=`cd $kpathsea_libdir/../../include; pwd` + fi +-if test ! -f $kpathsea_includedir/proginit.h; then ++if test ! -f $kpathsea_includedir/kpathsea/proginit.h; then + AC_MSG_ERROR(Couldn't find Kpathsea include files) + fi + AC_MSG_RESULT(in $kpathsea_includedir) +Index: dvi/Makefile.am +=================================================================== +RCS file: /usr/local/cvsroot/tkdvi/dvi/Makefile.am,v +retrieving revision 1.1.1.1 +retrieving revision 1.3 +diff -u -r1.1.1.1 -r1.3 +--- dvi/Makefile.am 1999/06/10 12:36:50 1.1.1.1 ++++ dvi/Makefile.am 1999/06/10 17:31:33 1.3 +@@ -3,7 +3,7 @@ + # Makefile for `dvi' subdirectory of TkDVI. + # Copyright © 1999 Anselm Lingnau . + # See file COPYING for conditions on use and distribution. +-# $Id: Makefile.am,v 1.1.1.1 1999/06/10 12:36:50 lingnau Exp $ ++# $Id: Makefile.am,v 1.3 1999/06/10 17:31:33 lingnau Exp $ + + AUTOMAKE_OPTIONS = foreign + +@@ -24,7 +24,8 @@ + fontPK.c fontTFM.c init.c misc.c image.c + libdvi_la_LIBADD = -lkpathsea + +-INCLUDES = -I$(kpathsea_includedir) -I$(tcl_includedir) -I$(tk_includedir) ++INCLUDES = -I$(kpathsea_includedir) -I$(kpathsea_includedir)/kpathsea \ ++ -I$(tcl_includedir) -I$(tk_includedir) + + # We need to use wish here because otherwise the Tk symbols in the + # extension cannot be resolved. +Index: dvi/findFont.c +=================================================================== +RCS file: /usr/local/cvsroot/tkdvi/dvi/findFont.c,v +retrieving revision 1.1.1.1 +retrieving revision 1.2 +diff -u -r1.1.1.1 -r1.2 +--- dvi/findFont.c 1999/06/10 12:36:50 1.1.1.1 ++++ dvi/findFont.c 1999/06/10 17:05:36 1.2 +@@ -10,14 +10,14 @@ + #define WITH_KPATHSEA 1 + #if WITH_KPATHSEA + #include /* for FILE */ +-#include "proginit.h" +-#include "tex-glyph.h" ++#include "kpathsea/proginit.h" ++#include "kpathsea/tex-glyph.h" + #endif + + #include "dviInt.h" + + #ifndef lint +-static char rcsid[] VAR_UNUSED = "$Id: findFont.c,v 1.1.1.1 1999/06/10 12:36:50 lingnau Exp $"; ++static char rcsid[] VAR_UNUSED = "$Id: findFont.c,v 1.2 1999/06/10 17:05:36 lingnau Exp $"; + #endif /* lint */ + + int dvi_tfm_files_only = 0; +Index: dvi/init.c +=================================================================== +RCS file: /usr/local/cvsroot/tkdvi/dvi/init.c,v +retrieving revision 1.1.1.1 +retrieving revision 1.2 +diff -u -r1.1.1.1 -r1.2 +--- dvi/init.c 1999/06/10 12:36:50 1.1.1.1 ++++ dvi/init.c 1999/06/10 17:05:37 1.2 +@@ -12,11 +12,11 @@ + */ + + #include +-#include "kpathsea.h" ++#include "kpathsea/kpathsea.h" + #include "dviInt.h" + + #ifndef lint +-static char rcsid[] VAR_UNUSED = "$Id: init.c,v 1.1.1.1 1999/06/10 12:36:50 lingnau Exp $"; ++static char rcsid[] VAR_UNUSED = "$Id: init.c,v 1.2 1999/06/10 17:05:37 lingnau Exp $"; + #endif /* lint */ + + typedef struct DviFileCookie { +--- configure.old Thu Jun 10 14:36:50 1999 ++++ configure Thu Jun 10 19:18:35 1999 +@@ -28,6 +28,8 @@ + ac_help="$ac_help + --with-kpathsea=DIR use kpathsearch from DIR" + ac_help="$ac_help ++ --with-kpathseainc=DIR 'kpathsea/proginit.h' is in DIR" ++ac_help="$ac_help + --enable-debug enable debugging and regression tests" + + # Initialize some variables set by options. +@@ -570,7 +572,7 @@ + # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" + # ./install, which can be erroneously created by make from ./install.sh. + echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 +-echo "configure:574: checking for a BSD compatible install" >&5 ++echo "configure:576: checking for a BSD compatible install" >&5 + if test -z "$INSTALL"; then + if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -623,7 +625,7 @@ + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + + echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 +-echo "configure:627: checking whether build environment is sane" >&5 ++echo "configure:629: checking whether build environment is sane" >&5 + # Just in case + sleep 1 + echo timestamp > conftestfile +@@ -680,7 +682,7 @@ + test "$program_transform_name" = "" && program_transform_name="s,x,x," + + echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 +-echo "configure:684: checking whether ${MAKE-make} sets \${MAKE}" >&5 ++echo "configure:686: checking whether ${MAKE-make} sets \${MAKE}" >&5 + set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -726,7 +728,7 @@ + + missing_dir=`cd $ac_aux_dir && pwd` + echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 +-echo "configure:730: checking for working aclocal" >&5 ++echo "configure:732: checking for working aclocal" >&5 + # Run test in a subshell; some versions of sh will print an error if + # an executable is not found, even if stderr is redirected. + # Redirect stdin to placate older versions of autoconf. Sigh. +@@ -739,7 +741,7 @@ + fi + + echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 +-echo "configure:743: checking for working autoconf" >&5 ++echo "configure:745: checking for working autoconf" >&5 + # Run test in a subshell; some versions of sh will print an error if + # an executable is not found, even if stderr is redirected. + # Redirect stdin to placate older versions of autoconf. Sigh. +@@ -752,7 +754,7 @@ + fi + + echo $ac_n "checking for working automake""... $ac_c" 1>&6 +-echo "configure:756: checking for working automake" >&5 ++echo "configure:758: checking for working automake" >&5 + # Run test in a subshell; some versions of sh will print an error if + # an executable is not found, even if stderr is redirected. + # Redirect stdin to placate older versions of autoconf. Sigh. +@@ -765,7 +767,7 @@ + fi + + echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 +-echo "configure:769: checking for working autoheader" >&5 ++echo "configure:771: checking for working autoheader" >&5 + # Run test in a subshell; some versions of sh will print an error if + # an executable is not found, even if stderr is redirected. + # Redirect stdin to placate older versions of autoconf. Sigh. +@@ -778,7 +780,7 @@ + fi + + echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 +-echo "configure:782: checking for working makeinfo" >&5 ++echo "configure:784: checking for working makeinfo" >&5 + # Run test in a subshell; some versions of sh will print an error if + # an executable is not found, even if stderr is redirected. + # Redirect stdin to placate older versions of autoconf. Sigh. +@@ -845,7 +847,7 @@ + fi + + echo $ac_n "checking host system type""... $ac_c" 1>&6 +-echo "configure:849: checking host system type" >&5 ++echo "configure:851: checking host system type" >&5 + + host_alias=$host + case "$host_alias" in +@@ -868,7 +870,7 @@ + # Extract the first word of "ranlib", so it can be a program name with args. + set dummy ranlib; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:872: checking for $ac_word" >&5 ++echo "configure:874: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -898,7 +900,7 @@ + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:902: checking for $ac_word" >&5 ++echo "configure:904: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -928,7 +930,7 @@ + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:932: checking for $ac_word" >&5 ++echo "configure:934: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -979,7 +981,7 @@ + # Extract the first word of "cl", so it can be a program name with args. + set dummy cl; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:983: checking for $ac_word" >&5 ++echo "configure:985: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1011,7 +1013,7 @@ + fi + + echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:1015: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ++echo "configure:1017: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 + + ac_ext=c + # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +@@ -1022,12 +1024,12 @@ + + cat > conftest.$ac_ext << EOF + +-#line 1026 "configure" ++#line 1028 "configure" + #include "confdefs.h" + + main(){return(0);} + EOF +-if { (eval echo configure:1031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>/dev/null; then +@@ -1053,12 +1055,12 @@ + { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } + fi + echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +-echo "configure:1057: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:1059: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 + echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 + cross_compiling=$ac_cv_prog_cc_cross + + echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 +-echo "configure:1062: checking whether we are using GNU C" >&5 ++echo "configure:1064: checking whether we are using GNU C" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1067,7 +1069,7 @@ + yes; + #endif + EOF +-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1071: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1073: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gcc=yes + else + ac_cv_prog_gcc=no +@@ -1086,7 +1088,7 @@ + ac_save_CFLAGS="$CFLAGS" + CFLAGS= + echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +-echo "configure:1090: checking whether ${CC-cc} accepts -g" >&5 ++echo "configure:1092: checking whether ${CC-cc} accepts -g" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1130,7 +1132,7 @@ + if test "$ac_cv_prog_gcc" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 +-echo "configure:1134: checking for ld used by GCC" >&5 ++echo "configure:1136: checking for ld used by GCC" >&5 + ac_prog=`($CC -print-prog-name=ld) 2>&5` + case "$ac_prog" in + # Accept absolute paths. +@@ -1148,10 +1150,10 @@ + esac + elif test "$with_gnu_ld" = yes; then + echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 +-echo "configure:1152: checking for GNU ld" >&5 ++echo "configure:1154: checking for GNU ld" >&5 + else + echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 +-echo "configure:1155: checking for non-GNU ld" >&5 ++echo "configure:1157: checking for non-GNU ld" >&5 + fi + if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1187,7 +1189,7 @@ + test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } + + echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 +-echo "configure:1191: checking if the linker ($LD) is GNU ld" >&5 ++echo "configure:1193: checking if the linker ($LD) is GNU ld" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1203,7 +1205,7 @@ + + + echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 +-echo "configure:1207: checking for BSD-compatible nm" >&5 ++echo "configure:1209: checking for BSD-compatible nm" >&5 + if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1240,7 +1242,7 @@ + + + echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 +-echo "configure:1244: checking whether ln -s works" >&5 ++echo "configure:1246: checking whether ln -s works" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1276,8 +1278,8 @@ + case "$host" in + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 1280 "configure"' > conftest.$ac_ext +- if { (eval echo configure:1281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ echo '#line 1282 "configure"' > conftest.$ac_ext ++ if { (eval echo configure:1283: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + case "`/usr/bin/file conftest.o`" in + *32-bit*) + LD="${LD-ld} -32" +@@ -1318,7 +1320,7 @@ + # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" + # ./install, which can be erroneously created by make from ./install.sh. + echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 +-echo "configure:1322: checking for a BSD compatible install" >&5 ++echo "configure:1324: checking for a BSD compatible install" >&5 + if test -z "$INSTALL"; then + if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1371,7 +1373,7 @@ + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + + echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 +-echo "configure:1375: checking whether ${MAKE-make} sets \${MAKE}" >&5 ++echo "configure:1377: checking whether ${MAKE-make} sets \${MAKE}" >&5 + set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -1399,12 +1401,12 @@ + + + echo $ac_n "checking for labs""... $ac_c" 1>&6 +-echo "configure:1403: checking for labs" >&5 ++echo "configure:1405: checking for labs" >&5 + if eval "test \"`echo '$''{'ac_cv_func_labs'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:1433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_labs=yes" + else +@@ -1464,7 +1466,7 @@ + + + echo $ac_n "checking Tcl include file""... $ac_c" 1>&6 +-echo "configure:1468: checking Tcl include file" >&5 ++echo "configure:1470: checking Tcl include file" >&5 + tcl_includedir= + for ac_dir in $includedir $oldincludedir \ + $tcl_libdir $tcl_libdir/.. $tcl_libdir/../..; do +@@ -1492,7 +1494,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1496: checking for $ac_word" >&5 ++echo "configure:1498: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_TCLSH'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1552,7 +1554,7 @@ + + + echo $ac_n "checking Tk include file""... $ac_c" 1>&6 +-echo "configure:1556: checking Tk include file" >&5 ++echo "configure:1558: checking Tk include file" >&5 + tk_includedir= + for ac_dir in $includedir $oldincludedir \ + $tk_libdir $tk_libdir/.. $tk_libdir/../..; do +@@ -1583,7 +1585,7 @@ + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:1587: checking for $ac_word" >&5 ++echo "configure:1589: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_WISH'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1648,18 +1650,29 @@ + echo "$ac_t""Using kpathsea library in $kpathsea_libdir" 1>&6 + + ++kpathsea_includedir=/usr/include ++# Check whether --with-kpathseainc or --without-kpathseainc was given. ++if test "${with_kpathseainc+set}" = set; then ++ withval="$with_kpathseainc" ++ kpathsea_includedir=$withval ++fi ++ + echo $ac_n "checking for Kpathsea include files""... $ac_c" 1>&6 +-echo "configure:1653: checking for Kpathsea include files" >&5 +-if test -f /usr/include/kpathsea/proginit.h; then +- kpathsea_includedir=/usr/include/kpathsea ++echo "configure:1662: checking for Kpathsea include files" >&5 ++if test -f $kpathsea_includedir/kpathsea/proginit.h; then ++ true # all's well in the world ++elif test -f /usr/include/kpathsea/proginit.h; then ++ kpathsea_includedir=/usr/include + elif test -f $kpathsea_libdir/../kpathsea/proginit.h; then +- kpathsea_includedir=`cd $kpathsea_libdir/../kpathsea; pwd` ++ kpathsea_includedir=`cd $kpathsea_libdir/..; pwd` + elif test -f $kpathsea_libdir/../../kpathsea/proginit.h; then +- kpathsea_includedir=`cd $kpathsea_libdir/../../kpathsea; pwd` ++ kpathsea_includedir=`cd $kpathsea_libdir/../..; pwd` + elif test -f $kpathsea_libdir/../include/kpathsea/proginit.h; then +- kpathsea_includedir=`cd $kpathsea_libdir/../include/kpathsea; pwd` ++ kpathsea_includedir=`cd $kpathsea_libdir/../include; pwd` ++elif test -f $kpathsea_libdir/../../include/kpathsea/proginit.h; then ++ kpathsea_includedir=`cd $kpathsea_libdir/../../include; pwd` + fi +-if test ! -f $kpathsea_includedir/proginit.h; then ++if test ! -f $kpathsea_includedir/kpathsea/proginit.h; then + { echo "configure: error: Couldn't find Kpathsea include files" 1>&2; exit 1; } + fi + echo "$ac_t""in $kpathsea_includedir" 1>&6 +@@ -1681,7 +1694,7 @@ + + + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +-echo "configure:1685: checking how to run the C preprocessor" >&5 ++echo "configure:1698: checking how to run the C preprocessor" >&5 + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= +@@ -1696,13 +1709,13 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. + cat > conftest.$ac_ext < + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:1706: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:1719: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -1713,13 +1726,13 @@ + rm -rf conftest* + CPP="${CC-cc} -E -traditional-cpp" + cat > conftest.$ac_ext < + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:1723: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:1736: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -1730,13 +1743,13 @@ + rm -rf conftest* + CPP="${CC-cc} -nologo -E" + cat > conftest.$ac_ext < + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:1740: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:1753: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + : +@@ -1761,12 +1774,12 @@ + echo "$ac_t""$CPP" 1>&6 + + echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 +-echo "configure:1765: checking for ANSI C header files" >&5 ++echo "configure:1778: checking for ANSI C header files" >&5 + if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -1774,7 +1787,7 @@ + #include + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:1778: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:1791: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -1791,7 +1804,7 @@ + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat > conftest.$ac_ext < + EOF +@@ -1809,7 +1822,7 @@ + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat > conftest.$ac_ext < + EOF +@@ -1830,7 +1843,7 @@ + : + else + cat > conftest.$ac_ext < + #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +@@ -1841,7 +1854,7 @@ + exit (0); } + + EOF +-if { (eval echo configure:1845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:1858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -1868,17 +1881,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:1872: checking for $ac_hdr" >&5 ++echo "configure:1885: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:1882: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:1895: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -1906,12 +1919,12 @@ + + + echo $ac_n "checking for working const""... $ac_c" 1>&6 +-echo "configure:1910: checking for working const" >&5 ++echo "configure:1923: checking for working const" >&5 + if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:1977: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_c_const=yes + else +@@ -1981,12 +1994,12 @@ + fi + + echo $ac_n "checking for off_t""... $ac_c" 1>&6 +-echo "configure:1985: checking for off_t" >&5 ++echo "configure:1998: checking for off_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #if STDC_HEADERS +@@ -2014,12 +2027,12 @@ + fi + + echo $ac_n "checking for size_t""... $ac_c" 1>&6 +-echo "configure:2018: checking for size_t" >&5 ++echo "configure:2031: checking for size_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #if STDC_HEADERS +@@ -2047,12 +2060,12 @@ + fi + + echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6 +-echo "configure:2051: checking whether stat file-mode macros are broken" >&5 ++echo "configure:2064: checking whether stat file-mode macros are broken" >&5 + if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + #include +@@ -2103,7 +2116,7 @@ + fi + + echo $ac_n "checking size of int""... $ac_c" 1>&6 +-echo "configure:2107: checking size of int" >&5 ++echo "configure:2120: checking size of int" >&5 + if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2111,7 +2124,7 @@ + ac_cv_sizeof_int=4 + else + cat > conftest.$ac_ext < + main() +@@ -2122,7 +2135,7 @@ + exit(0); + } + EOF +-if { (eval echo configure:2126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:2139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_sizeof_int=`cat conftestval` + else +@@ -2142,7 +2155,7 @@ + + + echo $ac_n "checking size of long""... $ac_c" 1>&6 +-echo "configure:2146: checking size of long" >&5 ++echo "configure:2159: checking size of long" >&5 + if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2150,7 +2163,7 @@ + ac_cv_sizeof_long=4 + else + cat > conftest.$ac_ext < + main() +@@ -2161,7 +2174,7 @@ + exit(0); + } + EOF +-if { (eval echo configure:2165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:2178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_sizeof_long=`cat conftestval` + else +@@ -2183,12 +2196,12 @@ + + + echo $ac_n "checking for working attribute""... $ac_c" 1>&6 +-echo "configure:2187: checking for working attribute" >&5 ++echo "configure:2200: checking for working attribute" >&5 + if eval "test \"`echo '$''{'ac_cv_c_attribute'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:2214: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_c_attribute=yes + else +@@ -2222,17 +2235,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:2226: checking for $ac_hdr" >&5 ++echo "configure:2239: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:2236: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2249: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` + if test -z "$ac_err"; then + rm -rf conftest* +@@ -2261,12 +2274,12 @@ + for ac_func in getpagesize + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:2265: checking for $ac_func" >&5 ++echo "configure:2278: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else +@@ -2314,7 +2327,7 @@ + done + + echo $ac_n "checking for working mmap""... $ac_c" 1>&6 +-echo "configure:2318: checking for working mmap" >&5 ++echo "configure:2331: checking for working mmap" >&5 + if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -2322,7 +2335,7 @@ + ac_cv_func_mmap_fixed_mapped=no + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:2479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_func_mmap_fixed_mapped=yes + else +@@ -2487,12 +2500,12 @@ + for ac_func in strtol strtoul + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:2491: checking for $ac_func" >&5 ++echo "configure:2504: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else diff --git a/obsolete/dviware/tkdvi/tkdvi-0.3.1-gamma.patch b/obsolete/dviware/tkdvi/tkdvi-0.3.1-gamma.patch new file mode 100644 index 0000000000..4eb495235a --- /dev/null +++ b/obsolete/dviware/tkdvi/tkdvi-0.3.1-gamma.patch @@ -0,0 +1,261 @@ +Index: dvi/dvi.h +=================================================================== +RCS file: /usr/local/cvsroot/tkdvi/dvi/dvi.h,v +retrieving revision 1.7 +diff -u -r1.7 dvi.h +--- dvi/dvi.h 2000/06/29 10:54:42 1.7 ++++ dvi/dvi.h 2000/07/14 10:21:47 +@@ -228,18 +228,24 @@ + S32 *tfmWidthPtr, + S32 *pixelWidthPtr)); + typedef int (Dvi_FontCloseProc) _ANSI_ARGS_((struct Dvi_Font *dviFont)); ++typedef int (Dvi_FontIterateCallbackProc) ++ _ANSI_ARGS_((struct Dvi_Font *dviFont, S32 i, Dvi_Glyph *glyphPtr)); ++typedef int (Dvi_FontIterateProc) _ANSI_ARGS_((struct Dvi_Font *dviFont, ++ Dvi_FontIterateCallbackProc *)); + + typedef struct Dvi_FontTypeDesc { + char *name; + Dvi_FontLoadProc *loadProc; + Dvi_FontGlyphProc *glyphProc; + Dvi_FontCloseProc *closeProc; ++ Dvi_FontIterateProc *iterateProc; + } Dvi_FontTypeDesc; + + EXTERN int Dvi_CreateFontType _ANSI_ARGS_((Dvi_FontType type, char *name, + Dvi_FontLoadProc *loadProc, + Dvi_FontGlyphProc *glyphProc, +- Dvi_FontCloseProc *closeProc)); ++ Dvi_FontCloseProc *closeProc, ++ Dvi_FontIterateProc *iterateProc)); + EXTERN int Dvi_CreateFontType_PK _ANSI_ARGS_((void)); + EXTERN int Dvi_CreateFontType_VF _ANSI_ARGS_((void)); + EXTERN int Dvi_CreateFontType_TFM _ANSI_ARGS_((void)); +@@ -282,6 +288,8 @@ + S32 character, + S32 *tfmWidthPtr, + S32 *pixelWidthPtr)); ++EXTERN int Dvi_FontIterate _ANSI_ARGS_((Dvi_FontIterateCallbackProc *)); ++ + #ifdef DVI_DEBUG + EXTERN Tcl_Obj * Dvi_FontDump _ANSI_ARGS_((Tcl_Interp *interp, + Dvi_Font *dviFont)); +Index: dvi/font.c +=================================================================== +RCS file: /usr/local/cvsroot/tkdvi/dvi/font.c,v +retrieving revision 1.4 +diff -u -r1.4 font.c +--- dvi/font.c 2000/06/29 11:01:38 1.4 ++++ dvi/font.c 2000/07/14 10:21:47 +@@ -57,17 +57,20 @@ + */ + + int +-Dvi_CreateFontType (type, name, loadProc, glyphProc, closeProc) ++Dvi_CreateFontType (type, name, loadProc, glyphProc, closeProc, ++ iterateProc) + Dvi_FontType type; + char *name; + Dvi_FontLoadProc *loadProc; + Dvi_FontGlyphProc *glyphProc; + Dvi_FontCloseProc *closeProc; ++ Dvi_FontIterateProc *iterateProc; + { + fontTypes[type].name = name; + fontTypes[type].loadProc = loadProc; + fontTypes[type].glyphProc = glyphProc; + fontTypes[type].closeProc = closeProc; ++ fontTypes[type].iterateProc = iterateProc; + fontTypeCount++; + + return TCL_OK; +@@ -405,6 +408,26 @@ + fontHeadPtr = headPtr; + + return headPtr; ++} ++ ++int ++Dvi_FontIterate(callbackProc) ++ Dvi_FontIterateCallbackProc *callbackProc; ++{ ++ FontHead *headPtr; ++ Dvi_Font *fontPtr; ++ ++ for (headPtr = fontHeadPtr; headPtr != 0; headPtr = headPtr->nextPtr) { ++ for (fontPtr = headPtr->fonts; fontPtr; fontPtr = fontPtr->nextPtr) { ++ Dvi_FontIterateProc *iterateProc ++ = fontTypes[fontPtr->type].iterateProc; ++ ++ if (iterateProc != 0) { ++ (* iterateProc)(fontPtr, callbackProc); ++ } ++ } ++ } ++ return 1; + } + + /* +Index: dvi/fontPK.c +=================================================================== +RCS file: /usr/local/cvsroot/tkdvi/dvi/fontPK.c,v +retrieving revision 1.3 +diff -u -r1.3 fontPK.c +--- dvi/fontPK.c 2000/05/18 12:50:32 1.3 ++++ dvi/fontPK.c 2000/07/14 10:21:47 +@@ -62,6 +62,8 @@ + static Dvi_Glyph *PkRunCount _ANSI_ARGS_((U8 *codePtr)); + + static int PkClose _ANSI_ARGS_((Dvi_Font *dviFont)); ++static int PkIterate _ANSI_ARGS_((Dvi_Font *dviFont, ++ Dvi_FontIterateCallbackProc *callbackProc)); + + /* + * ------------------------------------------------------------------------ +@@ -83,7 +85,8 @@ + int + Dvi_CreateFontType_PK () + { +- return Dvi_CreateFontType(dvi_font_pk, "pk", PkLoad, PkGlyph, PkClose); ++ return Dvi_CreateFontType(dvi_font_pk, "pk", PkLoad, PkGlyph, PkClose, ++ PkIterate); + } + + static int +@@ -622,4 +625,27 @@ + } + ckfree((char *)charInfoPtr); + return TCL_OK; ++} ++ ++static int ++PkIterate(dviFont, callback) ++ Dvi_Font *dviFont; ++ Dvi_FontIterateCallbackProc callback; ++{ ++ PkInfo *infoPtr = (PkInfo *)dviFont->fontData; ++ PkCharInfo *charInfoPtr; ++ S32 i; ++ ++ if (infoPtr == (PkInfo *)0) { ++ return 0; ++ } ++ ++ charInfoPtr = infoPtr->charInfoPtr; ++ for (i = infoPtr->minChar; i <= infoPtr->maxChar; i++) { ++ if (charInfoPtr[i - infoPtr->minChar].glyphPtr) { ++ (* callback)(dviFont, i, ++ charInfoPtr[i - infoPtr->minChar].glyphPtr); ++ } ++ } ++ return 1; + } +Index: dvi/image.c +=================================================================== +RCS file: /usr/local/cvsroot/tkdvi/dvi/image.c,v +retrieving revision 1.12 +diff -u -r1.12 image.c +--- dvi/image.c 2000/07/07 08:00:36 1.12 ++++ dvi/image.c 2000/07/14 10:21:47 +@@ -263,6 +263,8 @@ + static int RenderFontDef _ANSI_ARGS_((ClientData, Dvi_Interp *, + Dvi_FontList **, S32, U32, U32, + U32, size_t, char *, Dvi_FontDefMode)); ++ ++static int ReleaseShrunkenGlyph _ANSI_ARGS_((Dvi_Font *, S32, Dvi_Glyph *)); + + /* + * This is a fixed version of the Tk_InitImageArgs function from the +@@ -768,6 +770,17 @@ + return TCL_OK; + } + ++static int ++ReleaseShrunkenGlyph (junk0, junk1, glyphPtr) ++ Dvi_Font *junk0; ++ S32 junk1; ++ Dvi_Glyph *glyphPtr; ++{ ++ XDestroyImage((XImage *)(glyphPtr->shrinkGlyphPtr)); ++ glyphPtr->shrinkGlyphPtr = 0; ++ glyphPtr->shrink = 0; ++} ++ + static ColorContext * + FindColorContext (instancePtr, fgUid, bgUid) + DviInstance *instancePtr; +@@ -837,6 +850,8 @@ + + colorContextPtr->nextPtr = instancePtr->colorCachePtr; + instancePtr->colorCachePtr = colorContextPtr; ++ ++ Dvi_FontIterate(ReleaseShrunkenGlyph); + + return colorContextPtr; + } +Index: lib/browser.tcl +=================================================================== +RCS file: /usr/local/cvsroot/tkdvi/lib/browser.tcl,v +retrieving revision 1.12 +diff -u -r1.12 browser.tcl +--- lib/browser.tcl 2000/07/07 09:02:32 1.12 ++++ lib/browser.tcl 2000/07/14 10:21:47 +@@ -31,6 +31,7 @@ + measureunit {MeasureUnit cm} + sourcespecials {SourceSpecials 0} + freehandcolor {FreehandColor red} ++ gamma {Gamma 1.2} + } + + foreach {option cv} [array get Options] { +@@ -59,7 +60,10 @@ + [namespace code [list Images $name -1]] + trace variable Configure($name-shrink) w \ + [namespace code [list Images $name -1]] +- ++ ++ trace variable Configure($name-gamma) w \ ++ [namespace code [list Images $name -1]] ++ + trace variable Configure($name-titleformat) w \ + [namespace code [list TitleFormat $name]] + +@@ -378,6 +382,7 @@ + + set State($name-$key,i) [::image create dvi -file $State($name-code) \ + -shrink $shrink -size $Configure($name-size) \ ++ -gamma $Configure($name-gamma) \ + -specialcommand \ + [namespace code [list SpecialCmd $name $key %x %y %c %s]] \ + -precommand [namespace code [list PreCmd $name $key %p]] \ +@@ -1283,6 +1288,7 @@ + + set Dialog($name-defaultmode) [option get $name mode Mode] + set Dialog($name-measureunit) $Configure($name-measureunit) ++ set Dialog($name-gamma) $Configure($name-gamma) + + label $p.layout-l -text {Default Display Mode: } -anchor e + eval OptionMenu $p.layout-m \ +@@ -1298,6 +1304,14 @@ + grid $p.unit-m -row $row -column 1 -sticky we -padx 2 -pady 2 + incr row + ++ label $p.gamma-l -text {Gamma value:} -anchor e ++ scale $p.gamma-s -orient horizontal -length 80 -resolution 0.1 \ ++ -showvalue true -from 0 -to 5 -tickinterval 0 \ ++ -variable tkdvi::browser::Dialog($name-gamma) ++ grid $p.gamma-l -row $row -column 0 -sticky e -ipadx 5 -ipady 5 ++ grid $p.gamma-s -row $row -column 1 -sticky we -padx 2 -pady 2 ++ incr row ++ + frame $p.sep -relief sunken -borderwidth 1 -height 2 + grid $p.sep -row $row -column 0 -columnspan 2 -sticky we + incr row +@@ -1319,6 +1333,7 @@ + variable Dialog + + set Configure($name-measureunit) $Dialog($name-measureunit) ++ set Configure($name-gamma) $Dialog($name-gamma) + option add *TkDVIBrowser.mode $Dialog($name-defaultmode) interactive + + if {$quit} { diff --git a/obsolete/dviware/tkdvi/tkdvi-et99.pdf b/obsolete/dviware/tkdvi/tkdvi-et99.pdf new file mode 100644 index 0000000000..321cd4f77e Binary files /dev/null and b/obsolete/dviware/tkdvi/tkdvi-et99.pdf differ diff --git a/obsolete/dviware/tkdvi/tkdvi-etcl2K.pdf b/obsolete/dviware/tkdvi/tkdvi-etcl2K.pdf new file mode 100644 index 0000000000..c1b7974a61 Binary files /dev/null and b/obsolete/dviware/tkdvi/tkdvi-etcl2K.pdf differ diff --git a/obsolete/dviware/tkdvi/tkdvi_0.2-1.diff.gz b/obsolete/dviware/tkdvi/tkdvi_0.2-1.diff.gz new file mode 100644 index 0000000000..2be149aa63 Binary files /dev/null and b/obsolete/dviware/tkdvi/tkdvi_0.2-1.diff.gz differ diff --git a/obsolete/dviware/tkdvi/tkdvi_0.2-1.dsc b/obsolete/dviware/tkdvi/tkdvi_0.2-1.dsc new file mode 100644 index 0000000000..c7efa4f3c7 --- /dev/null +++ b/obsolete/dviware/tkdvi/tkdvi_0.2-1.dsc @@ -0,0 +1,22 @@ +-----BEGIN PGP SIGNED MESSAGE----- + +Source: tkdvi +Version: 0.2-1 +Binary: tkdvi +Maintainer: Anselm Lingnau +Architecture: any +Standards-Version: 2.4.0.0 +Files: + cd8eacadfb41a1b4d4cfd918ac49089f 137239 tkdvi_0.2.orig.tar.gz + 7b6eeb891531376e8cb22865baabf05f 4636 tkdvi_0.2-1.diff.gz + +-----BEGIN PGP SIGNATURE----- +Version: 2.6.3ia +Charset: noconv + +iQCVAwUBN2pGWkkVMVUvHxy9AQGPYgQA1WL2CNyBgLKixGFHfiuaUwEWVgnNz3Hh +X6r91Ha82YseUvcOsm9Obgl3zmUdbmDWPrDyB6dwEsVZeFbghonO51k8ScRM92rd +bWXv3Skd5cdIuupalYLjw5CGq2q8ketjSHn2952NYn6YnVIJ51atN2LQnjhhfCaa +1Zt11n7i7v4= +=vG/Z +-----END PGP SIGNATURE----- -- cgit v1.2.3