diff -cNr tdr-1.7.orig/Makefile tdr-1.7/Makefile *** tdr-1.7.orig/Makefile Fri Apr 17 17:44:35 1998 --- tdr-1.7/Makefile Fri May 15 13:55:59 1998 *************** *** 22,32 **** LIB = libtdr.a PREFIX = /jlc/local MAINDIR = $(PREFIX)/src/redhat/BUILD/tdr-1.7-hp BINDIR = $(DESTDIR)$(PREFIX)/X11R6/bin LIBDIR = $(DESTDIR)$(PREFIX)/X11R6/lib ! MANDIR = $(DESTDIR)$(PREFIX)/X11R6/man/mann # The following should be site independent. --- 22,34 ---- LIB = libtdr.a PREFIX = /jlc/local + MANSEC = n + MANEXT = n MAINDIR = $(PREFIX)/src/redhat/BUILD/tdr-1.7-hp BINDIR = $(DESTDIR)$(PREFIX)/X11R6/bin LIBDIR = $(DESTDIR)$(PREFIX)/X11R6/lib ! MANDIR = $(DESTDIR)$(PREFIX)/X11R6/man/man$(MANSEC) # The following should be site independent. *************** *** 63,69 **** install: # ln -s $(MAINDIR)/$(LIB) ${LIBDIR}/$(LIB) cd $(TDRDIR); install -s tdr $(BINDIR); cd $(MAINDIR) ! cp ./man/pf.n $(MANDIR) ! cp ./man/tdr.n $(MANDIR) FRC: --- 65,71 ---- install: # ln -s $(MAINDIR)/$(LIB) ${LIBDIR}/$(LIB) cd $(TDRDIR); install -s tdr $(BINDIR); cd $(MAINDIR) ! cp ./man/pf.n $(MANDIR)/pf.$(MANEXT) ! cp ./man/tdr.n $(MANDIR)/tdr.$(MANEXT) FRC: diff -cNr tdr-1.7.orig/Makefile.orig tdr-1.7/Makefile.orig *** tdr-1.7.orig/Makefile.orig Thu Jan 1 09:00:00 1970 --- tdr-1.7/Makefile.orig Fri May 15 13:54:23 1998 *************** *** 0 **** --- 1,69 ---- + # Makefile for pf and tdr + # + # For SGI, + # Use "smake", which is similar to the BSD make. + # setenv SGI_CC -cckr Use non-ANSI C + # For HP-UX + # FFLAGS = +es +E1 -K +ppu + # LDFLAG = +U77 -L.. -ltdr -X11 + # + # + # Plese read README, before make + # + # make compile to compile + # make lib to make library + # make tdr to make TOPDRAWER + # make install to install tdr, library and manuals + # make clean to clean up the mess + # + # You may want to change the following lines for your site. + # + + LIB = libtdr.a + + PREFIX = /jlc/local + + MAINDIR = $(PREFIX)/src/redhat/BUILD/tdr-1.7-hp + BINDIR = $(DESTDIR)$(PREFIX)/X11R6/bin + LIBDIR = $(DESTDIR)$(PREFIX)/X11R6/lib + MANDIR = $(DESTDIR)$(PREFIX)/X11R6/man/mann + + # The following should be site independent. + + STRDIR = str + PFDIR = pf1.7 + TDRDIR = tdr1.6 + + SUBDIR = $(PFDIR) $(STRDIR) $(TDRDIR) + + all: + @echo "You should read README first."; exit + + compile : ${SUBDIR} + @echo ${MAINDIR} + + .RECURSIVE: ${SUBDIR} + + ${SUBDIR}: FRC + cd $@; make all + + lib: FRC + ar r $(LIB) $(TDRDIR)/*.o $(PFDIR)/*.o $(STRDIR)/*.o + ranlib $(LIB) + + tdr: + cd $(TDRDIR); make tdr; cd $(MAINDIR) + + clean: + for i in $(SUBDIR); do (cd $$i; make clean); done + rm -f $(LIB) + rm -f *.o *~ core + rm -f $(TDRDIR)/tdr + + install: + # ln -s $(MAINDIR)/$(LIB) ${LIBDIR}/$(LIB) + cd $(TDRDIR); install -s tdr $(BINDIR); cd $(MAINDIR) + cp ./man/pf.n $(MANDIR) + cp ./man/tdr.n $(MANDIR) + + FRC: diff -cNr tdr-1.7.orig/pf1.7/Makefile tdr-1.7/pf1.7/Makefile *** tdr-1.7.orig/pf1.7/Makefile Thu Aug 22 20:01:08 1996 --- tdr-1.7/pf1.7/Makefile Fri May 15 14:06:59 1998 *************** *** 4,10 **** ##FFLAGS = -O0 -static ##CFLAGS = -O0 # For HP-UX ! FFLAGS = +es +E1 -K +ppu CFLAGS = OBJF = duplex.o pftext.o pfvects.o pfxtext.o \ --- 4,13 ---- ##FFLAGS = -O0 -static ##CFLAGS = -O0 # For HP-UX ! ## FFLAGS = +es +E1 -K +ppu ! ## CFLAGS = ! FFLAGS = -fno-automatic -fno-globals -Wno-globals -fno-f90 -fugly-complex \ ! -fugly-init -fdollar-ok -fno-backslash CFLAGS = OBJF = duplex.o pftext.o pfvects.o pfxtext.o \ diff -cNr tdr-1.7.orig/pf1.7/Makefile.orig tdr-1.7/pf1.7/Makefile.orig *** tdr-1.7.orig/pf1.7/Makefile.orig Thu Jan 1 09:00:00 1970 --- tdr-1.7/pf1.7/Makefile.orig Fri May 15 13:54:23 1998 *************** *** 0 **** --- 1,36 ---- + F77 = f77 + CC = cc + + ##FFLAGS = -O0 -static + ##CFLAGS = -O0 + # For HP-UX + FFLAGS = +es +E1 -K +ppu + CFLAGS = + + OBJF = duplex.o pftext.o pfvects.o pfxtext.o \ + simplex.o ubcfont.o ugd001.o uge001.o + + OBJC = pfclos.o pfclr.o pfcolor.o pfcros.o pfdesX.o pfevtX.o pfgdev.o \ + pfgscal.o pfgscrn.o \ + pfine.o pflush.o pfoine.o pfopen.o pfpr.o pfratio.o \ + pfsave.o pfscrn.o pfsymble.o pftextd.o \ + pftstdv.o pfvect.o pfwdow.o pfwidth.o \ + plcanput.o plcanscal.o plclos.o plclr.o plcreX.o \ + plcvdv.o plcvdvs.o plddiv.o pldesX.o pldvscal.o pline.o pllseg.o \ + plmax2.o plmin2.o \ + plmax3.o plmin3.o plopen.o plpage.o plpr.o plrescal.o plrevers.o \ + plsave.o plsav_fp.o plscal.o \ + plscrn.o plscrnms.o plscrnmx.o plsort.o plvect.o plwdow.o + + INC = plot.h + + all: $(OBJF) $(OBJC) $(INC) + + $(OBJF): + $(F77) -c $(FFLAGS) $*.f + + $(OBJC): + $(CC) -c $(CFLAGS) $*.c + + clean : + rm -f *.o *~ Binary files tdr-1.7.orig/pf1.7/duplex.o and tdr-1.7/pf1.7/duplex.o differ diff -cNr tdr-1.7.orig/pf1.7/plclr.c tdr-1.7/pf1.7/plclr.c *** tdr-1.7.orig/pf1.7/plclr.c Thu Aug 22 20:01:15 1996 --- tdr-1.7/pf1.7/plclr.c Fri May 15 13:34:49 1998 *************** *** 82,91 **** XClearWindow( XDISPLAY, XWINDOW ); if( DEVICE_N == X || DEVICE_N == XM ) { screen = DefaultScreen( XDISPLAY ); ! XSetForeground( XDISPLAY, PGC, BlackPixel( XDISPLAY, screen ) ); XFillRectangle( XDISPLAY, XPIXMAP, PGC, 0, 0, XWINDOW_XSIZE+1, XWINDOW_YSIZE+2 ); ! XSetForeground( XDISPLAY, PGC, WhitePixel( XDISPLAY, screen ) ); } XFlush( XDISPLAY ); } --- 82,91 ---- XClearWindow( XDISPLAY, XWINDOW ); if( DEVICE_N == X || DEVICE_N == XM ) { screen = DefaultScreen( XDISPLAY ); ! XSetForeground( XDISPLAY, PGC, WhitePixel( XDISPLAY, screen ) ); XFillRectangle( XDISPLAY, XPIXMAP, PGC, 0, 0, XWINDOW_XSIZE+1, XWINDOW_YSIZE+2 ); ! XSetForeground( XDISPLAY, PGC, BlackPixel( XDISPLAY, screen ) ); } XFlush( XDISPLAY ); } diff -cNr tdr-1.7.orig/pf1.7/plclr.c.orig tdr-1.7/pf1.7/plclr.c.orig *** tdr-1.7.orig/pf1.7/plclr.c.orig Thu Jan 1 09:00:00 1970 --- tdr-1.7/pf1.7/plclr.c.orig Fri May 15 13:54:24 1998 *************** *** 0 **** --- 1,111 ---- + #include "plot.h" + + plclr() /* Clear the display device. */ + + { + int screen; + FILE *fp, *plsav_fp(); + + if( DEVICE_N == NECPC100 ) + { + putchar( US ); /* Close */ + putchar( ESC ); /* Clear */ + putchar( '[' ); + putchar( '2' ); + putchar( 'J' ); + putchar( ESC ); + putchar( '[' ); + putchar( 'H' ); + putchar( GS ); /* Open */ + putchar( VT ); + } + else if( DEVICE_N == TEK4010 ) + { + putchar( ESC ); /* Close */ + putchar( '"' ); + putchar( 'g' ); + putchar( ESC ); /* Clear */ + putchar( '[' ); + putchar( '2' ); + putchar( 'J' ); + putchar( ESC ); + putchar( '[' ); + putchar( 'H' ); + putchar( GS ); /* Open */ + putchar( US ); + putchar( ESC ); + putchar( FF ); + putchar( CAN ); + } + else if( DEVICE_N == KERMIT ) + { + putchar( CAN ); /* Close */ + putchar( ESC ); /* Clear */ + putchar( '[' ); + putchar( '2' ); + putchar( 'J' ); + putchar( ESC ); + putchar( '[' ); + putchar( 'H' ); + putchar( GS ); /* Open */ + putchar( US ); + putchar( ESC ); + putchar( FF ); + putchar( CAN ); + } + else if( DEVICE_N == PC98VT ) + { + putchar( 'j' ); /* Close */ + putchar( 'c' ); + putchar( 'b' ); + putchar( ESC ); + putchar( ')' ); + putchar( 'A' ); + putchar( SI ); + putchar( ESC ); /* Clear */ + putchar( '[' ); + putchar( '2' ); + putchar( 'J' ); + putchar( ESC ); + putchar( '[' ); + putchar( 'H' ); + putchar( ESC ); /* Open */ + putchar( 0x29 ); + putchar( 0x31 ); + putchar( SO ); + putchar( 0x61 ); + putchar( 0x63 ); + } + else if( DEVICE_N == X || DEVICE_N == XM + || DEVICE_N == XN || DEVICE_N == XMN ) /* X window */ + { + XClearWindow( XDISPLAY, XWINDOW ); + if( DEVICE_N == X || DEVICE_N == XM ) { + screen = DefaultScreen( XDISPLAY ); + XSetForeground( XDISPLAY, PGC, BlackPixel( XDISPLAY, screen ) ); + XFillRectangle( XDISPLAY, XPIXMAP, PGC, 0, 0, + XWINDOW_XSIZE+1, XWINDOW_YSIZE+2 ); + XSetForeground( XDISPLAY, PGC, WhitePixel( XDISPLAY, screen ) ); + } + XFlush( XDISPLAY ); + } + else if( DEVICE_N == POSTSCRIPT + || DEVICE_N == POSTSCRIPTM + || DEVICE_N == LBP8 + || DEVICE_N == CANONLBP ) + { + if( PS_STATE != PS_HEAD ) + { + fp = plsav_fp( RESTORE, 0 ); + fprintf( fp, "%sPage: %d %d\n", "%%", + ++PS_PAGE, PS_PAGE ); + plpage( fp, PS_HEAD, ORIENTATION ); + PS_STATE = PS_HEAD; + } + } + else + { + fprintf( stderr, "ERROR in PLCLR: Device not open yet." ); + return; + } + } diff -cNr tdr-1.7.orig/pf1.7/plcreX.c tdr-1.7/pf1.7/plcreX.c *** tdr-1.7.orig/pf1.7/plcreX.c Thu Aug 22 20:10:57 1996 --- tdr-1.7/pf1.7/plcreX.c Fri May 15 13:34:49 1998 *************** *** 31,38 **** XWINDOW = XCreateSimpleWindow( XDISPLAY, RootWindow( XDISPLAY, screen ), xpos, ypos, xsize, ysize, border_width, ! WhitePixel( XDISPLAY, screen ), ! BlackPixel( XDISPLAY, screen ) ); XSelectInput( XDISPLAY, XWINDOW, ExposureMask ); XChangeProperty( XDISPLAY, XWINDOW, XA_WM_NAME, XA_STRING, 8, --- 31,38 ---- XWINDOW = XCreateSimpleWindow( XDISPLAY, RootWindow( XDISPLAY, screen ), xpos, ypos, xsize, ysize, border_width, ! BlackPixel( XDISPLAY, screen ), ! WhitePixel( XDISPLAY, screen ) ); XSelectInput( XDISPLAY, XWINDOW, ExposureMask ); XChangeProperty( XDISPLAY, XWINDOW, XA_WM_NAME, XA_STRING, 8, *************** *** 43,58 **** mask = GCLineWidth | GCForeground; values.line_width = 1; ! values.foreground = WhitePixel( XDISPLAY, screen ); XGC = XCreateGC( XDISPLAY, XWINDOW, mask, &values ); CMAP = DefaultColormap( XDISPLAY, screen ); if( pixmap ) { XPIXMAP = XCreatePixmap( XDISPLAY, XWINDOW, xsize, ysize, DefaultDepth( XDISPLAY, screen ) ); PGC = XCreateGC( XDISPLAY, XPIXMAP, mask, &values ); - XSetForeground( XDISPLAY, PGC, BlackPixel( XDISPLAY, screen ) ); - XFillRectangle( XDISPLAY, XPIXMAP, PGC, 0, 0, xsize, ysize ); XSetForeground( XDISPLAY, PGC, WhitePixel( XDISPLAY, screen ) ); } XFlush( XDISPLAY ); } --- 43,58 ---- mask = GCLineWidth | GCForeground; values.line_width = 1; ! values.foreground = BlackPixel( XDISPLAY, screen ); XGC = XCreateGC( XDISPLAY, XWINDOW, mask, &values ); CMAP = DefaultColormap( XDISPLAY, screen ); if( pixmap ) { XPIXMAP = XCreatePixmap( XDISPLAY, XWINDOW, xsize, ysize, DefaultDepth( XDISPLAY, screen ) ); PGC = XCreateGC( XDISPLAY, XPIXMAP, mask, &values ); XSetForeground( XDISPLAY, PGC, WhitePixel( XDISPLAY, screen ) ); + XFillRectangle( XDISPLAY, XPIXMAP, PGC, 0, 0, xsize, ysize ); + XSetForeground( XDISPLAY, PGC, BlackPixel( XDISPLAY, screen ) ); } XFlush( XDISPLAY ); } diff -cNr tdr-1.7.orig/pf1.7/plcreX.c.orig tdr-1.7/pf1.7/plcreX.c.orig *** tdr-1.7.orig/pf1.7/plcreX.c.orig Thu Jan 1 09:00:00 1970 --- tdr-1.7/pf1.7/plcreX.c.orig Fri May 15 13:54:24 1998 *************** *** 0 **** --- 1,58 ---- + #include "plot.h" + #include + + /* + Create X window. + */ + + plcreX( xpos, ypos, xsize, ysize, title, pixmap ) + int xpos; /* Window position X */ + int ypos; /* Window position Y */ + int xsize; /* Window size X */ + int ysize; /* Window size Y */ + char *title; /* Window's title */ + int pixmap; /* 1 for create Pixel map, 0 for no create */ + { + int screen; + int border_width; + XGCValues values; + XEvent event; + unsigned long mask; + + if( getenv( "DISPLAY" ) == NULL ) + { + fprintf( stderr, "Please setenv DISPLAY.\n" ); + exit(0); + } + XDISPLAY = XOpenDisplay( "" ); + if( !XDISPLAY ) exit(0); /* Failed to connect with the server */ + screen = DefaultScreen( XDISPLAY ); + border_width = 4; + XWINDOW = XCreateSimpleWindow( XDISPLAY, + RootWindow( XDISPLAY, screen ), + xpos, ypos, xsize, ysize, border_width, + WhitePixel( XDISPLAY, screen ), + BlackPixel( XDISPLAY, screen ) ); + XSelectInput( XDISPLAY, XWINDOW, ExposureMask ); + XChangeProperty( XDISPLAY, XWINDOW, + XA_WM_NAME, XA_STRING, 8, + PropModeReplace, + title, + strlen( title ) ); + XMapWindow( XDISPLAY, XWINDOW ); + + mask = GCLineWidth | GCForeground; + values.line_width = 1; + values.foreground = WhitePixel( XDISPLAY, screen ); + XGC = XCreateGC( XDISPLAY, XWINDOW, mask, &values ); + CMAP = DefaultColormap( XDISPLAY, screen ); + if( pixmap ) { + XPIXMAP = XCreatePixmap( XDISPLAY, XWINDOW, xsize, ysize, + DefaultDepth( XDISPLAY, screen ) ); + PGC = XCreateGC( XDISPLAY, XPIXMAP, mask, &values ); + XSetForeground( XDISPLAY, PGC, BlackPixel( XDISPLAY, screen ) ); + XFillRectangle( XDISPLAY, XPIXMAP, PGC, 0, 0, xsize, ysize ); + XSetForeground( XDISPLAY, PGC, WhitePixel( XDISPLAY, screen ) ); + } + XFlush( XDISPLAY ); + } diff -cNr tdr-1.7.orig/str/Makefile tdr-1.7/str/Makefile *** tdr-1.7.orig/str/Makefile Thu Aug 22 20:01:22 1996 --- tdr-1.7/str/Makefile Fri May 15 14:07:22 1998 *************** *** 3,9 **** ##FFLAGS = -static -C -g3 -O0 # For HP-UX ! FFLAGS = +es +E1 -K +ppu CFLAGS = OBJF = chrupc.o strupc.o --- 3,12 ---- ##FFLAGS = -static -C -g3 -O0 # For HP-UX ! # FFLAGS = +es +E1 -K +ppu ! # CFLAGS = ! FFLAGS = -fno-automatic -fno-globals -Wno-globals -fno-f90 -fugly-complex \ ! -fugly-init -fdollar-ok -fno-backslash CFLAGS = OBJF = chrupc.o strupc.o diff -cNr tdr-1.7.orig/str/Makefile.orig tdr-1.7/str/Makefile.orig *** tdr-1.7.orig/str/Makefile.orig Thu Jan 1 09:00:00 1970 --- tdr-1.7/str/Makefile.orig Fri May 15 13:54:24 1998 *************** *** 0 **** --- 1,24 ---- + F77 = f77 + CC = cc + + ##FFLAGS = -static -C -g3 -O0 + # For HP-UX + FFLAGS = +es +E1 -K +ppu + CFLAGS = + + OBJF = chrupc.o strupc.o + + OBJC = getlett.o index_f77.o strlenf.o strzblk.o + + INC = + + all: $(OBJF) $(OBJC) $(INC) + + $(OBJF): + $(F77) -c $(FFLAGS) $*.f + + $(OBJC): + $(CC) -c $(CFLAGS) $*.c + + clean : + rm -f *.o *~ diff -cNr tdr-1.7.orig/tdr1.6/Makefile tdr-1.7/tdr1.6/Makefile *** tdr-1.7.orig/tdr1.6/Makefile Fri Apr 17 17:31:25 1998 --- tdr-1.7/tdr1.6/Makefile Fri May 15 14:10:29 1998 *************** *** 3,11 **** ##LDFLAG = -L.. -ltdr -lX11 ##F77 = f77 # For HP-UX ! FFLAGS = +es +E1 -K +ppu ! LDFLAG = +U77 -L.. -ltdr -L/jlc/local/X11R6/lib -lX11 -lm ! F77 = fort77 OBJ = tdr.o --- 3,14 ---- ##LDFLAG = -L.. -ltdr -lX11 ##F77 = f77 # For HP-UX ! # FFLAGS = +es +E1 -K +ppu ! # LDFLAG = +U77 -L.. -ltdr -L/jlc/local/X11R6/lib -lX11 -lm ! FFLAGS = -fno-automatic -fno-globals -Wno-globals -fno-f90 -fugly-complex \ ! -fugly-init -fdollar-ok -fno-backslash ! LDFLAG = -L.. -ltdr -L/usr/X11R6/lib -lX11 -lm ! F77 = f77 OBJ = tdr.o diff -cNr tdr-1.7.orig/tdr1.6/Makefile.orig tdr-1.7/tdr1.6/Makefile.orig *** tdr-1.7.orig/tdr1.6/Makefile.orig Thu Jan 1 09:00:00 1970 --- tdr-1.7/tdr1.6/Makefile.orig Fri May 15 13:54:24 1998 *************** *** 0 **** --- 1,40 ---- + PROG = tdr + ##FFLAGS = -static -g3 -O0 + ##LDFLAG = -L.. -ltdr -lX11 + ##F77 = f77 + # For HP-UX + FFLAGS = +es +E1 -K +ppu + LDFLAG = +U77 -L.. -ltdr -L/jlc/local/X11R6/lib -lX11 -lm + F77 = fort77 + + OBJ = tdr.o + + OBJL = topdrw.o tdblock.o \ + errtra.o pdump.o \ + t2intr.o t2stl1.o t2stlm.o \ + tx3txt.o txcont.o txcset.o txdef1.o \ + txdevc.o txdot.o txend.o txline.o txlinx.o txlpat.o txnext.o \ + txopen.o txscis.o txsym.o txtext.o txtime.o txtsym.o txvoid.o \ + pxangle.o pxcase.o pxcolor.o pxdev.o pxfont.o \ + pxgtarg.o pxgtcol.o pxgtdev.o \ + pxgtfn.o pxgtkwd.o pxgtopt.o pxlen.o pxmark.o pxpick.o \ + pxparse.o pxplin.o pxplins.o pxprep.o pxscrn.o pxsize.o \ + pxstptn.o pxtexsty.o pxtext.o + + INC = + + tdr : $(OBJ) TOUCH + $(F77) $(FFLAGS) $(OBJ) $(LDFLAG) -o $(PROG) + + all : $(OBJL) $(INC) + + $(OBJ) : + $(F77) $(FFLAGS) -c tdr.f + + $(OBJL) : + $(F77) $(FFLAGS) -c $*.f + + clean : + rm -f *.o core + + TOUCH : diff -cNr tdr-1.7.orig/tdr1.6/pxcase.f tdr-1.7/tdr1.6/pxcase.f *** tdr-1.7.orig/tdr1.6/pxcase.f Thu Aug 22 20:01:24 1996 --- tdr-1.7/tdr1.6/pxcase.f Fri May 15 13:34:50 1998 *************** *** 23,28 **** --- 23,30 ---- character*1 c integer*4 strlenf integer*4 textlen + integer*4 ix41, ix5a + data ix41/z'41'/, ix5a/z'5a'/ c pxcase = .true. c *************** *** 35,41 **** text( i:i ) = c else if( case .eq. 'l' .or. case .eq. 'L' ) then lc = ichar( c ) ! if( lc .ge. '41'x .and. lc .le. '5a'x ) then c Upper case text( i:i ) = char( lc + 32 ) else --- 37,44 ---- text( i:i ) = c else if( case .eq. 'l' .or. case .eq. 'L' ) then lc = ichar( c ) ! cmt4 if( lc .ge. '41'x .and. lc .le. '5a'x ) then ! if( lc .ge. ix41 .and. lc .le. ix5a ) then c Upper case text( i:i ) = char( lc + 32 ) else diff -cNr tdr-1.7.orig/tdr1.6/pxcase.f.orig tdr-1.7/tdr1.6/pxcase.f.orig *** tdr-1.7.orig/tdr1.6/pxcase.f.orig Thu Jan 1 09:00:00 1970 --- tdr-1.7/tdr1.6/pxcase.f.orig Fri May 15 13:54:24 1998 *************** *** 0 **** --- 1,52 ---- + logical function pxcase( ptext, stext, text ) + c + c Judge whether the stext is made of only blank or lower case + c specifications. + c + c ( Inputs ) + c ptext -- Primary text string + c stext -- Seconadry text string + c + c ( Outputs ) + c text --- Output text, if the stext is made of only blank or lower case + c specifications. + c + implicit none + c + character*(*) ptext + character*(*) stext + character*(*) text + c + integer*4 i + integer*4 lc + character*1 case + character*1 c + integer*4 strlenf + integer*4 textlen + c + pxcase = .true. + c + textlen = min0( len( stext ), strlenf( ptext ) ) + c + do i = 1, min0( textlen, 255 ) + case = stext( i:i ) + c = ptext( i:i ) + if( case .eq. ' ' ) then + text( i:i ) = c + else if( case .eq. 'l' .or. case .eq. 'L' ) then + lc = ichar( c ) + if( lc .ge. '41'x .and. lc .le. '5a'x ) then + c Upper case + text( i:i ) = char( lc + 32 ) + else + c Non upper case + text( i:i ) = c + endif + else + text( i:i ) = case + pxcase = .false. + endif + enddo + c + return + end diff -cNr tdr-1.7.orig/tdr1.6/pxplin.f tdr-1.7/tdr1.6/pxplin.f *** tdr-1.7.orig/tdr1.6/pxplin.f Thu Aug 22 20:01:27 1996 --- tdr-1.7/tdr1.6/pxplin.f Fri May 15 13:34:50 1998 *************** *** 43,49 **** else int3 = 1 + ( kbts - 1 ) / 32 int4 = mod( kbts - 1, 32 ) + 1 ! if( ( bbts( int3 ) .and. bits( int4 ) ) .ne. 0 ) ibbt = 1 endif endif call pfvect( XARAY( i ), YARAY( i ), ibbt ) --- 43,50 ---- else int3 = 1 + ( kbts - 1 ) / 32 int4 = mod( kbts - 1, 32 ) + 1 ! cmt4 if( ( bbts( int3 ) .and. bits( int4 ) ) .ne. 0 ) ibbt = 1 ! if( iand( bbts( int3 ),bits( int4 ) ) .ne. 0 ) ibbt = 1 endif endif call pfvect( XARAY( i ), YARAY( i ), ibbt ) diff -cNr tdr-1.7.orig/tdr1.6/pxplin.f.orig tdr-1.7/tdr1.6/pxplin.f.orig *** tdr-1.7.orig/tdr1.6/pxplin.f.orig Thu Jan 1 09:00:00 1970 --- tdr-1.7/tdr1.6/pxplin.f.orig Fri May 15 13:54:25 1998 *************** *** 0 **** --- 1,58 ---- + subroutine pxplin( XARAY, YARAY, NPOINTS, BBTS, NBTS ) + c + c This is a replacement of ugplin. + c + implicit none + c + integer NPOINTS + real XARAY( NPOINTS ) + real YARAY( NPOINTS ) + integer BBTS( NPOINTS ) + integer NBTS + c + integer i + integer ibts + integer kbts + integer ibbt + integer bits( 32 ) + integer int3 + integer int4 + logical btfg + c + data BITS/Z'80000000',Z'40000000',Z'20000000',Z'10000000', + 1 Z'08000000',Z'04000000',Z'02000000',Z'01000000', + 1 Z'00800000',Z'00400000',Z'00200000',Z'00100000', + 1 Z'00080000',Z'00040000',Z'00020000',Z'00010000', + 1 Z'00008000',Z'00004000',Z'00002000',Z'00001000', + 1 Z'00000800',Z'00000400',Z'00000200',Z'00000100', + 1 Z'00000080',Z'00000040',Z'00000020',Z'00000010', + 1 Z'00000008',Z'00000004',Z'00000002',Z'00000001'/ + c + ibts = nbts + btfg = .true. + if( ibts .le. 0 ) then + ibts = - ibts + btfg = .false. + endif + kbts = 0 + do i = 1, NPOINTS + ibbt = 0 + if( kbts .ne. 0 ) then + if( btfg ) then + if( bbts( kbts ) .ne. 0 ) ibbt = 1 + else + int3 = 1 + ( kbts - 1 ) / 32 + int4 = mod( kbts - 1, 32 ) + 1 + if( ( bbts( int3 ) .and. bits( int4 ) ) .ne. 0 ) ibbt = 1 + endif + endif + call pfvect( XARAY( i ), YARAY( i ), ibbt ) + if( kbts .ge. ibts ) then + kbts = 1 + else + kbts = kbts + 1 + endif + enddo + c + return + end diff -cNr tdr-1.7.orig/tdr1.6/pxplins.f tdr-1.7/tdr1.6/pxplins.f *** tdr-1.7.orig/tdr1.6/pxplins.f Thu Aug 22 20:01:27 1996 --- tdr-1.7/tdr1.6/pxplins.f Fri May 15 13:34:50 1998 *************** *** 44,50 **** else int3 = 1 + ( kbts - 1 ) / 32 int4 = mod( kbts - 1, 32 ) + 1 ! if( ( bbts( int3 ) .and. bits( int4 ) ) .ne. 0 ) ibbt = 1 endif endif call pfvects( style, XARAY( i ), YARAY( i ), ibbt ) --- 44,51 ---- else int3 = 1 + ( kbts - 1 ) / 32 int4 = mod( kbts - 1, 32 ) + 1 ! cmt4 if( ( bbts( int3 ) .and. bits( int4 ) ) .ne. 0 ) ibbt = 1 ! if( iand( bbts( int3 ),bits( int4 ) ) .ne. 0 ) ibbt = 1 endif endif call pfvects( style, XARAY( i ), YARAY( i ), ibbt ) diff -cNr tdr-1.7.orig/tdr1.6/pxplins.f.orig tdr-1.7/tdr1.6/pxplins.f.orig *** tdr-1.7.orig/tdr1.6/pxplins.f.orig Thu Jan 1 09:00:00 1970 --- tdr-1.7/tdr1.6/pxplins.f.orig Fri May 15 13:54:25 1998 *************** *** 0 **** --- 1,59 ---- + subroutine pxplins( style, XARAY, YARAY, NPOINTS, BBTS, NBTS ) + c + c This is a replacement of ugplin and the upgrade of pxplin. + c + implicit none + c + integer style + integer NPOINTS + real XARAY( NPOINTS ) + real YARAY( NPOINTS ) + integer BBTS( NPOINTS ) + integer NBTS + c + integer i + integer ibts + integer kbts + integer ibbt + integer bits( 32 ) + integer int3 + integer int4 + logical btfg + c + data BITS/Z'80000000',Z'40000000',Z'20000000',Z'10000000', + 1 Z'08000000',Z'04000000',Z'02000000',Z'01000000', + 1 Z'00800000',Z'00400000',Z'00200000',Z'00100000', + 1 Z'00080000',Z'00040000',Z'00020000',Z'00010000', + 1 Z'00008000',Z'00004000',Z'00002000',Z'00001000', + 1 Z'00000800',Z'00000400',Z'00000200',Z'00000100', + 1 Z'00000080',Z'00000040',Z'00000020',Z'00000010', + 1 Z'00000008',Z'00000004',Z'00000002',Z'00000001'/ + c + ibts = nbts + btfg = .true. + if( ibts .le. 0 ) then + ibts = - ibts + btfg = .false. + endif + kbts = 0 + do i = 1, NPOINTS + ibbt = 0 + if( kbts .ne. 0 ) then + if( btfg ) then + if( bbts( kbts ) .ne. 0 ) ibbt = 1 + else + int3 = 1 + ( kbts - 1 ) / 32 + int4 = mod( kbts - 1, 32 ) + 1 + if( ( bbts( int3 ) .and. bits( int4 ) ) .ne. 0 ) ibbt = 1 + endif + endif + call pfvects( style, XARAY( i ), YARAY( i ), ibbt ) + if( kbts .ge. ibts ) then + kbts = 1 + else + kbts = kbts + 1 + endif + enddo + c + return + end diff -cNr tdr-1.7.orig/tdr1.6/pxplinx.f tdr-1.7/tdr1.6/pxplinx.f *** tdr-1.7.orig/tdr1.6/pxplinx.f Thu Aug 22 20:01:27 1996 --- tdr-1.7/tdr1.6/pxplinx.f Fri May 15 13:34:50 1998 *************** *** 45,51 **** else int3 = 1 + ( kbts - 1 ) / 32 int4 = mod( kbts - 1, 32 ) + 1 ! if( ( bbts( int3 ) .and. bits( int4 ) ) .ne. 0 ) ibbt = 1 endif endif call pfcolor( color ) --- 45,52 ---- else int3 = 1 + ( kbts - 1 ) / 32 int4 = mod( kbts - 1, 32 ) + 1 ! cmt4 if( ( bbts( int3 ) .and. bits( int4 ) ) .ne. 0 ) ibbt = 1 ! if( iand( bbts( int3 ) ,bits( int4 ) ) .ne. 0 ) ibbt = 1 endif endif call pfcolor( color ) diff -cNr tdr-1.7.orig/tdr1.6/pxplinx.f.orig tdr-1.7/tdr1.6/pxplinx.f.orig *** tdr-1.7.orig/tdr1.6/pxplinx.f.orig Thu Jan 1 09:00:00 1970 --- tdr-1.7/tdr1.6/pxplinx.f.orig Fri May 15 13:54:25 1998 *************** *** 0 **** --- 1,61 ---- + subroutine pxplinx( style, color, XARAY, YARAY, NPOINTS, BBTS, NBTS ) + c + c This is a replacement of ugplin and the upgrade of pxplin. + c + implicit none + c + integer style + integer color + integer NPOINTS + real XARAY( NPOINTS ) + real YARAY( NPOINTS ) + integer BBTS( NPOINTS ) + integer NBTS + c + integer i + integer ibts + integer kbts + integer ibbt + integer bits( 32 ) + integer int3 + integer int4 + logical btfg + c + data BITS/Z'80000000',Z'40000000',Z'20000000',Z'10000000', + 1 Z'08000000',Z'04000000',Z'02000000',Z'01000000', + 1 Z'00800000',Z'00400000',Z'00200000',Z'00100000', + 1 Z'00080000',Z'00040000',Z'00020000',Z'00010000', + 1 Z'00008000',Z'00004000',Z'00002000',Z'00001000', + 1 Z'00000800',Z'00000400',Z'00000200',Z'00000100', + 1 Z'00000080',Z'00000040',Z'00000020',Z'00000010', + 1 Z'00000008',Z'00000004',Z'00000002',Z'00000001'/ + c + ibts = nbts + btfg = .true. + if( ibts .le. 0 ) then + ibts = - ibts + btfg = .false. + endif + kbts = 0 + do i = 1, NPOINTS + ibbt = 0 + if( kbts .ne. 0 ) then + if( btfg ) then + if( bbts( kbts ) .ne. 0 ) ibbt = 1 + else + int3 = 1 + ( kbts - 1 ) / 32 + int4 = mod( kbts - 1, 32 ) + 1 + if( ( bbts( int3 ) .and. bits( int4 ) ) .ne. 0 ) ibbt = 1 + endif + endif + call pfcolor( color ) + call pfvects( style, XARAY( i ), YARAY( i ), ibbt ) + if( kbts .ge. ibts ) then + kbts = 1 + else + kbts = kbts + 1 + endif + enddo + c + return + end diff -cNr tdr-1.7.orig/tdr1.6/tdr.f tdr-1.7/tdr1.6/tdr.f *** tdr-1.7.orig/tdr1.6/tdr.f Thu Aug 22 20:01:30 1996 --- tdr-1.7/tdr1.6/tdr.f Fri May 15 13:34:50 1998 *************** *** 27,33 **** c device = 'tek4010' ccccccccccccccccccc Modified on 2/3/93 by Y.Teramoto ! if( .not. pxgtarg( device, prepro, in_file ) ) call exit ccccccccccccccccccc end of 2/3/93 modification c call tdblock --- 27,34 ---- c device = 'tek4010' ccccccccccccccccccc Modified on 2/3/93 by Y.Teramoto ! cmt4 if( .not. pxgtarg( device, prepro, in_file ) ) call exit ! if( .not. pxgtarg( device, prepro, in_file ) ) stop ccccccccccccccccccc end of 2/3/93 modification c call tdblock *************** *** 85,104 **** c c Pre-process the input file. if( prepro ) then ! call pxgtfn( TMP_DIR, tmp_file ) open( unit = LUN_INPUT, file = in_file, status = 'old', ! & readonly, err = 9000 ) ! open( unit = LUN_TMP, file = tmp_file, status = 'new', ! & carriagecontrol = 'list', err = 9000 ) call pxprep( LUN_INPUT, LUN_TMP ) close( unit = LUN_INPUT ) close( unit = LUN_TMP ) endif c if( prepro ) then ! open( unit=2, file=tmp_file, status='OLD', readonly, err=9000 ) else ! Open(Unit=2,File=In_File,Status='OLD',READONLY,Err=9000) endif ccccccccccccccccc end of 2/3/93 Modification Open(Unit=1,File=Out_File,Status='UNKNOWN',Err=9000) --- 86,112 ---- c c Pre-process the input file. if( prepro ) then ! cmt4 call pxgtfn( TMP_DIR, tmp_file ) ! tmp_file='topdraw.tmp' ! cmt4 open( unit = LUN_INPUT, file = in_file, status = 'old', ! cmt4 & readonly, err = 9000 ) open( unit = LUN_INPUT, file = in_file, status = 'old', ! & err = 9000 ) ! cmt4 open( unit = LUN_TMP, file = tmp_file, status = 'new', ! cmt4 & carriagecontrol = 'list', err = 9000 ) ! open( unit = LUN_TMP, file = tmp_file, status = 'unknown', ! & err = 9000 ) call pxprep( LUN_INPUT, LUN_TMP ) close( unit = LUN_INPUT ) close( unit = LUN_TMP ) endif c if( prepro ) then ! cmt4 open( unit=2, file=tmp_file, status='OLD', readonly, err=9000 ) ! open( unit=2, file=tmp_file, status='OLD', err=9000 ) else ! cmt4 Open(Unit=2,File=In_File,Status='OLD',READONLY,Err=9000) ! Open(Unit=2,File=In_File,Status='OLD',Err=9000) endif ccccccccccccccccc end of 2/3/93 Modification Open(Unit=1,File=Out_File,Status='UNKNOWN',Err=9000) *************** *** 120,128 **** call pfdesX endif cccccccccccccccccccccccccccccccc ! Call EXIT c 9000 Continue ! Type *,'File OPEN error' ! Call EXIT End --- 128,139 ---- call pfdesX endif cccccccccccccccccccccccccccccccc ! cmt4 Call EXIT ! stop c 9000 Continue ! print *,'File OPEN error' ! cmt4 Type *,'File OPEN error' ! cmt4 Call EXIT ! stop End diff -cNr tdr-1.7.orig/tdr1.6/tdr.f.orig tdr-1.7/tdr1.6/tdr.f.orig *** tdr-1.7.orig/tdr1.6/tdr.f.orig Thu Jan 1 09:00:00 1970 --- tdr-1.7/tdr1.6/tdr.f.orig Fri May 15 13:54:25 1998 *************** *** 0 **** --- 1,128 ---- + program tdr + C + c TOPDRAWER main program. + c + Include 't2com.inc' + Common /TXARGS/ OARG,QTXT,QLIN + Character*8 OARG(20),QLIN(3),QTXT(7) + c + character*9 device + character*256 in_file + character*10 out_file + ccccccccccccccc Modified on 2/3/93 by Y.Teramoto + logical prepro + logical pxgtarg + c + integer LUN_INPUT + parameter ( LUN_INPUT = 1 ) + integer LUN_TMP + parameter ( LUN_TMP = 2 ) + character*16 TMP_DIR + cccc parameter ( TMP_DIR = '/usr/tmp' ) + parameter ( TMP_DIR = './' ) + character*32 tmp_file + ccccccccccccccc end of 2/3/93 modification + C + c Get command options. + c + device = 'tek4010' + ccccccccccccccccccc Modified on 2/3/93 by Y.Teramoto + if( .not. pxgtarg( device, prepro, in_file ) ) call exit + ccccccccccccccccccc end of 2/3/93 modification + c + call tdblock + call pxmark( 1, '0' ) + call pxfont( 1, 2 ) + ccccccccccccccccccc 2-Mar-96 Modified by Y.Teramoto + call pxcolor( 1, -1 ) + ccccccccccccccccccc end of 2-Mar-96 Modification + c + ERRFIL = 1 + OUTFIL = 1 + DBGFIL = 1 + INPFIL = 2 + C + OARG(1) = 'FULSCR,' + OARG(2) = 'GENIL,' + OARG(3) = 'KERMIT,' + OARG(4) = '*' + C + out_file = '/dev/null' + c + LETSET=2 + c + if( device .eq. 'tek4010' ) then + OARG(3)='KERMIT, ' + else if( device .eq. 'necpc100' ) then + OARG(3)='NECPC100,' + else if( device .eq. 'pc98vt' ) then + OARG(3)='PC98VT, ' + else if( device .eq. 'X' ) then + OARG(3)='X, ' + else if( device .eq. 'XM' ) then + OARG(3)='XM, ' + else if( device .eq. 'XN' ) then + OARG(3)='XN, ' + else if( device .eq. 'XMN' ) then + OARG(3)='XMN, ' + else if( device .eq. 'canonlbp' ) then + OARG(3)='CANONLBP,' + LETSET=3 + else if( device .eq. 'psl' ) then + OARG(3)='PSL, ' + LETSET=3 + else if( device .eq. 'psp' ) then + OARG(3)='PSP, ' + LETSET=3 + else if( device .eq. 'epsl' ) then + OARG(3)='EPSL, ' + LETSET=3 + else if( device .eq. 'epsp' ) then + OARG(3)='EPSP, ' + LETSET=3 + endif + cccccccccccccccc Modified on 2/3/93 by Y.Teramoto + c + c Pre-process the input file. + if( prepro ) then + call pxgtfn( TMP_DIR, tmp_file ) + open( unit = LUN_INPUT, file = in_file, status = 'old', + & readonly, err = 9000 ) + open( unit = LUN_TMP, file = tmp_file, status = 'new', + & carriagecontrol = 'list', err = 9000 ) + call pxprep( LUN_INPUT, LUN_TMP ) + close( unit = LUN_INPUT ) + close( unit = LUN_TMP ) + endif + c + if( prepro ) then + open( unit=2, file=tmp_file, status='OLD', readonly, err=9000 ) + else + Open(Unit=2,File=In_File,Status='OLD',READONLY,Err=9000) + endif + ccccccccccccccccc end of 2/3/93 Modification + Open(Unit=1,File=Out_File,Status='UNKNOWN',Err=9000) + c + Call T2DOIT + c + ccccccccccccccccc Modified on 2/3/93 by Y.Teramoto + if( prepro ) then + Close(Unit=2,dispose='delete') + else + Close(Unit=2) + endif + ccccccccccccccccc end of 2/3/93 Modification + Close(Unit=1) + c + cccccccccccccccccccccc Modified 29-Jan-1992 by Y.Teramoto + cccccccccccccccccccccc Modified 4-Apr-96 by Y.Teramoto + if( ( device .eq. 'X' ) .or. ( device .eq. 'XM' ) ) then + call pfdesX + endif + cccccccccccccccccccccccccccccccc + Call EXIT + c + 9000 Continue + Type *,'File OPEN error' + Call EXIT + End diff -uNr tdr-1.7.ORIG/pf1.7/pfcolor.c tdr-1.7/pf1.7/pfcolor.c --- tdr-1.7.ORIG/pf1.7/pfcolor.c Thu Aug 22 20:01:09 1996 +++ tdr-1.7/pf1.7/pfcolor.c Fri May 13 15:18:33 2005 @@ -33,7 +33,7 @@ { switch( *color_n ) { - case WHITE: strcpy( color, "white" ); break; + case WHITE: strcpy( color, "black" ); break; case RED: strcpy( color, "red" ); break; case BLUE: strcpy( color, "blue" ); break; case GREEN: strcpy( color, "green" ); break;