Index: xdvi/Imakefile =================================================================== RCS file: /afs/dev.mit.edu/source/repository/third/tex/xdvi/Imakefile,v retrieving revision 1.1.1.1 retrieving revision 1.5 diff -u -r1.1.1.1 -r1.5 --- Imakefile 1996/10/09 06:42:21 1.1.1.1 +++ Imakefile 1996/11/09 20:23:38 1.5 @@ -2,18 +2,21 @@ * Imakefile for dvi previewer. */ -XCOMM The following seven lines are the crucial ones. +#if defined(SparcArchitecture) || defined(SGIArchitecture) OSDEFS=-DMSBITFIRST -OPTIONDEFS=-DUSE_PK -DBUTTONS -DGREY -DEFAULT_FONT_PATH=/usr/local/tex/fonts -DEFAULT_VF_PATH=/usr/local/tex/fonts/vf -DEFAULT_FONT_SIZES=$(SIZES300) -DEFAULT_FIG_PATH=/usr/local/tex/inputs -DEFAULT_HEADER_PATH=/usr/local/tex/ps - -LOCAL_LIBRARIES_TOOL=$(VARLIBS) XawClientLibs -DEPLIBS_TOOL=$(VARDEPLIBS) XawClientDepLibs -LINTLIBS_TOOL=$(VARLINT) $(LINTXAW) $(LINTXMU) $(LINTXTOOL) \ +#endif + +XCOMM The following seven lines are the crucial ones. +OPTIONDEFS=-DUSE_PK -DBUTTONS -DGREY -DBDPI=600 +DEFAULT_FONT_PATH=.:${USRLIBDIR}/tex/fonts/pk +DEFAULT_VF_PATH=.:${USRLIBDIR}/tex/fonts/vf +DEFAULT_FONT_SIZES=$(SIZES600) +DEFAULT_FIG_PATH=${USRLIBDIR}/tex/macros +DEFAULT_HEADER_PATH=${USRLIBDIR}/tex/ps + +LOCAL_LIBRARIES=$(VARLIBS) XawClientLibs +DEPLIBS=$(VARDEPLIBS) XawClientDepLibs +LINTLIBS=$(VARLINT) $(LINTXAW) $(LINTXMU) $(LINTXTOOL) \ $(LINTEXTENSIONLIB) $(LINTXLIB) -lm LOCAL_LIBRARIES_NOT=$(VARLIBS) $(XLIB) @@ -51,12 +54,10 @@ Makefile.cfg: Imakefile mkconfig ./mkconfig imake $(DEFS) -include Makefile.cfg - -SRCS=xdvi.c events.c dvi_init.c dvi_draw.c special.c font_open.c vf.c util.c \ - $(VARSRCS) -OBJS=xdvi.o events.o dvi_init.o dvi_draw.o special.o font_open.o vf.o util.o \ - $(VAROBJS) +SRCS=xdvi.c events.c dvi_init.c dvi_draw.c special.c font_open.c pk.c vf.c \ + util.c $(VARSRCS) +OBJS=xdvi.o events.o dvi_init.o dvi_draw.o special.o font_open.o pk.o vf.o \ + util.o $(VAROBJS) ComplexProgramTarget(xdvi) @@ -67,7 +68,6 @@ $(CC) $(CFLAGS) -o squeeze squeeze.c xdvi.man: xdvi_man.sed mksedscript - chmod u+x mksedscript ./mksedscript "$(DEFAULT_FONT_PATH)" $(DEFAULT_FONT_SIZES) \ "$(DEFAULT_VF_PATH)" "$(DEFAULT_FIG_PATH)" \ "$(DEFAULT_HEADER_PATH)" $(DEFS) > sedscript Index: xdvi/events.c =================================================================== RCS file: /afs/dev.mit.edu/source/repository/third/tex/xdvi/events.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- events.c 1996/10/09 06:42:18 1.1.1.1 +++ events.c 1996/11/09 20:22:35 1.2 @@ -147,10 +147,10 @@ } command_table[] = { {"Quit", "quit", 'q', 50}, - {"Shrink1", "sh1", 1 << 8 | 's', 150}, - {"Shrink2", "sh2", 2 << 8 | 's', 200}, - {"Shrink3", "sh3", 3 << 8 | 's', 250}, - {"Shrink4", "sh4", 4 << 8 | 's', 300}, + {"Shrink2", "sh1", 2 << 8 | 's', 150}, + {"Shrink4", "sh2", 4 << 8 | 's', 200}, + {"Shrink6", "sh3", 6 << 8 | 's', 250}, + {"Shrink8", "sh4", 8 << 8 | 's', 300}, {"Page-10", "prev10", 10 << 8 | 'p', 400}, {"Page-5", "prev5", 5 << 8 | 'p', 450}, {"Prev", "prev", 'p', 500}, Index: xdvi/xdvi.c =================================================================== RCS file: /afs/dev.mit.edu/source/repository/third/tex/xdvi/xdvi.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- xdvi.c 1996/10/09 06:42:17 1.1.1.1 +++ xdvi.c 1996/11/09 20:23:17 1.2 @@ -307,9 +307,9 @@ static XtResource application_resources[] = { {"shrinkFactor", "ShrinkFactor", XtRInt, sizeof(int), - offset(shrinkfactor), XtRString, "3"}, + offset(shrinkfactor), XtRString, "6"}, {"densityPercent", "DensityPercent", XtRInt, sizeof(int), - offset(_density), XtRString, "40"}, + offset(_density), XtRString, "20"}, #ifdef GREY {"gamma", "Gamma", XtRFloat, sizeof(float), offset(_gamma), XtRString, "1"}, Index: xdvi/xdvi.h =================================================================== RCS file: /afs/dev.mit.edu/source/repository/third/tex/xdvi/xdvi.h,v retrieving revision 1.1.1.1 retrieving revision 1.3 diff -u -r1.1.1.1 -r1.3 --- xdvi.h 1996/10/09 06:42:17 1.1.1.1 +++ xdvi.h 1996/11/09 20:23:58 1.3 @@ -131,7 +131,7 @@ #ifndef NORETURN #ifdef __GNUC__ -#define NORETURN volatile +#define NORETURN __volatile__ #else #define NORETURN /* nothing */ #endif Index: dvips/dvips/Makefile =================================================================== RCS file: /afs/dev.mit.edu/source/repository/third/tex/dvips/dvips/Makefile,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile 1996/10/09 06:40:17 1.1.1.1 +++ Makefile 1996/10/25 21:56:42 1.2 @@ -6,30 +6,30 @@ # where TeX is `rooted'. Sometimes /usr/local/lib/tex. # TEXDIR = /usr/lib/tex -TEXDIR = /usr/lib/tex +TEXDIR = /usr/athena/lib/tex # another place pk, tfm, and vf files might be found. # LOCALDIR = /LocalLibrary/Fonts/TeXFonts -LOCALDIR = /LocalLibrary/Fonts/TeXFonts +# LOCALDIR = /LocalLibrary/Fonts/TeXFonts # the default path to search for TFM files # (this usually is identical to TeX's defaultfontpath, which omits `.') # (private fonts are given an explicit directory, which overrides the path) # overridden by the environment variable TEXFONTS # TFMPATH = $(LOCALDIR)/tfm:$(TEXDIR)/fonts/tfm -TFMPATH = .:$(LOCALDIR)/tfm:$(TEXDIR)/fonts/tfm +TFMPATH = .:$(TEXDIR)/fonts/tfm # the default path to search for PK files (usually omits `.') # Don't forget to add the directory that # MakeTeXPK puts the files! (In this case, /LocalLibrary/Fonts...) # overridden by the environment variable TEXPKS or TEXPACKED or PKFONTS # PKPATH = $(LOCALDIR)/pk:$(TEXDIR)/fonts/pk -PKPATH = .:$(LOCALDIR)/pk:$(TEXDIR)/fonts/pk +PKPATH = .:$(TEXDIR)/fonts/pk # the default path to search for VF files (usually omits `.') # overridden by the environment variable VFFONTS # VFPATH = $(LOCALDIR)/vf:$(TEXDIR)/fonts/vf -VFPATH = .:$(LOCALDIR)/vf:$(TEXDIR)/fonts/vf +VFPATH = .:$(TEXDIR)/fonts/vf # additional directories in which to search for subdirectories to find # both tfm and pk files @@ -58,15 +58,15 @@ # where epsf.tex and rotate.tex go (usually the TeX macros directory) # TEXMACRODIR = $(TEXDIR)/inputs -TEXMACRODIR = $(TEXDIR)/inputs +TEXMACRODIR = $(TEXDIR)/macros # the default path to search for epsf and psfiles # (usually the same as TeX's defaultinputpath) # FIGPATH = .:..:$(TEXDIR)/inputs -FIGPATH = .:..:$(TEXDIR)/inputs +FIGPATH = .:..:$(TEXDIR)/macros # the place man pages are located. -MANDIR = /usr/man/man1 +MANDIR = /usr/athena/man/man1 # change -DDEFRES=300 or whatever is required # if the default resolution is not 300 dpi, @@ -85,16 +85,16 @@ # If your compiler doesn't like void*, then add # -DVOID=char # -DEFS= -DTPIC -DDEBUG -DDEFRES=400 -DCREATIONDATE +DEFS= -DTPIC -DDEBUG -DDEFRES=600 -DCREATIONDATE -DHAVE_GETCWD # either use # OPT = -O -funsigned-char # or -OPT = -g -Wall -funsigned-char +OPT = -O # libraries to include (-lm -lc on most systems) #FLIBS= -lNeXT_s -lsys_s -FLIBS= -lNeXT_s -lsys_s +FLIBS= -lm # If you are compiling dvips for suid or other privileges, you will # definitely want to define the following symbol; else don't. @@ -117,7 +117,7 @@ # where the installed binary goes # BINDIR = /usr/bin -BINDIR = /usr/bin +BINDIR = /usr/athena/bin PATHS = -DTFMPATH=\"$(TFMPATH)\" \ -DPKPATH=\"$(PKPATH)\" \ @@ -189,35 +189,35 @@ crop.pro config.ps psfonts.map epsf.tex epsf.sty rotate.tex \ rotate.sty colordvi.tex colordvi.sty blackdvi.tex blackdvi.sty \ dvips.tex dvipsmac.tex dvips.1 afm2tfm.1 - - mkdir $(BINDIR) - - mkdir $(CONFIGDIR) - - mkdir $(HEADERDIR) - - mkdir $(MANDIR) - - mkdir $(TEXMACRODIR) - $(INSTALL) -c -m 755 afm2tfm $(BINDIR)/afm2tfm - $(INSTALL) -c -m 755 dvips $(BINDIR)/dvips - $(INSTALL) -c -m 755 MakeTeXPK $(BINDIR)/MakeTeXPK - $(INSTALL) -c -m 644 tex.pro $(HEADERDIR) - $(INSTALL) -c -m 644 texc.pro $(HEADERDIR) - $(INSTALL) -c -m 644 texps.pro $(HEADERDIR) - $(INSTALL) -c -m 644 special.pro $(HEADERDIR) - $(INSTALL) -c -m 644 finclude.pro $(HEADERDIR) - $(INSTALL) -c -m 644 color.pro $(HEADERDIR) - $(INSTALL) -c -m 644 crop.pro $(HEADERDIR) - $(INSTALL) -c -m 644 config.ps $(CONFIGDIR)/$(CONFIGFILE) - $(INSTALL) -c -m 644 psfonts.map $(CONFIGDIR) - $(INSTALL) -c -m 644 epsf.tex $(TEXMACRODIR) - $(INSTALL) -c -m 644 epsf.sty $(TEXMACRODIR) - $(INSTALL) -c -m 644 rotate.tex $(TEXMACRODIR) - $(INSTALL) -c -m 644 rotate.sty $(TEXMACRODIR) - $(INSTALL) -c -m 644 colordvi.sty $(TEXMACRODIR) - $(INSTALL) -c -m 644 colordvi.tex $(TEXMACRODIR) - $(INSTALL) -c -m 644 blackdvi.sty $(TEXMACRODIR) - $(INSTALL) -c -m 644 blackdvi.tex $(TEXMACRODIR) - $(INSTALL) -c -m 644 dvips.tex $(TEXMACRODIR) - $(INSTALL) -c -m 644 dvipsmac.tex $(TEXMACRODIR) - - $(INSTALL) -c -m 644 dvips.1 $(MANDIR) - - $(INSTALL) -c -m 644 afm2tfm.1 $(MANDIR) + - mkdir ${DESTDIR}$(BINDIR) + - mkdir ${DESTDIR}$(CONFIGDIR) + - mkdir ${DESTDIR}$(HEADERDIR) + - mkdir ${DESTDIR}$(MANDIR) + - mkdir ${DESTDIR}$(TEXMACRODIR) + $(INSTALL) -c -m 755 afm2tfm ${DESTDIR}$(BINDIR)/afm2tfm + $(INSTALL) -c -m 755 dvips ${DESTDIR}$(BINDIR)/dvips + $(INSTALL) -c -m 755 MakeTeXPK ${DESTDIR}$(BINDIR)/MakeTeXPK + $(INSTALL) -c -m 644 tex.pro ${DESTDIR}$(HEADERDIR) + $(INSTALL) -c -m 644 texc.pro ${DESTDIR}$(HEADERDIR) + $(INSTALL) -c -m 644 texps.pro ${DESTDIR}$(HEADERDIR) + $(INSTALL) -c -m 644 special.pro ${DESTDIR}$(HEADERDIR) + $(INSTALL) -c -m 644 finclude.pro ${DESTDIR}$(HEADERDIR) + $(INSTALL) -c -m 644 color.pro ${DESTDIR}$(HEADERDIR) + $(INSTALL) -c -m 644 crop.pro ${DESTDIR}$(HEADERDIR) + $(INSTALL) -c -m 644 config.ps ${DESTDIR}$(CONFIGDIR)/$(CONFIGFILE) + $(INSTALL) -c -m 644 psfonts.map ${DESTDIR}$(CONFIGDIR) + $(INSTALL) -c -m 644 epsf.tex ${DESTDIR}$(TEXMACRODIR) + $(INSTALL) -c -m 644 epsf.sty ${DESTDIR}$(TEXMACRODIR) + $(INSTALL) -c -m 644 rotate.tex ${DESTDIR}$(TEXMACRODIR) + $(INSTALL) -c -m 644 rotate.sty ${DESTDIR}$(TEXMACRODIR) + $(INSTALL) -c -m 644 colordvi.sty ${DESTDIR}$(TEXMACRODIR) + $(INSTALL) -c -m 644 colordvi.tex ${DESTDIR}$(TEXMACRODIR) + $(INSTALL) -c -m 644 blackdvi.sty ${DESTDIR}$(TEXMACRODIR) + $(INSTALL) -c -m 644 blackdvi.tex ${DESTDIR}$(TEXMACRODIR) + $(INSTALL) -c -m 644 dvips.tex ${DESTDIR}$(TEXMACRODIR) + $(INSTALL) -c -m 644 dvipsmac.tex ${DESTDIR}$(TEXMACRODIR) + - $(INSTALL) -c -m 644 dvips.1 ${DESTDIR}$(MANDIR) + - $(INSTALL) -c -m 644 afm2tfm.1 ${DESTDIR}$(MANDIR) veryclean : rm -f *.o dvips squeeze afm2tfm texc.lpro *.pro *~ *.log *.dvi Index: dvips/dvips/afm2tfm.c =================================================================== RCS file: /afs/dev.mit.edu/source/repository/third/tex/dvips/dvips/afm2tfm.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- afm2tfm.c 1996/10/09 06:40:18 1.1.1.1 +++ afm2tfm.c 1996/10/25 21:57:03 1.2 @@ -19,11 +19,7 @@ #if defined(OS2) #include #endif -#if defined(SYSV) || defined(VMS) || defined(__THINK__) || defined(MSDOS) || defined(OS2) || defined(ATARIST) #include -#else -#include -#endif #include #ifdef ATARIST #include Index: dvips/dvips/config.ps =================================================================== RCS file: /afs/dev.mit.edu/source/repository/third/tex/dvips/dvips/config.ps,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- config.ps 1996/10/09 06:40:24 1.1.1.1 +++ config.ps 1996/10/25 22:01:43 1.2 @@ -6,15 +6,15 @@ * * And send output by default to the printer. * -o !lpr +o !lpr %P * * Default resolution. * -D 400 +D 600 * * Last resort sizes. * -R 100 120 144 300 360 400 432 480 +R 300 329 360 432 518 600 622 657 720 746 864 1037 1244 1493 * * Paper size information. First definition is the default. * Index: dvips/dvips/dvips.c =================================================================== RCS file: /afs/dev.mit.edu/source/repository/third/tex/dvips/dvips/dvips.c,v retrieving revision 1.1.1.1 retrieving revision 1.3 diff -u -r1.1.1.1 -r1.3 --- dvips.c 1996/10/09 06:40:19 1.1.1.1 +++ dvips.c 1997/08/12 03:40:46 1.3 @@ -460,6 +460,7 @@ int firstext = -1 ; #endif register sectiontype *sects ; + char *p, newoname[128]; #ifdef __THINK__ argc = dcommand(&argv) ; /* do I/O stream redirection */ @@ -861,6 +862,17 @@ } } while (queryoptions != 0) ; #endif + p = strstr(oname, "%P"); + if (p) { + strncpy(newoname, oname, p - oname); + newoname[p - oname] = 0; + if (printer && strlen(oname) + strlen(printer) + 1 <= sizeof(newoname)) { + strcat(newoname, "-P"); + strcat(newoname, printer); + } + strcat(newoname, p + 2); + } + oname = newstring(newoname); checkenv(1) ; /* * The logic here is a bit convoluted. Since all `additional' Index: dvips/dvips/dvips.h =================================================================== RCS file: /afs/dev.mit.edu/source/repository/third/tex/dvips/dvips/dvips.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- dvips.h 1996/10/09 06:40:18 1.1.1.1 +++ dvips.h 1996/10/25 22:05:06 1.2 @@ -14,11 +14,7 @@ #define BANNER \ "This is dvips 5.58 Copyright 1986, 1994 Radical Eye Software\n" #include -#if defined(SYSV) || defined(VMS) || defined(__THINK__) || defined(MSDOS) || defined(OS2) || defined(ATARIST) #include -#else -#include -#endif #if defined(lint) && defined(sun) extern char *sprintf() ; #endif Index: dvips/dvips/output.c =================================================================== RCS file: /afs/dev.mit.edu/source/repository/third/tex/dvips/dvips/output.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- output.c 1996/10/09 06:40:20 1.1.1.1 +++ output.c 1996/10/25 22:05:27 1.2 @@ -82,7 +82,7 @@ 0, 40258437L, 52099154L, "letter", "" } ; #ifdef CREATIONDATE -#if (!defined(VMS) && !defined(MSDOS) && !(defined(OS2) && defined(_MSC_VER)) && !defined(ATARIST) +#if (!defined(VMS) && !defined(MSDOS) && !(defined(OS2) && defined(_MSC_VER)) && !defined(ATARIST)) /* VAXC/MSDOS don't like/need this !! */ #include #include /* time(), at least on BSD Unix */ Index: dvips/dvips/resident.c =================================================================== RCS file: /afs/dev.mit.edu/source/repository/third/tex/dvips/dvips/resident.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- resident.c 1996/10/09 06:40:20 1.1.1.1 +++ resident.c 1996/10/20 22:59:44 1.2 @@ -632,9 +632,6 @@ } } (void)fclose(deffile) ; - } else { - if (printer) - error("! no such printer (can't find corresponding config file)") ; } }