======================================================================== @UNKNOWN-file{ author = "Ulrik Vieth", version = "1", date = "07 May 1995", time = "23:12:40 MET", filename = "web2c-mp-native.diff", checksum = "53053 1610 6218 49537", email = "vieth@thphy.uni-duesseldorf.de", codetable = "ISO/ASCII", keywords = "MetaPost, web2c, kpathsea, teTeX", supported = "yes", abstract = "This file is part of modified redistribution of MetaPost 0.63 adapted for web2c-6.1 with kpathsea-2.6. This file contains the patches to apply to the web2c and kpathsea sources. To compile MetaPost and its utility programs you'll also need the MetaPost sources and input files, which are available separately as the files web2c-mp-src.tar.gz and web2c-mp-lib.tar.gz. Please consult the file README.web2c-mp for installation instructions and further information about this distribution. ", docstring = "The checksum field above contains a CRC-16 checksum as the first value, followed by the equivalent of the standard UNIX wc (word count) utility output of lines, words, and characters. This is produced by Robert Solovay's checksum utility.", } ======================================================================== Here's a list of files that are modified by this patch file. All file paths are relative to the directory kpathsea-2.6. ./Makefile.in ./kpathsea/ChangeLog ./kpathsea/tex-file.c ./kpathsea/tex-file.h ./kpathsea/texmf.cnf.in ./make/ChangeLog ./make/makevars.make ./make/paths.make ./web2c/Makefile.in ./web2c/configure ./web2c/configure.in ./web2c/lib/ChangeLog ./web2c/lib/c-auto.h.in ./web2c/lib/common.defines ./web2c/lib/cpascal.h ./web2c/lib/openinout.c ./web2c/lib/ourpaths.c ./web2c/lib/ourpaths.h ./web2c/lib/texmf.c ./web2c/lib/texmf.defines ./web2c/lib/texmf.h ./web2c/lib/texmfmem.h ./web2c/man/Makefile.in ======================================================================== diff -cr ../kpse-2.6.orig/Makefile.in ./Makefile.in *** ../kpse-2.6.orig/Makefile.in Fri Mar 3 23:33:27 1995 --- ./Makefile.in Thu Apr 13 18:17:11 1995 *************** *** 51,59 **** cd $(kpathsea_dir); $(MAKE) $(makeargs) # Targets that only apply to web2c. ! triptrap run-triptrap clean-triptrap run-trip clean-trip run-trap clean-trap \ ! c-sources programs TeX MF BibTeX \ ! formats fmts bases install-fmts install-bases \ manpages install-manpages: do-kpathsea cd web2c && $(MAKE) $(makeargs) $@ --- 51,60 ---- cd $(kpathsea_dir); $(MAKE) $(makeargs) # Targets that only apply to web2c. ! triptrap run-triptrap clean-triptrap \ ! run-trip clean-trip run-trap clean-trap run-trap2 clean-trap2 \ ! c-sources programs TeX MF MP BibTeX \ ! formats fmts bases mems install-fmts install-bases install-mems \ manpages install-manpages: do-kpathsea cd web2c && $(MAKE) $(makeargs) $@ diff -cr ../kpse-2.6.orig/kpathsea/ChangeLog ./kpathsea/ChangeLog *** ../kpse-2.6.orig/kpathsea/ChangeLog Sun Jan 8 18:17:03 1995 --- ./kpathsea/ChangeLog Thu Apr 13 11:27:45 1995 *************** *** 1,3 **** --- 1,11 ---- + Thu Apr 13 11:22:03 1995 Ulrik Vieth + + * texmf.cnf.in: Added new search paths for MetaPost: + MEMDIR, MPPOOLDIR, MPINPUTS, MPMEMS, MPPOOL. + + * tex-file.c, tex-file.h: Added variables and defaults + for MetaPost search paths. + Sun Jan 8 12:14:47 1995 Karl Berry * Version 2.6. diff -cr ../kpse-2.6.orig/kpathsea/tex-file.c ./kpathsea/tex-file.c *** ../kpse-2.6.orig/kpathsea/tex-file.c Mon Jan 2 20:29:22 1995 --- ./kpathsea/tex-file.c Thu May 4 11:04:52 1995 *************** *** 43,50 **** --- 43,53 ---- #define KPSE_BST_ENVS "BSTINPUTS" #define KPSE_CNF_ENVS "TEXMFCNF" #define KPSE_FMT_ENVS "TEXFORMATS" + #define KPSE_MEM_ENVS "MPMEMS" #define KPSE_MF_ENVS "MFINPUTS" #define KPSE_MFPOOL_ENVS "MFPOOL" + #define KPSE_MP_ENVS "MPINPUTS" + #define KPSE_MPPOOL_ENVS "MPPOOL" #define KPSE_PICT_ENVS "TEXPICTS", KPSE_TEX_ENVS #define KPSE_TEX_ENVS "TEXINPUTS" #define KPSE_TEXPOOL_ENVS "TEXPOOL" *************** *** 222,233 **** --- 225,245 ---- case kpse_fmt_format: INIT_FORMAT (".fmt", false, DEFAULT_TEXFORMATS, KPSE_FMT_ENVS); break; + case kpse_mem_format: + INIT_FORMAT (".mem", false, DEFAULT_MPMEMS, KPSE_MEM_ENVS); + break; case kpse_mf_format: INIT_MT ("MakeTeXMF", NULL); INIT_FORMAT (".mf", false, DEFAULT_MFINPUTS, KPSE_MF_ENVS); break; case kpse_mfpool_format: INIT_FORMAT (".pool", false, DEFAULT_MFPOOL, KPSE_MFPOOL_ENVS); + break; + case kpse_mp_format: + INIT_FORMAT (".mp", false, DEFAULT_MPINPUTS, KPSE_MP_ENVS); + break; + case kpse_mppool_format: + INIT_FORMAT (".pool", false, DEFAULT_MPPOOL, KPSE_MPPOOL_ENVS); break; case kpse_tex_format: INIT_MT ("MakeTeXTeX", NULL); diff -cr ../kpse-2.6.orig/kpathsea/tex-file.h ./kpathsea/tex-file.h *** ../kpse-2.6.orig/kpathsea/tex-file.h Mon Dec 19 19:30:59 1994 --- ./kpathsea/tex-file.h Thu May 4 11:05:07 1995 *************** *** 54,61 **** --- 54,64 ---- kpse_bst_format, kpse_cnf_format, kpse_fmt_format, + kpse_mem_format, kpse_mf_format, kpse_mfpool_format, + kpse_mp_format, + kpse_mppool_format, kpse_pict_format, kpse_tex_format, kpse_texpool_format, diff -cr ../kpse-2.6.orig/kpathsea/texmf.cnf.in ./kpathsea/texmf.cnf.in *** ../kpse-2.6.orig/kpathsea/texmf.cnf.in Wed Jan 4 18:50:16 1995 --- ./kpathsea/texmf.cnf.in Sun May 7 20:38:39 1995 *************** *** 55,65 **** % Ditto for MF. MFINPUTS = .:@mfinputdir@//:@fontdir@//src// ! % Predigested formats and string pools for initex/inimf. TEXFORMATS = .:@fmtdir@ MFBASES = .:@basedir@ TEXPOOL = @texpooldir@ MFPOOL = @mfpooldir@ % Device-independent font metric files. VFFONTS = .:@fontdir@//vf --- 55,70 ---- % Ditto for MF. MFINPUTS = .:@mfinputdir@//:@fontdir@//src// ! % Ditto for MP. ! MFINPUTS = .:@mpinputdir@// ! ! % Predigested formats and string pools for initex/inimf/inimp. TEXFORMATS = .:@fmtdir@ MFBASES = .:@basedir@ + MPMEMS = .:@memdir@ TEXPOOL = @texpooldir@ MFPOOL = @mfpooldir@ + MPPOOL = @mppooldir@ % Device-independent font metric files. VFFONTS = .:@fontdir@//vf diff -cr ../kpse-2.6.orig/make/ChangeLog ./make/ChangeLog *** ../kpse-2.6.orig/make/ChangeLog Sun Jan 8 18:17:00 1995 --- ./make/ChangeLog Thu Apr 13 11:07:00 1995 *************** *** 1,3 **** --- 1,11 ---- + Thu Apr 13 11:03:10 1995 Ulrik Vieth + + * paths.make: Add new variables for MetaPost directories: + mpinputdir, memdir, mppooldir. + + * makevars.make: Make sure that new variables for MetaPost + directories are passed on to sub-makes. + Sun Jan 8 12:16:36 1995 Karl Berry * kpathsea 2.6/dviljk 2.5/dvipsk 5.58f/xdvik 18f. diff -cr ../kpse-2.6.orig/make/makevars.make ./make/makevars.make *** ../kpse-2.6.orig/make/makevars.make Mon Jan 16 23:51:25 1995 --- ./make/makevars.make Thu Apr 13 10:49:32 1995 *************** *** 8,16 **** --- 8,19 ---- manext=$(manext) mandir=$(mandir) \ texmf=$(texmf) web2cdir=$(web2cdir) \ texinputdir=$(texinputdir) mfinputdir=$(mfinputdir) \ + mpinputdir=$(mpinputdir) \ fontdir=$(fontdir) \ fmtdir=$(fmtdir) basedir=$(basedir) \ + memdir=$(memdir) \ texpooldir=$(texpooldir) mfpooldir=$(mfpooldir) \ + mppooldir=$(mppooldir) \ install_fonts=$(install_fonts) \ dvipsdir=$(dvipsdir) psheaderdir=$(psheaderdir) \ default_texsizes='$(default_texsizes)' diff -cr ../kpse-2.6.orig/make/paths.make ./make/paths.make *** ../kpse-2.6.orig/make/paths.make Fri Mar 3 13:03:30 1995 --- ./make/paths.make Thu Apr 13 10:48:11 1995 *************** *** 46,54 **** # The root of the tree. texmf = $(datadir)/texmf ! # TeX and MF source files. texinputdir = $(texmf)/tex mfinputdir = $(texmf)/mf # MakeTeXPK.site, texmf.cnf, etc. web2cdir = $(texmf)/web2c --- 46,55 ---- # The root of the tree. texmf = $(datadir)/texmf ! # TeX, MF, and MP source files. texinputdir = $(texmf)/tex mfinputdir = $(texmf)/mf + mpinputdir = $(texmf)/mp # MakeTeXPK.site, texmf.cnf, etc. web2cdir = $(texmf)/web2c *************** *** 56,68 **** # The top-level font directory. fontdir = $(texmf)/fonts ! # Memory dumps (.fmt and .base). fmtdir = $(texmf)/ini ! basedir = $(fmtdir) # Pool files. texpooldir = $(texmf)/ini ! mfpooldir = $(texpooldir) # If install_fonts=true, the PostScript/LaserJet TFM and VF files for # the builtin fonts get installed in subdirectories of this directory, --- 57,71 ---- # The top-level font directory. fontdir = $(texmf)/fonts ! # Memory dumps (.fmt, .base, and .mem). fmtdir = $(texmf)/ini ! basedir = $(texmf)/ini ! memdir = $(texmf)/ini # Pool files. texpooldir = $(texmf)/ini ! mfpooldir = $(texmf)/ini ! mppooldir = $(texmf)/ini # If install_fonts=true, the PostScript/LaserJet TFM and VF files for # the builtin fonts get installed in subdirectories of this directory, diff -cr ../kpse-2.6.orig/web2c/Makefile.in ./web2c/Makefile.in *** ../kpse-2.6.orig/web2c/Makefile.in Thu Apr 27 19:06:41 1995 --- ./web2c/Makefile.in Sun May 7 20:47:01 1995 *************** *** 32,51 **** # The root of the tree. texmf_prefix = $(datadir)/texmf ! # TeX and MF source files. texinputdir = $(texmf_prefix)/tex mfinputdir = $(texmf_prefix)/mf # The top-level font directory. fontdir = $(texmf_prefix)/fonts # Where memory dumps are installed. fmtdir = $(texmf_prefix)/ini ! basedir = $(fmtdir) # Pool files. texpooldir = $(texmf_prefix)/ini ! mfpooldir = $(texpooldir) # The PostScript TFM and VF files get installed in subdirectories of # this directory, named for the typeface families of these directories. --- 32,54 ---- # The root of the tree. texmf_prefix = $(datadir)/texmf ! # TeX, MF, and MP source files. texinputdir = $(texmf_prefix)/tex mfinputdir = $(texmf_prefix)/mf + mpinputdir = $(texmf_prefix)/mp # The top-level font directory. fontdir = $(texmf_prefix)/fonts # Where memory dumps are installed. fmtdir = $(texmf_prefix)/ini ! basedir = $(texmf_prefix)/ini ! memdir = $(texmf_prefix)/ini # Pool files. texpooldir = $(texmf_prefix)/ini ! mfpooldir = $(texmf_prefix)/ini ! mppooldir = $(texmf_prefix)/ini # The PostScript TFM and VF files get installed in subdirectories of # this directory, named for the typeface families of these directories. *************** *** 74,79 **** --- 77,83 ---- # install-bases' will try to install. See `README' for a brief # description of each of these formats. bases = mf.base cmmf.base + mems = mp.mem mfmp.mem fmts = tex.fmt # latex.fmt slitex.fmt etex.fmt amslatex.fmt amstex.fmt texinfo.fmt # inrstex.fmt picplus.fmt *************** *** 149,155 **** # Where we need to make things. # triptrapdirs = dviutil fontutil ! progdirs = $(triptrapdirs) tex mf bibtex web alldirs = $(progdirs) lib man web2c # What to pass to subdirectories when making various things. --- 153,159 ---- # Where we need to make things. # triptrapdirs = dviutil fontutil ! progdirs = $(triptrapdirs) tex mf mp mpware bibtex web alldirs = $(progdirs) lib man web2c # What to pass to subdirectories when making various things. *************** *** 166,186 **** bindir=$(bindir) \ fontdir=$(fontdir) \ texpooldir=$(texpooldir) \ ! mfpooldir=$(mfpooldir) ! # The TeX and Metafont torture tests. ! triptrap: trip trap .PHONY: triptrap common-trip: do-tangle for name in $(triptrapdirs); do \ (cd $${name}; $(MAKE) $(makeargs) triptrap); done ! check run-triptrap: run-trip run-trap .PHONY: check run-triptrap ! clean-triptrap: clean-trip clean-trap .PHONY: clean-triptrap --- 170,191 ---- bindir=$(bindir) \ fontdir=$(fontdir) \ texpooldir=$(texpooldir) \ ! mfpooldir=$(mfpooldir) \ ! mppooldir=$(mppooldir) ! # The TeX, METAFONT, and MetaPost torture tests. ! triptrap: trip trap trap2 .PHONY: triptrap common-trip: do-tangle for name in $(triptrapdirs); do \ (cd $${name}; $(MAKE) $(makeargs) triptrap); done ! check run-triptrap: run-trip run-trap run-trap2 .PHONY: check run-triptrap ! clean-triptrap: clean-trip clean-trap clean-trap2 .PHONY: clean-triptrap *************** *** 210,217 **** .PHONY: clean-trap # ! # The following targets build production TeX and MF. all: programs manpages formats .PHONY: all --- 215,235 ---- .PHONY: clean-trap + run-trap2: trap2 + cd mp; $(MAKE) $(makeargs) run-trap + .PHONY: run-trap2 + + trap2: common-trip + cd mp; $(MAKE) $(makeargs) triptrap + .PHONY: trap2 + + clean-trap2: + cd mp; $(MAKE) clean-trap + .PHONY: clean-trap2 + + # ! # The following targets build production TeX, MF, and MP. all: programs manpages formats .PHONY: all *************** *** 228,233 **** --- 246,256 ---- cd mf; $(MAKE) $(makeargs) all .PHONY: MF + MP: do-tangle + cd mp; $(MAKE) $(makeargs) all + cd mpware; $(MAKE) $(makeargs) all + .PHONY: MP + BibTeX: do-tangle cd bibtex; $(MAKE) $(makeargs) all .PHONY: BibTeX *************** *** 255,280 **** .PHONY: c-sources manpages: $(kpathsea_dir)/paths.h ! cd man; $(MAKE) bindir=$(bindir) texdatadir=$(texdatadir) \ ! texpooldir=$(texpooldir) fmtdir=$(fmtdir) \ ! texinputdir=$(texinputdir) fontdir=$(fontdir) \ ! mfdatadir=$(mfdatadir) mfpooldir=$(mfpooldir) \ ! basedir=$(basedir) mfinputdir=$(mfinputdir) \ ! localmodes='$(localmodes)' \ ! all .PHONY: manpages ! formats: bases fmts .PHONY: formats bases: MF cd mf; \ $(MAKE) $(makeargs) bases="$(bases)" localmodes='$(localmodes)' bases .PHONY: bases ! fmts: TeX ! cd tex; $(MAKE) $(makeargs) fmts="$(fmts)" fmts ! .PHONY: fmts # --- 278,301 ---- .PHONY: c-sources manpages: $(kpathsea_dir)/paths.h ! cd man; $(MAKE) $(makeargs) localmodes='$(localmodes)' all .PHONY: manpages ! formats: fmts bases mems .PHONY: formats + fmts: TeX + cd tex; $(MAKE) $(makeargs) fmts="$(fmts)" fmts + .PHONY: fmts + bases: MF cd mf; \ $(MAKE) $(makeargs) bases="$(bases)" localmodes='$(localmodes)' bases .PHONY: bases ! mems: MP ! cd mp; $(MAKE) $(makeargs) mems="$(mems)" mems ! .PHONY: mems # *************** *** 282,288 **** install: install-exec install-data .PHONY: install ! install-data: install-fmts install-bases install-manpages for name in $(progdirs); do \ (cd $${name}; $(MAKE) $(installargs) install-data); \ done --- 303,309 ---- install: install-exec install-data .PHONY: install ! install-data: install-fmts install-bases install-mems install-manpages for name in $(progdirs); do \ (cd $${name}; $(MAKE) $(installargs) install-data); \ done *************** *** 295,312 **** done for f in $(fmts); do \ rm -f $(bindir)/`basename $$f .fmt`; \ ! $(LN) $(bindir)/virtex $(bindir)/`basename $$f .fmt`; \ done for f in $(bases); do \ rm -f $(bindir)/`basename $$f .base`; \ $(LN) $(bindir)/virmf $(bindir)/`basename $$f .base`; \ done .PHONY: install-exec install-fmts: fmts $(SHELL) $(srcdir)/../mkdirchain $(fmtdir) for f in $(fmts); do \ ! $(INSTALL_DATA) tex/$$f $(fmtdir)/$$f; \ done cd $(fmtdir); rm -f plain.fmt; $(LN) tex.fmt plain.fmt .PHONY: install-fmts --- 316,337 ---- done for f in $(fmts); do \ rm -f $(bindir)/`basename $$f .fmt`; \ ! $(LN) $(bindir)/virtex $(bindir)/`basename $$f .fmt`; \ done for f in $(bases); do \ rm -f $(bindir)/`basename $$f .base`; \ $(LN) $(bindir)/virmf $(bindir)/`basename $$f .base`; \ done + for f in $(mems); do \ + rm -f $(bindir)/`basename $$f .mem`; \ + $(LN) $(bindir)/virmf $(bindir)/`basename $$f .mem`; \ + done .PHONY: install-exec install-fmts: fmts $(SHELL) $(srcdir)/../mkdirchain $(fmtdir) for f in $(fmts); do \ ! $(INSTALL_DATA) tex/$$f $(fmtdir)/$$f; \ done cd $(fmtdir); rm -f plain.fmt; $(LN) tex.fmt plain.fmt .PHONY: install-fmts *************** *** 314,323 **** install-bases: bases $(SHELL) $(srcdir)/../mkdirchain $(basedir) for f in $(bases); do \ ! $(INSTALL_DATA) mf/$$f $(basedir)/$$f; \ done cd $(basedir); rm -f plain.base; $(LN) mf.base plain.base .PHONY: install-bases install-manpages: manpages cd man; $(MAKE) $(installargs) \ --- 339,357 ---- install-bases: bases $(SHELL) $(srcdir)/../mkdirchain $(basedir) for f in $(bases); do \ ! $(INSTALL_DATA) mf/$$f $(basedir)/$$f; \ done cd $(basedir); rm -f plain.base; $(LN) mf.base plain.base .PHONY: install-bases + + install-mems: mems + $(SHELL) $(srcdir)/../mkdirchain $(memdir) + for f in $(mems); do \ + $(INSTALL_DATA) mp/$$f $(memdir)/$$f; \ + done + cd $(memdir); rm -f plain.mem; $(LN) mp.mem plain.mem + cd $(memdir); rm -f mfplain.mem; $(LN) mfmp.mem mfplain.mem + .PHONY: install-mems install-manpages: manpages cd man; $(MAKE) $(installargs) \ diff -cr ../kpse-2.6.orig/web2c/configure ./web2c/configure *** ../kpse-2.6.orig/web2c/configure Tue Feb 7 15:53:11 1995 --- ./web2c/configure Thu Apr 13 18:35:17 1995 *************** *** 2127,2132 **** --- 2127,2157 ---- (cd $srcdir/mf && rm -f cmf.ch && sed -f small.sed cmf.ch) fi + echo $ac_n "checking for small MP""... $ac_c" 1>&4 + cat > conftest.$ac_ext <&5 | + egrep "yes" >/dev/null 2>&1; then + rm -rf conftest* + SMALLMP=yes + else + rm -rf conftest* + SMALLMP=no + fi + rm -f conftest* + + echo "$ac_t""$SMALLMP" 1>&4 + if test $SMALLMP = yes; then + (cd $srcdir/mp && rm -f cmp.ch && sed -f small.sed cmp.ch) + fi + echo $ac_n "checking for small BibTeX""... $ac_c" 1>&4 cat > conftest.$ac_ext <> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then --- 2300,2306 ---- CONFIG_FILES=\${CONFIG_FILES-"Makefile bibtex/Makefile dviutil/Makefile fontutil/Makefile \ lib/Makefile man/Makefile mf/Makefile mf/MFwindow/Makefile \ ! mp/Makefile mpware/Makefile tex/Makefile web/Makefile web2c/Makefile"} EOF cat >> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then diff -cr ../kpse-2.6.orig/web2c/configure.in ./web2c/configure.in *** ../kpse-2.6.orig/web2c/configure.in Tue Jan 17 00:23:06 1995 --- ./web2c/configure.in Thu Apr 13 18:26:02 1995 *************** *** 80,86 **** AC_DEFINE(GLUERATIO_TYPE, float) fi ! dnl Metafont next. AC_MSG_CHECKING(for small MF) AC_KBSYM_CHECK(SMALLMF) AC_MSG_RESULT($SMALLMF) --- 80,86 ---- AC_DEFINE(GLUERATIO_TYPE, float) fi ! dnl METAFONT next. AC_MSG_CHECKING(for small MF) AC_KBSYM_CHECK(SMALLMF) AC_MSG_RESULT($SMALLMF) *************** *** 88,93 **** --- 88,101 ---- (cd $srcdir/mf && rm -f cmf.ch && sed -f small.sed cmf.ch) fi + dnl MetaPost next. + AC_MSG_CHECKING(for small MP) + AC_KBSYM_CHECK(SMALLMP) + AC_MSG_RESULT($SMALLMP) + if test $SMALLMP = yes; then + (cd $srcdir/mp && rm -f cmp.ch && sed -f small.sed cmp.ch) + fi + dnl And finally BibTeX. AC_MSG_CHECKING(for small BibTeX) AC_KBSYM_CHECK(SMALLBibTeX) *************** *** 100,103 **** dnl Generate `Makefile's, `config.status', and our header file. AC_OUTPUT(Makefile bibtex/Makefile dviutil/Makefile fontutil/Makefile \ lib/Makefile man/Makefile mf/Makefile mf/MFwindow/Makefile \ ! tex/Makefile web/Makefile web2c/Makefile) --- 108,111 ---- dnl Generate `Makefile's, `config.status', and our header file. AC_OUTPUT(Makefile bibtex/Makefile dviutil/Makefile fontutil/Makefile \ lib/Makefile man/Makefile mf/Makefile mf/MFwindow/Makefile \ ! mp/Makefile mpware/Makefile tex/Makefile web/Makefile web2c/Makefile) diff -cr ../kpse-2.6.orig/web2c/lib/ChangeLog ./web2c/lib/ChangeLog *** ../kpse-2.6.orig/web2c/lib/ChangeLog Wed Feb 2 17:02:28 1994 --- ./web2c/lib/ChangeLog Thu Apr 13 15:13:57 1995 *************** *** 1,3 **** --- 1,46 ---- + Thu Apr 13 11:55:11 1995 Ulrik Vieth + + * c-auto.h.in: Added SMALLMP configuration option for MetaPost. + Also added FIXPT option (for MetaPost's arithmetic routines) and + PATHEXPAND option (for directory searching in ../mpware/dmp.c). + + * texmfmem.h: Added check for the SMALLMP configuration option. + + * texmf.c: Initialization of use_maketextfm also applies for + MetaPost. (MetaPost requires TFM files for text in labels.) + + * texmf.c: Changed #ifdef TeX ... #else ... #endif blocks + to take care of another case for MetaPost. + + * texmf.h: Changed #ifdef TeX ... #else ... #endif blocks + to take care of another case for MetaPost. + + * ourpaths.c (setpaths): Added additional cases for MetaPost + search paths. Using temporary kludge to search "psfonts.map" + in MPINPUTS path (including subdirectories) because MetaPost + currently can't handle dvipsk's version of "psfonts.map". + + * ourpaths.h: Added symbols for MetaPost search paths. + + * openinout.c (callmakempx): Added code from ../mp/mpext.c. + Add fall-back definitions for MPXCOMMAND and TROFFMPX. + + * openinout.c (open_input): Special checks for NO_FILE_PATH + and TFMPATH are needed in MetaPost as well. + + * openinout.c: Changed #ifdef TeX ... #else ... #endif blocks + to take care of another case for MetaPost. + + * cpascal.h (halfp): Add C macro definition used in MetaPost + for efficiency. (METAFONT might also take advantage of this.) + + * texmf.defines: Added symbols for MetaPost: callmakempx(), + MPMEMPATH, MPMEMPATHBIT, MPOOLPATH, MPPOOLPATHBIT, + PSMAPFILEPATH, PSMAPFILEPATHBIT. + + * common.defines: Added new symbols for MetaPost: halfp(), + MPINPUTPATH, MPINPUTPATHBIT. + Wed Feb 2 11:00:47 1994 Karl Berry (karl@cs.umb.edu) * Version 6.1. diff -cr ../kpse-2.6.orig/web2c/lib/c-auto.h.in ./web2c/lib/c-auto.h.in *** ../kpse-2.6.orig/web2c/lib/c-auto.h.in Fri Feb 10 02:29:15 1995 --- ./web2c/lib/c-auto.h.in Thu Apr 13 15:49:58 1995 *************** *** 13,19 **** automatically based on these definitions won't happen. */ ! /* Define these if you want to compile the small (64K memory) TeX/MF. The default is to compile the big (260K memory) versions. Similarly for BibTeX. */ --- 13,19 ---- automatically based on these definitions won't happen. */ ! /* Define these if you want to compile the small (64K memory) TeX/MF/MP. The default is to compile the big (260K memory) versions. Similarly for BibTeX. */ *************** *** 23,28 **** --- 23,31 ---- #ifndef SMALLMF #undef SMALLMF #endif + #ifndef SMALLMP + #undef SMALLMP + #endif #ifndef SMALLBibTeX #undef SMALLBibTeX #endif *************** *** 100,105 **** --- 103,132 ---- example, the GNU C compiler ignores them when optimizing. */ #ifndef REGFIX #undef REGFIX + #endif + + /* Define FIXPT if you want to use the arithmetic routines in mp.web + instead of the external routines in mpmath.c that use double precision + floating point to compute the same results. You should probably do + this only if your machine does not have hardware floating point. + If you aren't sure, go to the mp subdirectory, make timemath, and + run the resulting test program. It prints execution times for both + versions of the arithmetic routines and warns if the floating point + versions produce incorrect results. */ + #ifndef FIXPT + #undef FIXPT + #endif + + /* Define PATHEXP if you want mp, dvitomp, and dmp to understand + double slashes "//" in the paths here and in the corresponding + environment variables. There can only be one "//" per path. + It means "expand zero or more levels of subdirectories, assuming + that directories contain files or subdirectories, but not both". + This is for compatibility with recent versions of the Web2c + distribution. If you set it, be prepared to edit mp/pathexp.c. + That code has only been tested on one system. */ + #ifndef PATHEXP + #undef PATHEXP #endif /* Redefine this only if you are using some non-standard TeX diff -cr ../kpse-2.6.orig/web2c/lib/common.defines ./web2c/lib/common.defines *** ../kpse-2.6.orig/web2c/lib/common.defines Tue Feb 1 21:41:42 1994 --- ./web2c/lib/common.defines Thu Apr 13 11:56:11 1995 *************** *** 30,35 **** --- 30,37 ---- @define const GFFILEPATHBIT; @define const MFINPUTPATH; @define const MFINPUTPATHBIT; + @define const MPINPUTPATH; + @define const MPINPUTPATHBIT; @define const PATHMAX; @define const PKFILEPATH; @define const PKFILEPATHBIT; *************** *** 61,66 **** --- 63,69 ---- @define function ftell (); @define function getc (); @define function getoptlongonly (); + @define function halfp (); @define function inputint (); @define function maketexmf; @define function maketextex; diff -cr ../kpse-2.6.orig/web2c/lib/cpascal.h ./web2c/lib/cpascal.h *** ../kpse-2.6.orig/web2c/lib/cpascal.h Sat Nov 13 01:52:15 1993 --- ./web2c/lib/cpascal.h Thu Apr 13 11:50:37 1995 *************** *** 47,52 **** --- 47,57 ---- #define decr(x) --(x) #define incr(x) ++(x) + /* MetaPost uses this for efficiency. METAFONT might also take advantage + of this, but the WEB macro takes precendence unless it is eliminated + in the change file. */ + #define halfp(x) ((x) >> 1) + /* PatGen 2 uses this. */ #define input2ints(a, b) zinput2ints (&a, &b) diff -cr ../kpse-2.6.orig/web2c/lib/openinout.c ./web2c/lib/openinout.c *** ../kpse-2.6.orig/web2c/lib/openinout.c Tue Jan 17 03:50:39 1995 --- ./web2c/lib/openinout.c Sun May 7 18:25:01 1995 *************** *** 1,5 **** /* openinout.c: open input and output files. These routines used by ! TeX, Metafont, and BibTeX. */ #include "config.h" #include --- 1,5 ---- /* openinout.c: open input and output files. These routines used by ! TeX, METAFONT, MetaPost, and BibTeX. */ #include "config.h" #include *************** *** 12,18 **** FILE *standardoutput = stdout; /* Because we don't generate a .h file with all the global definitions ! for BibTeX, as we do with TeX and Metafont, we must declare these variables. */ extern char nameoffile[]; extern integer namelength; --- 12,18 ---- FILE *standardoutput = stdout; /* Because we don't generate a .h file with all the global definitions ! for BibTeX, as we do with TeX, MF, and MP, we must declare these variables. */ extern char nameoffile[]; extern integer namelength; *************** *** 23,31 **** #ifdef TeX #include "texd.h" ! #else /* Metafont */ #include "mfd.h" #endif #ifdef FUNNY_CORE_DUMP /* This is defined in texmf.c. */ --- 23,35 ---- #ifdef TeX #include "texd.h" ! #endif ! #ifdef MF #include "mfd.h" #endif + #ifdef MP + #include "mpd.h" + #endif #ifdef FUNNY_CORE_DUMP /* This is defined in texmf.c. */ *************** *** 49,63 **** boolean openable = false; #if defined (FUNNY_CORE_DUMP) && !defined (BibTeX) ! /* This only applies if a preloaded TeX/Metafont is being made; it allows automatic creation of the core dump (typing ^\ loses since it requires manual intervention). */ ! if ((path_index == TEXINPUTPATH || path_index == MFINPUTPATH) && strncmp (nameoffile+1, "HackyInputFileNameForCoreDump.tex", 33) == 0) funny_core_dump (); #endif /* FUNNY_CORE_DUMP and not BibTeX */ ! #ifdef BibTeX if (path_index == NO_FILE_PATH) { unsigned temp_length; --- 53,68 ---- boolean openable = false; #if defined (FUNNY_CORE_DUMP) && !defined (BibTeX) ! /* This only applies if a preloaded TeX/MF/MP is being made; it allows automatic creation of the core dump (typing ^\ loses since it requires manual intervention). */ ! if ((path_index == TEXINPUTPATH || path_index == MFINPUTPATH ! || path_index == MPINPUTPATH) && strncmp (nameoffile+1, "HackyInputFileNameForCoreDump.tex", 33) == 0) funny_core_dump (); #endif /* FUNNY_CORE_DUMP and not BibTeX */ ! #if defined(BibTeX) || defined(MP) if (path_index == NO_FILE_PATH) { unsigned temp_length; *************** *** 74,80 **** } else ! #endif /* BibTeX */ if (testreadaccess (nameoffile, path_index)) { --- 79,85 ---- } else ! #endif /* BibTeX || MP */ if (testreadaccess (nameoffile, path_index)) { *************** *** 99,105 **** else namelength = strchr (nameoffile + 1, ' ') - nameoffile - 1; ! #ifdef TeX /* If we just opened a TFM file, we have to read the first byte, since TeX wants to look at it. What a kludge. */ if (path_index == TFMFILEPATH) --- 104,110 ---- else namelength = strchr (nameoffile + 1, ' ') - nameoffile - 1; ! #if defined(TeX) || defined(MP) /* If we just opened a TFM file, we have to read the first byte, since TeX wants to look at it. What a kludge. */ if (path_index == TFMFILEPATH) *************** *** 107,113 **** extern integer tfmtemp; tfmtemp = getc (*f); } ! #endif /* TeX */ openable = true; } --- 112,118 ---- extern integer tfmtemp; tfmtemp = getc (*f); } ! #endif /* TeX || MP */ openable = true; } *************** *** 157,163 **** } ! /* These are called by TeX or MF if an input or TFM file can't be opened. */ boolean maketextex () --- 162,169 ---- } ! /* These are called by TeX, MF, and MP if an input or TFM file ! can't be opened. */ boolean maketextex () *************** *** 247,249 **** --- 253,300 ---- return ret; } + + /*********************************************** + * The following is needed by MetaPost only. * + ***********************************************/ + + /* Invoke makempx (or troffmpx) to make sure there is an up-to-date + .mpx file for a given .mp file. (John Hobby 3/14/90) */ + + /* Definitions for MPXCOMMAND and TROFFMPX can be given at compile time + (including an absolute path) to overrule default definitions below. */ + + #ifdef MP + #define CMDLENGTH 300 + + #ifndef MPXCOMMAND + #define MPXCOMMAND "makempx" + #endif + #ifndef TROFFMPX + #define TROFFMPX "troffmpx" + #endif + + boolean callmakempx(mpname, mpxname) + char *mpname, *mpxname; + { + char *cmd, *p, *q, *qlimit; + char buf[CMDLENGTH]; + + cmd = getenv("MPXCOMMAND"); + if (cmd==NULL) + if (troffmode) cmd=TROFFMPX; else cmd=MPXCOMMAND; + + q = buf; + qlimit = buf+CMDLENGTH-1; + for (p=cmd; *p!=0; p++) + if (q==qlimit) return 0; else *q++ = *p; + *q++ = ' '; + for (p=mpname+1; *p!=0 && *p!=' '; p++) + if (q==qlimit) return 0; else *q++ = *p; + *q++ = ' '; + for (p=mpxname+1; *p!=0 && *p!=' '; p++) + if (q==qlimit) return 0; else *q++ = *p; + *q = 0; + return system(buf)==0; + } + #endif /* MP */ diff -cr ../kpse-2.6.orig/web2c/lib/ourpaths.c ./web2c/lib/ourpaths.c *** ../kpse-2.6.orig/web2c/lib/ourpaths.c Tue Jan 17 00:23:09 1995 --- ./web2c/lib/ourpaths.c Tue Apr 18 10:54:29 1995 *************** *** 42,49 **** --- 42,61 ---- if (path_bits & MFPOOLPATHBIT) path_dirs[MFPOOLPATH] = kpse_init_format (kpse_mfpool_format); + if (path_bits & MPINPUTPATHBIT) + path_dirs[MPINPUTPATH] = kpse_init_format (kpse_mp_format); + + if (path_bits & MPMEMPATHBIT) + path_dirs[MPMEMPATH] = kpse_init_format (kpse_mem_format); + + if (path_bits & MPPOOLPATHBIT) + path_dirs[MPPOOLPATH] = kpse_init_format (kpse_mppool_format); + if (path_bits & PKFILEPATHBIT) path_dirs[PKFILEPATH] = kpse_init_format (kpse_pk_format); + + if (path_bits & PSMAPFILEPATHBIT) + path_dirs[PSMAPFILEPATH] = kpse_init_format (kpse_dvips_config_format); if (path_bits & TEXFORMATPATHBIT) path_dirs[TEXFORMATPATH] = kpse_init_format (kpse_fmt_format); diff -cr ../kpse-2.6.orig/web2c/lib/ourpaths.h ./web2c/lib/ourpaths.h *** ../kpse-2.6.orig/web2c/lib/ourpaths.h Fri Aug 14 13:22:55 1992 --- ./web2c/lib/ourpaths.h Thu Apr 13 11:36:36 1995 *************** *** 16,22 **** --- 16,26 ---- MFBASEPATH, MFINPUTPATH, MFPOOLPATH, + MPINPUTPATH, + MPMEMPATH, + MPPOOLPATH, PKFILEPATH, + PSMAPFILEPATH, TEXFORMATPATH, TEXINPUTPATH, TEXPOOLPATH, *************** *** 31,37 **** --- 35,45 ---- #define MFBASEPATHBIT (1 << MFBASEPATH) #define MFINPUTPATHBIT (1 << MFINPUTPATH) #define MFPOOLPATHBIT (1 << MFPOOLPATH) + #define MPINPUTPATHBIT (1 << MPINPUTPATH) + #define MPMEMPATHBIT (1 << MPMEMPATH) + #define MPPOOLPATHBIT (1 << MPPOOLPATH) #define PKFILEPATHBIT (1 << PKFILEPATH) + #define PSMAPFILEPATHBIT (1 << PSMAPFILEPATH) #define TEXFORMATPATHBIT (1 << TEXFORMATPATH) #define TEXINPUTPATHBIT (1 << TEXINPUTPATH) #define TEXPOOLPATHBIT (1 << TEXPOOLPATH) diff -cr ../kpse-2.6.orig/web2c/lib/texmf.c ./web2c/lib/texmf.c *** ../kpse-2.6.orig/web2c/lib/texmf.c Tue Jan 17 00:23:09 1995 --- ./web2c/lib/texmf.c Thu Apr 13 18:04:43 1995 *************** *** 1,9 **** ! /* Hand-coded routines for TeX or Metafont in C. Originally written by Tim Morgan, drawing from other Unix ports of TeX. */ ! /* Either `texd.h' or `mfd.h' will include `../common/texmf.h'. */ ! /* Instantiate data in `texd.h' or `mfd.h' here. */ #define EXTERN #ifdef TeX --- 1,9 ---- ! /* Hand-coded routines for TeX, MF, or MP in C. Originally written by Tim Morgan, drawing from other Unix ports of TeX. */ ! /* Either `texd.h', `mfd.h', or `mpd.h' will include `../common/texmf.h'. */ ! /* Instantiate data in `texd.h', `mfd.h', or `mpd.h' here. */ #define EXTERN #ifdef TeX *************** *** 17,23 **** #define main_program texbody #define edit_value tex_edit_value #define edit_var "TEXEDIT" ! #else /* not TeX */ #include "mfd.h" #define dump_default_var MFbasedefault #define dump_default " plain.base" --- 17,24 ---- #define main_program texbody #define edit_value tex_edit_value #define edit_var "TEXEDIT" ! #endif /* TeX */ ! #ifdef MF #include "mfd.h" #define dump_default_var MFbasedefault #define dump_default " plain.base" *************** *** 28,34 **** #define main_program main_body #define edit_value mf_edit_value #define edit_var "MFEDIT" ! #endif /* not TeX */ #include #include --- 29,47 ---- #define main_program main_body #define edit_value mf_edit_value #define edit_var "MFEDIT" ! #endif /* MF */ ! #ifdef MP ! #include "mpd.h" ! #define dump_default_var MPmemdefault ! #define dump_default " plain.mem" ! #define dump_format " %s.mem" ! #define dump_ext_length 4 ! #define dump_default_length memdefaultlength ! #define virgin_program "virmp" ! #define main_program main_body ! #define edit_value mp_edit_value ! #define edit_var "MPEDIT" ! #endif /* MP */ #include #include *************** *** 108,120 **** boolean use_maketextex = MAKE_TEX_TEX_BY_DEFAULT || getenv ("USE_MAKETEXTEX") || getenv ("MAKETEXTEX"); boolean use_maketextfm = MAKE_TEX_TFM_BY_DEFAULT || getenv ("USE_MAKETEXTFM") || getenv ("MAKETEXTFM"); - kpse_format_info[kpse_tex_format].program_enabled_p = use_maketextex; kpse_format_info[kpse_tfm_format].program_enabled_p = use_maketextfm; } ! #endif /* TeX */ main_program (); } --- 121,137 ---- boolean use_maketextex = MAKE_TEX_TEX_BY_DEFAULT || getenv ("USE_MAKETEXTEX") || getenv ("MAKETEXTEX"); + kpse_format_info[kpse_tex_format].program_enabled_p = use_maketextex; + } + #endif /* TeX */ + #if defined(TeX) || defined(MP) + { boolean use_maketextfm = MAKE_TEX_TFM_BY_DEFAULT || getenv ("USE_MAKETEXTFM") || getenv ("MAKETEXTFM"); kpse_format_info[kpse_tfm_format].program_enabled_p = use_maketextfm; } ! #endif /* TeX || MP */ main_program (); } *************** *** 220,226 **** } } ! /* I/O for TeX and Metafont. */ /* Read a line of input as efficiently as possible while still looking like Pascal. We set `last' to `first' and return `false' if we get --- 237,243 ---- } } ! /* I/O for TeX, METAFONT, and MetaPost. */ /* Read a line of input as efficiently as possible while still looking like Pascal. We set `last' to `first' and return `false' if we get *************** *** 367,374 **** uexit (1); } ! /* Read and write format (for TeX) or base (for Metafont) files. In ! tex.web, these files are architecture dependent; specifically, BigEndian and LittleEndian architectures produce different files. These routines always output BigEndian files. This still does not make the dump files architecture-independent, because it is possible --- 384,391 ---- uexit (1); } ! /* Read and write format (for TeX), base (for MF), or mem (for MP) files. ! In tex.web, these files are architecture dependent; specifically, BigEndian and LittleEndian architectures produce different files. These routines always output BigEndian files. This still does not make the dump files architecture-independent, because it is possible diff -cr ../kpse-2.6.orig/web2c/lib/texmf.defines ./web2c/lib/texmf.defines *** ../kpse-2.6.orig/web2c/lib/texmf.defines Sat Oct 6 15:49:47 1990 --- ./web2c/lib/texmf.defines Thu Apr 13 12:00:10 1995 *************** *** 1,10 **** {This files defines symbols in addition to those in `common.defines', ! for use in the TeX and the Metafont change files.} @define const MFBASEPATH; @define const MFBASEPATHBIT; @define const MFPOOLPATH; @define const MFPOOLPATHBIT; @define const TEXFORMATPATH; @define const TEXFORMATPATHBIT; @define const TEXPOOLPATH; --- 1,16 ---- {This files defines symbols in addition to those in `common.defines', ! for use in the TeX, METAFONT, and MetaPost change files.} @define const MFBASEPATH; @define const MFBASEPATHBIT; @define const MFPOOLPATH; @define const MFPOOLPATHBIT; + @define const MPMEMPATH; + @define const MPMEMPATHBIT; + @define const MPPOOLPATH; + @define const MPPOOLPATHBIT; + @define const PSMAPFILEPATH; + @define const PSMAPFILEPATHBIT; @define const TEXFORMATPATH; @define const TEXFORMATPATHBIT; @define const TEXPOOLPATH; *************** *** 25,30 **** --- 31,37 ---- @define function bopenin (); @define function bopenout (); + @define function callmakempx (); @define function initscreen; @define function inputln (); @define function wopenin (); diff -cr ../kpse-2.6.orig/web2c/lib/texmf.h ./web2c/lib/texmf.h *** ../kpse-2.6.orig/web2c/lib/texmf.h Sat Dec 4 22:22:04 1993 --- ./web2c/lib/texmf.h Thu Apr 13 14:55:56 1995 *************** *** 1,11 **** /* Main include file for TeX in C. Originally by Tim Morgan, ! December 23, 1987. These routines are also used by Metafont (with ! some name changes). */ #ifndef TEXMF_DEBUG ! /* Tell Kpathsea not to define DEBUG, which tells TeX & MF to go into debugging mode at fatal errors. This file (texmf.h) is included by ! {tex,mf}d.h, which is the first include in the C files output by web2c. */ #define NO_DEBUG #endif --- 1,11 ---- /* Main include file for TeX in C. Originally by Tim Morgan, ! December 23, 1987. These routines are also used by MF and MP ! (with some name changes). */ #ifndef TEXMF_DEBUG ! /* Tell Kpathsea not to define DEBUG, which tells TeX/MF/MP to go into debugging mode at fatal errors. This file (texmf.h) is included by ! {tex,mf,mp}d.h, which is the first include in the C files output by web2c. */ #define NO_DEBUG #endif *************** *** 18,30 **** #define write_out writedvi #define out_file dvifile #define out_buf dvibuf ! #else /* not TeX */ #define dump_file basefile #define dump_path MFBASEPATH #define write_out writegf #define out_file gffile #define out_buf gfbuf ! #endif /* not TeX */ --- 18,35 ---- #define write_out writedvi #define out_file dvifile #define out_buf dvibuf ! #endif /* TeX */ ! #ifdef MF #define dump_file basefile #define dump_path MFBASEPATH #define write_out writegf #define out_file gffile #define out_buf gfbuf ! #endif /* MF */ ! #ifdef MP ! #define dump_file memfile ! #define dump_path MPMEMPATH ! #endif /* MP */ *************** *** 72,82 **** #define writedvi(a, b) \ (void) fwrite ((char *) &dvibuf[a], sizeof (dvibuf[a]), \ (int) ((b) - (a) + 1), dvifile) ! #else #define writegf(a, b) \ (void) fwrite ((char *) &gfbuf[a], sizeof (gfbuf[a]), \ (int) ((b) - (a) + 1), gffile) ! #endif /* not TeX */ #else /* unix */ #define dumpcore abort --- 77,88 ---- #define writedvi(a, b) \ (void) fwrite ((char *) &dvibuf[a], sizeof (dvibuf[a]), \ (int) ((b) - (a) + 1), dvifile) ! #endif /* TeX */ ! #ifdef MF #define writegf(a, b) \ (void) fwrite ((char *) &gfbuf[a], sizeof (gfbuf[a]), \ (int) ((b) - (a) + 1), gffile) ! #endif /* MF */ #else /* unix */ #define dumpcore abort *************** *** 87,99 **** (int) ((end) - (start) + 1)) \ != (int) ((end) - (start) + 1)) \ FATAL_PERROR ("dvi file") ! #else #define writegf(start, end) \ if (write (fileno (gffile), (char *) &gfbuf[start], \ (int) ((end) - (start) + 1)) \ != (int) ((end) - (start) + 1)) \ FATAL_PERROR ("gf file") ! #endif /* not TeX */ #endif /* unix */ --- 93,106 ---- (int) ((end) - (start) + 1)) \ != (int) ((end) - (start) + 1)) \ FATAL_PERROR ("dvi file") ! #endif /* TeX */ ! #ifdef MF #define writegf(start, end) \ if (write (fileno (gffile), (char *) &gfbuf[start], \ (int) ((end) - (start) + 1)) \ != (int) ((end) - (start) + 1)) \ FATAL_PERROR ("gf file") ! #endif /* MF */ #endif /* unix */ *************** *** 189,199 **** #ifdef TeX extern boolean maketextex (); extern boolean maketextfm (); ! #else extern void main_body (); extern boolean initscreen (); extern boolean maketexmf (); extern void updatescreen (); extern void blankrectangle (); extern void paintrow (); ! #endif /* not TeX */ --- 196,211 ---- #ifdef TeX extern boolean maketextex (); extern boolean maketextfm (); ! #endif /* TeX */ ! #ifdef MF extern void main_body (); extern boolean initscreen (); extern boolean maketexmf (); extern void updatescreen (); extern void blankrectangle (); extern void paintrow (); ! #endif /* MF */ ! #ifdef MP ! extern boolean maketextfm (); ! extern boolean callmakempx (); ! #endif /* MP */ diff -cr ../kpse-2.6.orig/web2c/lib/texmfmem.h ./web2c/lib/texmfmem.h *** ../kpse-2.6.orig/web2c/lib/texmfmem.h Mon Jan 23 16:30:45 1995 --- ./web2c/lib/texmfmem.h Thu Apr 13 14:50:25 1995 *************** *** 94,110 **** #else /* not WORDS_BIGENDIAN */ struct { ! #if defined (TeX) && !defined (SMALLTeX) || !defined (TeX) && !defined (SMALLMF) halfword junk; ! #endif /* big TeX or big MF */ integer CINT; } u; struct { ! #if defined (TeX) && !defined (SMALLTeX) || !defined (TeX) && !defined (SMALLMF) halfword junk; ! #endif /* big TeX or big MF */ fourquarters QQQQ; } v; #endif /* not WORDS_BIGENDIAN */ --- 94,110 ---- #else /* not WORDS_BIGENDIAN */ struct { ! #if defined (TeX) && !defined (SMALLTeX) || !defined (TeX) && !defined (SMALLMF) && !defined(SMALLMP) halfword junk; ! #endif /* big TeX or big MF or big MP */ integer CINT; } u; struct { ! #if defined (TeX) && !defined (SMALLTeX) || !defined (TeX) && !defined (SMALLMF) && !defined(SMALLMP) halfword junk; ! #endif /* big TeX or big MF or big MP */ fourquarters QQQQ; } v; #endif /* not WORDS_BIGENDIAN */ diff -cr ../kpse-2.6.orig/web2c/man/Makefile.in ./web2c/man/Makefile.in *** ../kpse-2.6.orig/web2c/man/Makefile.in Thu Feb 3 13:48:34 1994 --- ./web2c/man/Makefile.in Sun May 7 20:28:03 1995 *************** *** 57,73 **** # TeX and MF source files. texinputdir = $(texmf_prefix)/tex mfinputdir = $(texmf_prefix)/mf # The top-level font directory. fontdir = $(texmf_prefix)/fonts # Where memory dumps are installed. fmtdir = $(texmf_prefix)/ini ! basedir = $(fmtdir) # Pool files. texpooldir = $(texmf_prefix)/ini ! mfpooldir = $(texpooldir) # The PostScript TFM and VF files get installed in subdirectories of # this directory, named for the typeface families of these directories. --- 57,76 ---- # TeX and MF source files. texinputdir = $(texmf_prefix)/tex mfinputdir = $(texmf_prefix)/mf + mpinputdir = $(texmf_prefix)/mp # The top-level font directory. fontdir = $(texmf_prefix)/fonts # Where memory dumps are installed. fmtdir = $(texmf_prefix)/ini ! basedir = $(texmf_prefix)/ini ! memdir = $(texmf_prefix)/ini # Pool files. texpooldir = $(texmf_prefix)/ini ! mfpooldir = $(texmf_prefix)/ini ! mppooldir = $(texmf_prefix)/ini # The PostScript TFM and VF files get installed in subdirectories of # this directory, named for the typeface families of these directories. *************** *** 110,115 **** --- 113,119 ---- latex.1 \ mf.1 \ mft.1 \ + mp.1 \ patgen.1 \ pktogf.1 \ pktype.1 \ *************** *** 156,169 **** done echo 's!@BINDIR@!$(bindir)!' >>sedscript echo 's!@INFODIR@!$(infodir)!' >>sedscript echo 's!@TEXINPUTDIR@!$(texinputdir)!' >>sedscript echo 's!@MFINPUTDIR@!$(mfinputdir)!' >>sedscript echo 's!@FONTDIR@!$(fontdir)!' >>sedscript echo 's!@FMTDIR@!$(fmtdir)!' >>sedscript echo 's!@BASEDIR@!$(basedir)!' >>sedscript ! echo "s!@TEXPOOLDIR@!$(texpooldir)!" >>sedscript echo 's!@MFPOOLDIR@!$(mfpooldir)!' >>sedscript echo 's!@LOCALMODES@!$(localmodes)!' >>sedscript Makefile: Makefile.in ../config.status --- 160,180 ---- done echo 's!@BINDIR@!$(bindir)!' >>sedscript echo 's!@INFODIR@!$(infodir)!' >>sedscript + echo 's!@TEXMF@!$(texmf_prefix)!' >>sedscript echo 's!@TEXINPUTDIR@!$(texinputdir)!' >>sedscript echo 's!@MFINPUTDIR@!$(mfinputdir)!' >>sedscript + echo 's!@MPINPUTDIR@!$(mpinputdir)!' >>sedscript echo 's!@FONTDIR@!$(fontdir)!' >>sedscript + echo 's!@FONTMAPDIR@!$(configdir)!' >>sedscript echo 's!@FMTDIR@!$(fmtdir)!' >>sedscript echo 's!@BASEDIR@!$(basedir)!' >>sedscript ! echo 's!@MEMDIR@!$(memdir)!' >>sedscript ! echo 's!@TEXPOOLDIR@!$(texpooldir)!' >>sedscript echo 's!@MFPOOLDIR@!$(mfpooldir)!' >>sedscript + echo 's!@MPPOOLDIR@!$(mppooldir)!' >>sedscript echo 's!@LOCALMODES@!$(localmodes)!' >>sedscript + echo 's!@plain.mp@!$(mpinputdir)/base/plain.mp' >>sedscript + echo 's!@mfplain.mp@!$(mpinputdir)/base/mfplain.mp' >>sedscript Makefile: Makefile.in ../config.status ========================================================================