diff -uNr tdr-1.7.orig/Makefile tdr-1.7/Makefile --- tdr-1.7.orig/Makefile 1998-04-17 17:44:35.000000000 +0900 +++ tdr-1.7/Makefile 2005-09-28 13:00:56.000000000 +0900 @@ -22,11 +22,13 @@ 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/mann +BINDIR = $(DESTDIR)$(PREFIX)/bin +LIBDIR = $(DESTDIR)$(PREFIX)/lib +MANDIR = $(DESTDIR)$(PREFIX)/share/man/man$(MANSEC) # The following should be site independent. @@ -63,7 +65,7 @@ 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) + cp ./man/pf.n $(MANDIR)/pf.$(MANEXT) + cp ./man/tdr.n $(MANDIR)/tdr.$(MANEXT) FRC: diff -uNr tdr-1.7.orig/pf1.7/Makefile tdr-1.7/pf1.7/Makefile --- tdr-1.7.orig/pf1.7/Makefile 1996-08-22 20:01:08.000000000 +0900 +++ tdr-1.7/pf1.7/Makefile 2005-09-28 13:00:56.000000000 +0900 @@ -1,10 +1,13 @@ -F77 = f77 +F77 = gfortran CC = cc ##FFLAGS = -O0 -static ##CFLAGS = -O0 # For HP-UX -FFLAGS = +es +E1 -K +ppu +## FFLAGS = +es +E1 -K +ppu +## CFLAGS = +FFLAGS = -fdollar-ok -fno-automatic + CFLAGS = OBJF = duplex.o pftext.o pfvects.o pfxtext.o \ diff -uNr tdr-1.7.orig/pf1.7/duplex.f tdr-1.7/pf1.7/duplex.f --- tdr-1.7.orig/pf1.7/duplex.f 1996-08-22 20:01:08.000000000 +0900 +++ tdr-1.7/pf1.7/duplex.f 2005-09-28 13:00:56.000000000 +0900 @@ -29,16 +29,16 @@ C CHARACTER SPACING. INTEGER*2 CHRCS C CHARACTER PAIR TABLE. - INTEGER*2 CHRCT( 365) - INTEGER*2 CHC001(80) + CHARACTER*2 CHRCT( 365) + CHARACTER*2 CHC001(80) EQUIVALENCE (CHC001(1),CHRCT( 1)) - INTEGER*2 CHC002(80) + CHARACTER*2 CHC002(80) EQUIVALENCE (CHC002(1),CHRCT( 81)) - INTEGER*2 CHC003(80) + CHARACTER*2 CHC003(80) EQUIVALENCE (CHC003(1),CHRCT( 161)) - INTEGER*2 CHC004(80) + CHARACTER*2 CHC004(80) EQUIVALENCE (CHC004(1),CHRCT( 241)) - INTEGER*2 CHC005(45) + CHARACTER*2 CHC005(45) EQUIVALENCE (CHC005(1),CHRCT( 321)) C CHARACTER OFFSET TABLE. INTEGER*2 CHROT( 365) 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 1996-08-22 20:01:09.000000000 +0900 +++ tdr-1.7/pf1.7/pfcolor.c 2005-09-28 13:02:15.000000000 +0900 @@ -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; diff -uNr tdr-1.7.orig/pf1.7/pftext.f tdr-1.7/pf1.7/pftext.f --- tdr-1.7.orig/pf1.7/pftext.f 1996-08-22 20:01:12.000000000 +0900 +++ tdr-1.7/pf1.7/pftext.f 2005-09-28 13:00:56.000000000 +0900 @@ -50,20 +50,20 @@ c if( font .eq. 0 ) then call uge001( 0, 0, 0, 1, xc, yc, size, angle, ratio, - 1 duplex_ptr, status ) + 1 duplex_ptr, status ) do i = 1, nchar stext( i:i ) = 'G' enddo call strupc( text, ptext ) else if( font .eq. 4 ) then call uge001( 0, 0, 0, 0, xc, yc, size, angle, ratio, - 1 gothic_ptr, status ) + 1 gothic_ptr, status ) else if( font .eq. 3 ) then call uge001( 0, 0, 0, 0, xc, yc, size, angle, ratio, - 1 ubc_ptr, status ) + 1 ubc_ptr, status ) else if( font .eq. 2 ) then call uge001( 0, 0, 0, 0, xc, yc, size, angle, ratio, - 1 duplex_ptr, status ) + 1 duplex_ptr, status ) else if( font .eq. 5 ) then c Device dependent font. if( pftstdv( 'X' ) .or. pftstdv( 'ps' ) ) then @@ -71,11 +71,11 @@ return else call uge001( 0, 0, 0, 0, xc, yc, size, angle, ratio, - 1 simplex_ptr, status ) + 1 simplex_ptr, status ) endif else call uge001( 0, 0, 0, 0, xc, yc, size, angle, ratio, - 1 simplex_ptr, status ) + 1 simplex_ptr, status ) endif if( status .eq. 1 ) then print *, ' %ERROR in PFTEXT: Character table not found.' @@ -91,19 +91,19 @@ 100 continue if( font .eq. 0 ) then call uge002( ptext, stext, nchar, duplex_ptr, bbit, - 1 x, y, status ) + 1 x, y, status ) else if( font .eq. 4 ) then call uge002( text, ' ', nchar, ubc_ptr, bbit, - 1 x, y, status ) + 1 x, y, status ) else if( font .eq. 3 ) then call uge002( text, ' ', nchar, ubc_ptr, bbit, - 1 x, y, status ) + 1 x, y, status ) else if( font .eq. 2 ) then call uge002( text, ' ', nchar, duplex_ptr, bbit, - 1 x, y, status ) + 1 x, y, status ) else call uge002( text, ' ', nchar, simplex_ptr, bbit, - 1 x, y, status ) + 1 x, y, status ) endif c if( bbit .lt. 0 ) then diff -uNr tdr-1.7.orig/pf1.7/pfxtext.f tdr-1.7/pf1.7/pfxtext.f --- tdr-1.7.orig/pf1.7/pfxtext.f 1996-08-22 20:01:14.000000000 +0900 +++ tdr-1.7/pf1.7/pfxtext.f 2005-09-28 13:00:56.000000000 +0900 @@ -40,8 +40,8 @@ nchar = len( ptext ) if( len( stext ) .ne. nchar ) then call pfclos( ' ' ) - print *, ' %ERROR in PFXTEXT: lengthes of the 1mry and 2dry text', - 1 ' are different.' + print *, ' %ERROR in PFXTEXT: lengthes of the 1mry and 2dry text', + 1 ' are different.' call exit endif c @@ -51,13 +51,13 @@ c if( font .eq. 3 ) then call uge001( 0, 1, 1, 1, xc, yc, size, angle, ratio, - 1 ubc_ptr, status ) + 1 ubc_ptr, status ) else if( font .eq. 2 ) then call uge001( 0, 1, 1, 1, xc, yc, size, angle, ratio, - 1 duplex_ptr, status ) + 1 duplex_ptr, status ) else call uge001( 0, 1, 1, 1, xc, yc, size, angle, ratio, - 1 simplex_ptr, status ) + 1 simplex_ptr, status ) endif if( status .eq. 1 ) then call pfclos( ' ' ) @@ -73,13 +73,13 @@ 100 continue if( font .eq. 3 ) then call uge002( ptext, stext, nchar, ubc_ptr, bbit, - 1 x, y, status ) + 1 x, y, status ) else if( font .eq. 2 ) then call uge002( ptext, stext, nchar, duplex_ptr, bbit, - 1 x, y, status ) + 1 x, y, status ) else call uge002( ptext, stext, nchar, simplex_ptr, bbit, - 1 x, y, status ) + 1 x, y, status ) endif c if( bbit .lt. 0 ) then diff -uNr tdr-1.7.orig/pf1.7/plclr.c tdr-1.7/pf1.7/plclr.c --- tdr-1.7.orig/pf1.7/plclr.c 1996-08-22 20:01:15.000000000 +0900 +++ tdr-1.7/pf1.7/plclr.c 2005-09-28 13:00:56.000000000 +0900 @@ -82,10 +82,10 @@ XClearWindow( XDISPLAY, XWINDOW ); if( DEVICE_N == X || DEVICE_N == XM ) { screen = DefaultScreen( XDISPLAY ); - XSetForeground( XDISPLAY, PGC, BlackPixel( XDISPLAY, screen ) ); + XSetForeground( XDISPLAY, PGC, WhitePixel( XDISPLAY, screen ) ); XFillRectangle( XDISPLAY, XPIXMAP, PGC, 0, 0, XWINDOW_XSIZE+1, XWINDOW_YSIZE+2 ); - XSetForeground( XDISPLAY, PGC, WhitePixel( XDISPLAY, screen ) ); + XSetForeground( XDISPLAY, PGC, BlackPixel( XDISPLAY, screen ) ); } XFlush( XDISPLAY ); } diff -uNr tdr-1.7.orig/pf1.7/plcreX.c tdr-1.7/pf1.7/plcreX.c --- tdr-1.7.orig/pf1.7/plcreX.c 1996-08-22 20:10:57.000000000 +0900 +++ tdr-1.7/pf1.7/plcreX.c 2005-09-28 13:00:56.000000000 +0900 @@ -31,8 +31,8 @@ XWINDOW = XCreateSimpleWindow( XDISPLAY, RootWindow( XDISPLAY, screen ), xpos, ypos, xsize, ysize, border_width, - WhitePixel( XDISPLAY, screen ), - BlackPixel( XDISPLAY, screen ) ); + BlackPixel( XDISPLAY, screen ), + WhitePixel( XDISPLAY, screen ) ); XSelectInput( XDISPLAY, XWINDOW, ExposureMask ); XChangeProperty( XDISPLAY, XWINDOW, XA_WM_NAME, XA_STRING, 8, @@ -43,16 +43,16 @@ mask = GCLineWidth | GCForeground; values.line_width = 1; - values.foreground = WhitePixel( XDISPLAY, screen ); + 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, BlackPixel( XDISPLAY, screen ) ); - XFillRectangle( XDISPLAY, XPIXMAP, PGC, 0, 0, xsize, ysize ); XSetForeground( XDISPLAY, PGC, WhitePixel( XDISPLAY, screen ) ); + XFillRectangle( XDISPLAY, XPIXMAP, PGC, 0, 0, xsize, ysize ); + XSetForeground( XDISPLAY, PGC, BlackPixel( XDISPLAY, screen ) ); } XFlush( XDISPLAY ); } diff -uNr tdr-1.7.orig/pf1.7/simplex.f tdr-1.7/pf1.7/simplex.f --- tdr-1.7.orig/pf1.7/simplex.f 1996-08-22 20:01:21.000000000 +0900 +++ tdr-1.7/pf1.7/simplex.f 2005-09-28 13:00:56.000000000 +0900 @@ -27,15 +27,15 @@ INTEGER*2 CHRCS C CHARACTER PAIR TABLE. INTEGER*2 CHRCT( 365) - INTEGER*2 CHC001(80) + CHARACTER*2 CHC001(80) EQUIVALENCE (CHC001(1),CHRCT( 1)) - INTEGER*2 CHC002(80) + CHARACTER*2 CHC002(80) EQUIVALENCE (CHC002(1),CHRCT( 81)) - INTEGER*2 CHC003(80) + CHARACTER*2 CHC003(80) EQUIVALENCE (CHC003(1),CHRCT( 161)) - INTEGER*2 CHC004(80) + CHARACTER*2 CHC004(80) EQUIVALENCE (CHC004(1),CHRCT( 241)) - INTEGER*2 CHC005(45) + CHARACTER*2 CHC005(45) EQUIVALENCE (CHC005(1),CHRCT( 321)) C CHARACTER OFFSET TABLE. INTEGER*2 CHROT( 365) diff -uNr tdr-1.7.orig/pf1.7/ubcfont.f tdr-1.7/pf1.7/ubcfont.f --- tdr-1.7.orig/pf1.7/ubcfont.f 1996-08-22 20:01:21.000000000 +0900 +++ tdr-1.7/pf1.7/ubcfont.f 2005-09-28 13:00:56.000000000 +0900 @@ -27,25 +27,25 @@ INTEGER*2 CHRCS C CHARACTER PAIR TABLE. INTEGER*2 CHRCT( 746) - INTEGER*2 CHC001(80) + CHARACTER*2 CHC001(80) EQUIVALENCE (CHC001(1),CHRCT( 1)) - INTEGER*2 CHC002(80) + CHARACTER*2 CHC002(80) EQUIVALENCE (CHC002(1),CHRCT( 81)) - INTEGER*2 CHC003(80) + CHARACTER*2 CHC003(80) EQUIVALENCE (CHC003(1),CHRCT( 161)) - INTEGER*2 CHC004(80) + CHARACTER*2 CHC004(80) EQUIVALENCE (CHC004(1),CHRCT( 241)) - INTEGER*2 CHC005(80) + CHARACTER*2 CHC005(80) EQUIVALENCE (CHC005(1),CHRCT( 321)) - INTEGER*2 CHC006(80) + CHARACTER*2 CHC006(80) EQUIVALENCE (CHC006(1),CHRCT( 401)) - INTEGER*2 CHC007(80) + CHARACTER*2 CHC007(80) EQUIVALENCE (CHC007(1),CHRCT( 481)) - INTEGER*2 CHC008(80) + CHARACTER*2 CHC008(80) EQUIVALENCE (CHC008(1),CHRCT( 561)) - INTEGER*2 CHC009(80) + CHARACTER*2 CHC009(80) EQUIVALENCE (CHC009(1),CHRCT( 641)) - INTEGER*2 CHC010(26) + CHARACTER*2 CHC010(26) EQUIVALENCE (CHC010(1),CHRCT( 721)) C CHARACTER OFFSET TABLE. INTEGER*2 CHROT( 746) diff -uNr tdr-1.7.orig/str/Makefile tdr-1.7/str/Makefile --- tdr-1.7.orig/str/Makefile 1996-08-22 20:01:22.000000000 +0900 +++ tdr-1.7/str/Makefile 2005-09-28 13:00:56.000000000 +0900 @@ -1,9 +1,12 @@ -F77 = f77 +F77 = gfortran CC = cc ##FFLAGS = -static -C -g3 -O0 # For HP-UX -FFLAGS = +es +E1 -K +ppu +# FFLAGS = +es +E1 -K +ppu +# CFLAGS = +FFLAGS = -fdollar-ok -fno-backslash -fno-automatic + CFLAGS = OBJF = chrupc.o strupc.o diff -uNr tdr-1.7.orig/tdr1.6/Makefile tdr-1.7/tdr1.6/Makefile --- tdr-1.7.orig/tdr1.6/Makefile 1998-04-17 17:31:25.000000000 +0900 +++ tdr-1.7/tdr1.6/Makefile 2005-09-28 13:00:56.000000000 +0900 @@ -3,9 +3,12 @@ ##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 +# FFLAGS = +es +E1 -K +ppu +# LDFLAG = +U77 -L.. -ltdr -L/jlc/local/X11R6/lib -lX11 -lm +FFLAGS = -fdollar-ok -fno-backslash -fno-automatic + +LDFLAG = -L.. -ltdr -L/usr/X11R6/lib -lX11 -lm +F77 = gfortran OBJ = tdr.o diff -uNr tdr-1.7.orig/tdr1.6/pxcase.f tdr-1.7/tdr1.6/pxcase.f --- tdr-1.7.orig/tdr1.6/pxcase.f 1996-08-22 20:01:24.000000000 +0900 +++ tdr-1.7/tdr1.6/pxcase.f 2005-09-28 13:00:56.000000000 +0900 @@ -23,6 +23,8 @@ 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,7 +37,8 @@ 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 +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 -uNr tdr-1.7.orig/tdr1.6/pxgtarg.f tdr-1.7/tdr1.6/pxgtarg.f --- tdr-1.7.orig/tdr1.6/pxgtarg.f 1996-08-22 20:01:25.000000000 +0900 +++ tdr-1.7/tdr1.6/pxgtarg.f 2005-09-28 13:00:56.000000000 +0900 @@ -44,7 +44,7 @@ device = arg3 call getarg( 4, foo ) else - write( 0, '( a )' ) 'Usage: tdr [-v device] [-p] ' + write( 0, '( a )' ) 'Usage: tdr [-v device] [-p] ' return endif else diff -uNr tdr-1.7.orig/tdr1.6/pxlen.f tdr-1.7/tdr1.6/pxlen.f --- tdr-1.7.orig/tdr1.6/pxlen.f 1996-08-22 20:01:26.000000000 +0900 +++ tdr-1.7/tdr1.6/pxlen.f 2005-09-28 13:00:56.000000000 +0900 @@ -11,7 +11,7 @@ c do i = length, 1, -1 c = str( i:i ) - if( c .ne. ' ' .and. c .ne. char( 9 ) .and. c .ne. char( 0 ) ) then + if(c .ne. ' ' .and. c .ne. char( 9 ) .and. c .ne. char( 0 ) ) then pxlen = i return endif diff -uNr tdr-1.7.orig/tdr1.6/pxpick.f tdr-1.7/tdr1.6/pxpick.f --- tdr-1.7.orig/tdr1.6/pxpick.f 1996-08-22 20:01:27.000000000 +0900 +++ tdr-1.7/tdr1.6/pxpick.f 2005-09-28 13:00:56.000000000 +0900 @@ -19,7 +19,11 @@ first = .true. endif else - if( string( i:i ) .eq. ' ' ) then +c>>>>> +c if( string( i:i ) .eq. ' ' ) then + if( string( i:i ) .eq. ' ' .or. + . string( i:i ) .eq. ',' ) then +c>>>>> pxpick = i return endif diff -uNr tdr-1.7.orig/tdr1.6/pxplin.f tdr-1.7/tdr1.6/pxplin.f --- tdr-1.7.orig/tdr1.6/pxplin.f 1996-08-22 20:01:27.000000000 +0900 +++ tdr-1.7/tdr1.6/pxplin.f 2005-09-28 13:00:56.000000000 +0900 @@ -19,14 +19,14 @@ 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'/ + data BITS/Z'80000000',Z'40000000',Z'20000000',Z'10000000', + 1Z'08000000',Z'04000000',Z'02000000',Z'01000000', + 1Z'00800000',Z'00400000',Z'00200000',Z'00100000', + 1Z'00080000',Z'00040000',Z'00020000',Z'00010000', + 1Z'00008000',Z'00004000',Z'00002000',Z'00001000', + 1Z'00000800',Z'00000400',Z'00000200',Z'00000100', + 1Z'00000080',Z'00000040',Z'00000020',Z'00000010', + 1Z'00000008',Z'00000004',Z'00000002',Z'00000001'/ c ibts = nbts btfg = .true. @@ -43,7 +43,8 @@ else int3 = 1 + ( kbts - 1 ) / 32 int4 = mod( kbts - 1, 32 ) + 1 - if( ( bbts( int3 ) .and. bits( int4 ) ) .ne. 0 ) ibbt = 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 -uNr tdr-1.7.orig/tdr1.6/pxplins.f tdr-1.7/tdr1.6/pxplins.f --- tdr-1.7.orig/tdr1.6/pxplins.f 1996-08-22 20:01:27.000000000 +0900 +++ tdr-1.7/tdr1.6/pxplins.f 2005-09-28 13:00:56.000000000 +0900 @@ -20,14 +20,14 @@ 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'/ + data BITS/Z'80000000',Z'40000000',Z'20000000',Z'10000000', + 1Z'08000000',Z'04000000',Z'02000000',Z'01000000', + 1Z'00800000',Z'00400000',Z'00200000',Z'00100000', + 1Z'00080000',Z'00040000',Z'00020000',Z'00010000', + 1Z'00008000',Z'00004000',Z'00002000',Z'00001000', + 1Z'00000800',Z'00000400',Z'00000200',Z'00000100', + 1Z'00000080',Z'00000040',Z'00000020',Z'00000010', + 1Z'00000008',Z'00000004',Z'00000002',Z'00000001'/ c ibts = nbts btfg = .true. @@ -44,7 +44,8 @@ else int3 = 1 + ( kbts - 1 ) / 32 int4 = mod( kbts - 1, 32 ) + 1 - if( ( bbts( int3 ) .and. bits( int4 ) ) .ne. 0 ) ibbt = 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 -uNr tdr-1.7.orig/tdr1.6/pxplinx.f tdr-1.7/tdr1.6/pxplinx.f --- tdr-1.7.orig/tdr1.6/pxplinx.f 1996-08-22 20:01:27.000000000 +0900 +++ tdr-1.7/tdr1.6/pxplinx.f 2005-09-28 13:00:56.000000000 +0900 @@ -45,7 +45,8 @@ else int3 = 1 + ( kbts - 1 ) / 32 int4 = mod( kbts - 1, 32 ) + 1 - if( ( bbts( int3 ) .and. bits( int4 ) ) .ne. 0 ) ibbt = 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 -uNr tdr-1.7.orig/tdr1.6/t2com.inc tdr-1.7/tdr1.6/t2com.inc --- tdr-1.7.orig/tdr1.6/t2com.inc 1996-08-22 20:01:29.000000000 +0900 +++ tdr-1.7/tdr1.6/t2com.inc 2005-09-28 13:00:56.000000000 +0900 @@ -25,4 +25,4 @@ *IL, LENCRD,BUFSIZ,IFIELD, ITITDT,ITCNTR, DOTWID,DOTWDF,LINWID,LINW *DF, GRDTYP,LETSET, NDIMNS,IBLKTP,IDIMNS,NINCR,LISTPT, IVARBL,NNAME *,NHEADR,IVRPTR - BYTE TDDATE,CARD,INPFMT,PXNAME + CHARACTER*1 TDDATE,CARD,INPFMT,PXNAME diff -uNr tdr-1.7.orig/tdr1.6/t2stl1.f tdr-1.7/tdr1.6/t2stl1.f --- tdr-1.7.orig/tdr1.6/t2stl1.f 1996-08-22 20:01:30.000000000 +0900 +++ tdr-1.7/tdr1.6/t2stl1.f 2005-09-28 13:00:56.000000000 +0900 @@ -12,7 +12,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING DATA HNONE/ 4HNONE/ IF((IFLAG(1) .EQ. 1) .AND. (IFLAG(2) .EQ. 1))GOTO 11771 IF(NP .LE. 0)GOTO 11791 diff -uNr tdr-1.7.orig/tdr1.6/t2stlm.f tdr-1.7/tdr1.6/t2stlm.f --- tdr-1.7.orig/tdr1.6/t2stlm.f 1996-08-22 20:01:30.000000000 +0900 +++ tdr-1.7/tdr1.6/t2stlm.f 2005-09-28 13:00:56.000000000 +0900 @@ -9,7 +9,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING COMMON /T2NPMX/ NPTMAX COMMON /T2XPNT/ DATBUF(5125) INTEGER NPTMAX diff -uNr tdr-1.7.orig/tdr1.6/tdblock.f tdr-1.7/tdr1.6/tdblock.f --- tdr-1.7.orig/tdr1.6/tdblock.f 1996-08-22 20:01:30.000000000 +0900 +++ tdr-1.7/tdr1.6/tdblock.f 2005-09-28 13:00:56.000000000 +0900 @@ -3,7 +3,7 @@ COMMON /TDFCOM/ITITLE,TSETSZ,TSETOR,TITSPC,IDATIT DATA ITITLE/1/,TSETSZ/0./,TSETOR/0./,TITSPC/0./,IDATIT/0/ COMMON /TOKENT/ TYPTAB - BYTE TYPTAB(128) + INTEGER*1 TYPTAB(128) DATA TYPTAB / 08,13,13,13,13,13,13,13, 13,13,13,13,13,13,13,13, *13,13,13,13,13,13,13,13, 13,13,13,13,13,13,13,13, 06,13,09,13,07, *13,13,09, 10,11,13,03,07,03,02,07, 01,01,01,01,01,01,01,01, 01,01 @@ -47,7 +47,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING DATA TDDATE/1H1,1H1,1H/,1H1,1H1,1H/,1H8,1H0/ DATA BUFSIZ /400/ DATA INAME/ 1HX, 1HY, 1HZ/ diff -uNr tdr-1.7.orig/tdr1.6/tdr.f tdr-1.7/tdr1.6/tdr.f --- tdr-1.7.orig/tdr1.6/tdr.f 1996-08-22 20:01:30.000000000 +0900 +++ tdr-1.7/tdr1.6/tdr.f 2005-09-28 13:00:56.000000000 +0900 @@ -27,7 +27,8 @@ c device = 'tek4010' ccccccccccccccccccc Modified on 2/3/93 by Y.Teramoto - if( .not. pxgtarg( device, prepro, in_file ) ) call exit +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,20 +86,27 @@ c c Pre-process the input file. if( prepro ) then - call pxgtfn( TMP_DIR, tmp_file ) +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', - & readonly, err = 9000 ) - open( unit = LUN_TMP, file = tmp_file, status = 'new', - & carriagecontrol = 'list', err = 9000 ) + & 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 - open( unit=2, file=tmp_file, status='OLD', readonly, err=9000 ) +cmt4 open( unit=2, file=tmp_file, status='OLD', readonly, err=9000 ) + open( unit=2, file=tmp_file, status='OLD', err=9000 ) else - Open(Unit=2,File=In_File,Status='OLD',READONLY,Err=9000) +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) @@ -107,7 +115,8 @@ c ccccccccccccccccc Modified on 2/3/93 by Y.Teramoto if( prepro ) then - Close(Unit=2,dispose='delete') +c Close(Unit=2,dispose='delete') +c Close(Unit=2) else Close(Unit=2) endif @@ -120,9 +129,12 @@ call pfdesX endif cccccccccccccccccccccccccccccccc - Call EXIT +cmt4 Call EXIT + stop c 9000 Continue - Type *,'File OPEN error' - Call EXIT + print *,'File OPEN error' +cmt4 Type *,'File OPEN error' +cmt4 Call EXIT + stop End diff -uNr tdr-1.7.orig/tdr1.6/topdrw.f tdr-1.7/tdr1.6/topdrw.f --- tdr-1.7.orig/tdr1.6/topdrw.f 1996-08-22 20:01:31.000000000 +0900 +++ tdr-1.7/tdr1.6/topdrw.f 2005-09-28 13:00:56.000000000 +0900 @@ -279,7 +279,7 @@ cnext **************************************** SUBROUTINE TDCASE(TEXT,CASE, X , Y ) COMMON /TDFCOM/ITITLE,TSETSZ,TSETOR,TITSPC,IDATIT - BYTE TEXT(256),CASE(256) + CHARACTER*1 TEXT(256),CASE(256) REAL X,Y COMMON /T2FLGC/ FLAGS(100) LOGICAL FLAGS @@ -291,13 +291,13 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING cccc EXTERNAL T1NARG cccc INTEGER T1NARG INTEGER T2INTR REAL T2REAL EXTERNAL T2INTR,T2REAL - BYTE SEMIC,LBUFFR(400) + CHARACTER*1 SEMIC,LBUFFR(400) INTEGER INFOIN(9) REAL XY(2),XYZ(3) EQUIVALENCE (BUFFER(1),LBUFFR(1)) @@ -505,7 +505,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING cccc EXTERNAL T1NARG cccc INTEGER T1NARG DIMENSION X(NP),Y(NP),DX(NP),DY(NP) @@ -576,7 +576,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING cccc EXTERNAL T1NARG cccc INTEGER T1NARG INTEGER T2INTR @@ -627,7 +627,7 @@ SUBROUTINE TDLIMS(WORD,NP,VALS,ERRS) INTEGER NP REAL VALS(NP),ERRS(NP) - BYTE WORD(4) + CHARACTER*1 WORD(4) COMMON /T2FLGC/ FLAGS(100) LOGICAL FLAGS ccccccccccccccccccccccccc 25-Jan-96 Modified by Y.Teramoto @@ -638,7 +638,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING cccc EXTERNAL T1NARG cccc INTEGER T1NARG INTEGER T2INTR @@ -755,7 +755,7 @@ END cnext **************************************** SUBROUTINE TDNEWP( ALIAS ) - BYTE ALIAS(8) + CHARACTER*1 ALIAS(8) COMMON /T2FLGC/ FLAGS(100) LOGICAL FLAGS ccccccccccccccccccccccccc 25-Jan-96 Modified by Y.Teramoto @@ -766,12 +766,16 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING cccc EXTERNAL T1NARG cccc INTEGER T1NARG - BYTE BLANK,ZERO,MINUS + CHARACTER*1 BLANK,ZERO,MINUS +cccc + INTEGER*1 iBLANK, iZERO, iMINUS + EQUIVALENCE (BLANK,iBLANK), (ZERO,iZERO), (MINUS,iMINUS) + DATA iBLANK/x'40'/,iZERO/00/,iMINUS/x'FF'/ c Y.Teramoto modified DATA BLANK/1H / -> DATA BLANK/z40/ - DATA BLANK/x'40'/,ZERO/0/,MINUS/x'FF'/ +c DATA BLANK/x'40'/,ZERO/0/,MINUS/x'FF'/ DATA NERR/0/ cccc NARG = T1NARG(1) cccc IF((NARG .GE. 0) .AND. (NARG .LE. 1))GOTO 11211 @@ -824,7 +828,7 @@ cnext **************************************** SUBROUTINE TDPLOT( NP ,X,Y,DX,DY, ISYM ) DIMENSION X(NP),Y(NP),DX(NP),DY(NP) - BYTE ISYM(2) + CHARACTER*1 ISYM(2) COMMON /T2FLGC/ FLAGS(100) LOGICAL FLAGS ccccccccccccccccccccccccc 25-Jan-96 Modified by Y.Teramoto @@ -835,7 +839,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING cccc EXTERNAL T1NARG cccc INTEGER T1NARG INTEGER T2INTR @@ -844,7 +848,7 @@ REAL TSYM(2) EXTERNAL TXSYM REAL TXSYM - BYTE CSYM(3),BLANKS(3) + CHARACTER*1 CSYM(3),BLANKS(3) DATA TSYM/0.,0./ DATA CSYM(3)/ 1H / DATA BLANKS/1H ,1H ,1H / @@ -906,7 +910,7 @@ END cnext **************************************** SUBROUTINE TDSET(TEXT) - BYTE TEXT(257) + CHARACTER*1 TEXT(257) COMMON /T2FLGC/ FLAGS(100) LOGICAL FLAGS ccccccccccccccccccccccccc 25-Jan-96 Modified by Y.Teramoto @@ -917,11 +921,11 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING cccc EXTERNAL T1NARG cccc INTEGER T1NARG INTEGER INFOIN(9),LENGTH - BYTE SEMIC,LBUFFR(400) + CHARACTER*1 SEMIC,LBUFFR(400) EQUIVALENCE(INFOIN(1),LENGTH) EQUIVALENCE (BUFFER(1),LBUFFR(1)) DATA SEMIC/ 1H;/ @@ -943,7 +947,7 @@ 11602 CONTINUE IF(.NOT.(FLAGS(29)))GOTO 11651 WRITE(DBGFIL,11660)(LBUFFR(I),I=1,LENGTH) -11660 FORMAT (30X, 7HTDSET(',95A1) +11660 FORMAT (30X, 'TDSET(''',95A1) 11651 CONTINUE IF(IERFLG .NE. 0)GOTO 11681 FLAGS(30) = .TRUE. @@ -959,7 +963,7 @@ cnext **************************************** SUBROUTINE TDTITL(TEXT, X , Y ) COMMON /TDFCOM/ITITLE,TSETSZ,TSETOR,TITSPC,IDATIT - BYTE TEXT(256) + CHARACTER*1 TEXT(256) REAL X,Y COMMON /T2FLGC/ FLAGS(100) LOGICAL FLAGS @@ -971,7 +975,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING cccc EXTERNAL T1NARG cccc INTEGER T1NARG DATA NERR/0/ @@ -1002,10 +1006,10 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING cccc EXTERNAL T1NARG cccc INTEGER T1NARG - BYTE TEXT(20),SEMIC + CHARACTER*1 TEXT(20),SEMIC INTEGER T2INTR REAL T2REAL DATA SEMIC/ 1H;/ @@ -1088,7 +1092,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING INTEGER IFLAG(2) REAL EXTREM(2) IF(NP .LE. 0)GOTO 11961 @@ -1168,7 +1172,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING WRITE(ERRFIL,12130) 12130 FORMAT(' *** ERROR *** YOU HAVE INVOKED A SUBROUTINE,', *' WHICH IS PART OF THE 3-D PACKAGE.',/,16X,'THE 3-D PACKAGE HAS', @@ -1189,9 +1193,9 @@ INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG REAL FLOTNG - BYTE STRING + CHARACTER*1 STRING INTEGER INFO(10) - BYTE LINE(80),KEYSTR(9) + CHARACTER*1 LINE(80),KEYSTR(9) DATA KEYSTR/ 1HK, 1HE, 1HY, 1H1, 1HK, 1HE, 1H *Y, 1H2, 1H;/ MAXSTR=20 @@ -1261,29 +1265,34 @@ SUBROUTINE TOKEN(INFO,CHARS,KEYS) INTEGER INFO(5) ccccccccccccccc -ccc BYTE CHARS(80) -ccc BYTE KEYS(21) - BYTE CHARS(*) - BYTE KEYS(*) +ccc CHARACTER*1 CHARS(80) +ccc CHARACTER*1 KEYS(21) + INTEGER*1 CHARS(*) + INTEGER*1 KEYS(*) cccccccccccccccccccc - COMMON /TOKENC/ INTERP,INTEG,FLOTNG,KEYORD,NSTRNG,MAXSTR,STRING(160) + COMMON/TOKENC/INTERP,INTEG,FLOTNG,KEYORD,NSTRNG,MAXSTR,STRING(160) INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG REAL FLOTNG - BYTE STRING + INTEGER*1 STRING COMMON /TOKENT/ TYPTAB - BYTE TYPTAB(128) - BYTE DEC256(256),DECIDE(16,16) + INTEGER*1 TYPTAB(128) +c>>>>>>>>> +c CHARACTER*1 DEC256(256),DECIDE(16,16) + INTEGER*1 DEC256(256),DECIDE(16,16) +c>>>>>>>>> INTEGER*2 CHARAC,KEYLET,QUOTE,MINUS,ZERO INTEGER*2 FLTING,STAGE,OLDSTG,CHTYPE,KEYTYP INTEGER KEYPNT,ICOL,EXPON,ESIGN,NSIGN,DIGITS - BYTE CCHAR,CBLANK + INTEGER*1 CCHAR, CBLANK + CHARACTER*1 cCBLANK + EQUIVALENCE (CBLANK,cCBLANK) REAL XPA(4),XPB(10),XPC(10) INTEGER*4 IVALUE,ILONG,ALLBIT,TOOBIG,LONG10 EQUIVALENCE (DECIDE(1,1),DEC256(1)) EQUIVALENCE (IXXXXX,XXXXXX) DATA ALLBIT/2 147 483 647/, TOOBIG/214 748 364/, LONG10/10/ - DATA CBLANK / 1H / + DATA cCBLANK / ' ' / DATA XPA(1)/1./ DATA XPB(1)/1.E00/,XPB(2)/1.E10/,XPB(3)/1.E20/,XPB(4)/1.E30/ DATA XPB(5)/0./,XPB(6)/0./,XPB(7)/0./,XPB(8)/0./ @@ -1615,13 +1624,15 @@ cnext **************************************** SUBROUTINE TOKRED(INFO,CHARS,LENGTH,INFILE,FORMT) INTEGER INFO(10),LENGTH,INFILE,FORMT(4) - BYTE CHARS(LENGTH) + INTEGER*1 CHARS(LENGTH) COMMON /TOKENT/ TYPTAB - BYTE TYPTAB(128) + INTEGER*1 TYPTAB(128) INTEGER ISTAT,CHARAC,CHTYPE,MAXCOL,ICOL - BYTE SLASH + INTEGER*1 SLASH + CHARACTER*1 cSLASH + EQUIVALENCE (cSLASH,SLASH) EQUIVALENCE (IXXXXX,XXXXXX) - DATA SLASH/ 1H// + DATA cSLASH/ '/'/ MAXCOL=MAX0(0,INFO(1)) ICOL=MAX0(0,INFO(3)) IF (INFO(1).LT.0) GO TO 11160 @@ -2091,7 +2102,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING IF(.NOT.(FLAGS(29)))GOTO 10831 WRITE(DBGFIL,10840)XYPART,SCREEN 10840 FORMAT(60X, 14HTXDEFW XYPART ,4F5.1, 7H SCREEN,2F5.1) @@ -2175,7 +2186,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING cccccccccccccccc 6-Sep-91 Modified by Y.Teramoto real*4 scrnsize( 4 ), scrnsizel( 4 ) cccccccccccccccccccccccccccccc @@ -2301,7 +2312,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING RETURN END C MORTRAN 2.79 (BRACKETED KEYWORD MACROS OF 02/11/81) @@ -2317,7 +2328,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING REAL XYTXT(2,5),XYDEV(2,5) EQUIVALENCE (BUFFER(1),XYDEV(1,1)), (BUFFER(11),XYTXT(1,1)) IF(.NOT.(FLAGS(29)))GOTO 10021 @@ -2368,15 +2379,15 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING ccccccccccccccccccc 29-Jan-93 Modified by A.Miyamoto/Y.Teramoto - BYTE VTEXT(20),VCASE(12),BLANK -cccc BYTE VTEXT(12),VCASE(12),BLANK + CHARACTER*1 VTEXT(20),VCASE(12),BLANK +cccc CHARACTER*1 VTEXT(12),VCASE(12),BLANK ccccccccccccccccccc end of 29-Jan-93 Modification REAL XY(2,4),TVAL(4),PNT(3,4),POSLBL(3),ALONG(3),UPDIR(3), XYZWRL *(3,2),XYTXT(2,2),XYPNT(2,2) INTEGER IAX1,IAX2,IAX3 - DATA BLANK/ 1H / + DATA BLANK/ ' ' / IF(.NOT.(FLAGS(29)))GOTO 10131 WRITE(DBGFIL,10140)IXYZ,NUM,IAXIS,ITICK,ILABEL,XYZ 10140 FORMAT (60X, 13HT2AXIS. AXIS,I2,I4, 16H TICKS. IA,IT,IL,3I2/ @@ -2609,7 +2620,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING REAL XYZ(3,2),XY(2,2),ALONG(3),UP(3) IF(.NOT.(FLAGS(29)))GOTO 10941 WRITE(DBGFIL,10950)IGRIDS @@ -2707,8 +2718,8 @@ cnext **************************************** SUBROUTINE T2LADJ(IN,NIN,OUT,NOUT) INTEGER NIN,NOUT - BYTE IN(NIN),OUT(NIN) - BYTE CHAR,BLNK,ZERO,POINT + CHARACTER*1 IN(NIN),OUT(NIN) + CHARACTER*1 CHAR,BLNK,ZERO,POINT DATA BLNK/ 1H /,ZERO/ 1H0/,POINT/ 1H./ IOUT=0 LAST=0 @@ -2740,7 +2751,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING IF(MSCAL .GE. 0)GOTO 11231 I = -MSCAL IXXXXX=I @@ -2809,7 +2820,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING REAL XYZ(3,2) INTEGER IBUFFR(400),IGRIDS(4) EQUIVALENCE (IBUFFR(1),BUFFER(1)) @@ -2925,7 +2936,7 @@ *) INTEGER ITICK,IWID,LFTADJ,NTEXT,NCASE REAL VAL - BYTE TEXT(12),CASE(12) + CHARACTER*1 TEXT(12),CASE(12) COMMON /T2FLGC/ FLAGS(100) LOGICAL FLAGS ccccccccccccccccccccccccc 25-Jan-96 Modified by Y.Teramoto @@ -2936,8 +2947,9 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING - BYTE ZERO,BLANK,LETL,LETV,PERIOD, MONTHS(3,12),CONE,BASCHR(3),DIG + CHARACTER*1 STRING + CHARACTER*1 ZERO,BLANK,LETL,LETV,PERIOD, MONTHS(3,12), + * CONE,BASCHR(3),DIG *ITS(10) DATA ZERO/ 1H0/,BLANK/ 1H /,LETL/ 1HL/,LETV/ 1HV/, PE *RIOD/ 1H./ @@ -3068,7 +3080,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING DOUBLE PRECISION DONE,DTEN,DBASE,DROUND,DX2,DSTEP2 REAL ROUND(7) INTEGER*4 I2 @@ -3163,7 +3175,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING REAL VMIN,VMAX,VALS(MAXN) INTEGER IN1,IN2,TYPE(MAXN) INTEGER N1LIST(8),N2LIST(8),LIST1(9),LIST2(9) @@ -3588,11 +3600,11 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING REAL AROXYZ(3,2),AROD(4),LNAMES(7) INTEGER AROMOD(2) LOGICAL FSAVE - BYTE BLANK + CHARACTER*1 BLANK DATA HNONE/ 4HNONE/,BLANK / 1H / DATA LNAMES/ 2HSM, 2HX , 2HDX, 2HY , 2HDY, 2HZ , * 2HDZ/ @@ -4219,7 +4231,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING CALL T2PNTR WRITE(OUTFIL,11730) 11730 FORMAT( 36H TOP DRAWER (10/10/80) NOW EXECUTING/) @@ -4242,7 +4254,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING INTEGER ISET(4),IBUFFR(200) REAL XPARM(4),PARM(4) COMMON /T2NPMX/ NPTMAX @@ -4444,7 +4456,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING COMMON /T2NPMX/ NPTMAX COMMON /T2XPNT/ DATBUF(5125) INTEGER NPTMAX @@ -4479,7 +4491,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING NN1=N1 NN2=N2 CALL TOKEN(INFO,CARD, 5HFROM;) @@ -4526,10 +4538,10 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING REAL TXSYM EXTERNAL TXSYM - BYTE BLANKS(3) + CHARACTER*1 BLANKS(3) COMMON /T2NPMX/ NPTMAX COMMON /T2XPNT/ DATBUF(5125) INTEGER NPTMAX @@ -4729,7 +4741,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING INTEGER LEVEL,FIRST,LAST,OVERLP IF (N.LE.1) RETURN IF(INLEVL .LE. 0 .OR. INLEVL .GT. 5)GOTO 12851 @@ -4834,10 +4846,10 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING REAL TCON(5),TANGDF(6),XY(2),XYZ(3) - BYTE BLANK,ESCAPE,PLUS,MINUS,AMPRSN,ZERO - BYTE CASE(160),TITLE(160) + CHARACTER*1 BLANK,ESCAPE,PLUS,MINUS,AMPRSN,ZERO + CHARACTER*1 CASE(160),TITLE(160) EQUIVALENCE (BUFFER(1),TITLE(1)),(BUFFER(200),CASE(1)) DATA TANGDF /0.,90.,0.,-90.,0.,0./ DATA BLANK / 1H /,ESCAPE/ 1H@/,PLUS/ 1H+/,MINUS/ 1H-/, @@ -5199,7 +5211,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING COMMON /T2NPMX/ NPTMAX COMMON /T2XPNT/ DATBUF(5125) INTEGER NPTMAX @@ -5373,10 +5385,10 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING REAL XYZV(3),XYZW(3),XYZE(3),XYZE1(3),XYZE2(3,2),XY(2,2) REAL SYMBL1,SYMBL,HNONE - BYTE BLANKS(3) + CHARACTER*1 BLANKS(3) DATA HNONE/ 4HNONE/ DATA BLANKS/1H ,1H ,1H / IF(.NOT.(FLAGS(29)))GOTO 10021 @@ -5515,7 +5527,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING REAL XYB(2,2), XYH(2,4), XY(2,4) IF(.NOT.(FLAGS(29)))GOTO 10421 WRITE(DBGFIL,10430)ASIZE,AFLARE,XYZARO,DARO,MODARO @@ -5596,7 +5608,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING REAL CRCFCX(27),CRCFCY(27) INTEGER CRCPNT(4), CRCLVL(3) REAL XYCEN(2),CRCX(20),CRCY(20) @@ -5652,7 +5664,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING REAL WID(3),XYZ(3) INTEGER IE(3),IV(3) LOGICAL LIMSET(3) @@ -5958,7 +5970,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING INTEGER FIRST,FIRSTJ,OVERLP,LAST,NDIM,ISC(4) REAL HNONE,XY(2),XYZ(3),XFRM(12) LOGICAL CLOSED @@ -6480,7 +6492,7 @@ cnext **************************************** SUBROUTINE T2SETC(INFOIN,CARDIN) INTEGER INFOIN(10) - BYTE CARDIN(160) + CHARACTER*1 CARDIN(160) COMMON /T2FLGC/ FLAGS(100) LOGICAL FLAGS ccccccccccccccccccccccccc 25-Jan-96 Modified by Y.Teramoto @@ -6491,7 +6503,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING CALL TOKEN(INFOIN,CARDIN, 4HSET;) IF(INTERP .EQ. 2)GOTO 10021 INFOIN(3)=INFOIN(4) @@ -6506,10 +6518,10 @@ INTEGER W,D REAL XVALUE ccccccccccccccccc 21-Aug-91 Modified by Y.Teramoto -cccc BYTE TEXT(100) - BYTE TEXT(*) +cccc CHARACTER*1 TEXT(100) + CHARACTER*1 TEXT(*) ccccccccccccccccc end of modification - BYTE BLANK,PERIOD,E,MINUS,STAR,DIGIT(10) + CHARACTER*1 BLANK,PERIOD,E,MINUS,STAR,DIGIT(10) DOUBLE PRECISION DFIVE,DTENTH,DTENM5,DPOWER,DPART,TENPWR(6) DATA DFIVE/5.0D0/,DTENTH/0.1D0/,DTENM5/1.D-5/ DATA TENPWR(1)/1.D0/,TENPWR(2)/1.D1/,TENPWR(3)/1.D2/ ,TENPWR(4)/1 @@ -6655,7 +6667,7 @@ cnext **************************************** SUBROUTINE T2ERR(LENGTH,INFOIN,CARDIN,FILE,IFLAG) INTEGER LENGTH,INFOIN(10),FILE,IFLAG - BYTE CARDIN(LENGTH) + CHARACTER*1 CARDIN(LENGTH) COMMON /T2FLGC/ FLAGS(100) LOGICAL FLAGS ccccccccccccccccccccccccc 25-Jan-96 Modified by Y.Teramoto @@ -6666,8 +6678,8 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING - BYTE POINTR,BLANK,FIRSTU(12),MATCHS(9) + CHARACTER*1 STRING + CHARACTER*1 POINTR,BLANK,FIRSTU(12),MATCHS(9) DATA FIRSTU/1H ,1HF,1HI,1HR,1HS,1HT,1H ,1HU,1HS,1HE,1HD,1H./ DATA MATCHS/1H ,1HM,1HA,1HT,1HC,1HH,1HE,1HS,1H / DATA POINTR/ 1H!/,BLANK/ 1H / @@ -6766,9 +6778,9 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING INTEGER NMIN,NMAX,NOUT,INFOIN(9) - BYTE CARDIN(160) + CHARACTER*1 CARDIN(160) REAL ARRAY(NMAX) DO 10851 I=1,NMAX GO TO 10861 @@ -6805,7 +6817,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING INTEGER IFLDDF(15) DATA IFLDDF/5,1,3,2,4,0,0,0,0,0,0,0,0,0,0/ DO 10911 I=2,13 @@ -6908,7 +6920,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING COMMON /T2NPMX/ NPTMAX COMMON /T2XPNT/ DATBUF(5125) INTEGER NPTMAX @@ -6965,7 +6977,7 @@ cnext **************************************** SUBROUTINE T2SET1(INFOIN,CARDIN) INTEGER INFOIN(10) - BYTE CARDIN(160) + CHARACTER*1 CARDIN(160) COMMON /T2FLGC/ FLAGS(100) LOGICAL FLAGS ccccccccccccccccccccccccc 25-Jan-96 Modified by Y.Teramoto @@ -6976,10 +6988,10 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING REAL TXSYM EXTERNAL TXSYM - BYTE GRIDDF(3) + CHARACTER*1 GRIDDF(3) INTEGER ICNVRT(6) LOGICAL LLLL DATA GRIDDF/1H0,1HP,1H / @@ -7253,7 +7265,7 @@ GO TO 10932 ccccccccccccccccc 3-Apr-96 modified by Y.Teramoto 10931 CALL TOKEN(INFOIN,CARDIN, - 1 56HBLACK:1,RED:2,BLUE:3,GREEN:4,MAGENTA:5,YELLOW:6,CYAN:7,;) + 1 56HBLACK:1,RED:2,BLUE:3,GREEN:4,MAGENTA:5,YELLOW:6,CYAN:7,;) ccc10931 CALL TOKEN(INFOIN,CARDIN, 22HBLACK:1,RED:2,BLUE:3,;) ccccccccccccccccccccccccccccccccc GO TO (10935,10937,10935,10935,10935,10935,10935,10936, 10935),INT @@ -7329,7 +7341,7 @@ GO TO 11202 cccccccccccccccccccc 14-Jun-96 Modified by Y.Teramoto 11201 CALL TOKEN(INFOIN,CARDIN, - 1 38HBASIC:1,EXTENDED:2,DUPLEX:3,DEVICE:4,;) + 1 38HBASIC:1,EXTENDED:2,DUPLEX:3,DEVICE:4,;) cccc11201 CALL TOKEN(INFOIN,CARDIN, 29HBASIC:1,EXTENDED:2,DUPLEX:3,;) cccccccccccccccccccccccccccccccccccc GO TO (11205,11207,11205,11205,11205,11205,11205,11206, 11205),INT @@ -7633,7 +7645,7 @@ cnext **************************************** SUBROUTINE T2SET2(INFOIN,CARDIN) INTEGER INFOIN(10) - BYTE CARDIN(160) + CHARACTER*1 CARDIN(160) COMMON /T2FLGC/ FLAGS(100) LOGICAL FLAGS ccccccccccccccccccccccccc 25-Jan-96 Modified by Y.Teramoto @@ -7644,7 +7656,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING REAL TXSYM EXTERNAL TXSYM DOUBLE PRECISION TWO PI,ANGFAC(2) @@ -8487,7 +8499,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING REAL VEC(3),VEC2(3),LEAPYR,REGYR,DAYS(12) DATA DAYS/0.31,0.31,0.28,0.31,0.30,0.31,0.30,0.31,0.31 ,0.30,0.31 *,0.30/ @@ -8640,7 +8652,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING REAL VECT(3),UDIR(3),VDIR(3),HDIR(3),XHAT(3) DATA XHAT/1.,0.,0./ IF(.NOT.(FLAGS(56)))GOTO 10411 @@ -8767,7 +8779,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING REAL XYZ(3,4),XY(2,4) IAX2=IXYZ-1 IF (IAX2.EQ.0) IAX2=3 @@ -8826,7 +8838,7 @@ END cnext **************************************** SUBROUTINE TXPACK(IN,OUT) - BYTE IN(8) + INTEGER*1 IN(8) Character*8 OUT DO 10 I=1,8 10 OUT(I:I) = CHAR(IN(I)) diff -uNr tdr-1.7.orig/tdr1.6/tx3txt.f tdr-1.7/tdr1.6/tx3txt.f --- tdr-1.7.orig/tdr1.6/tx3txt.f 1996-08-22 20:01:31.000000000 +0900 +++ tdr-1.7/tdr1.6/tx3txt.f 2005-09-28 13:00:56.000000000 +0900 @@ -1,7 +1,7 @@ SUBROUTINE TX3TXT(XYZ,SIZEIN,UP,TEXT,NTEXT,CASE,NCASE,ICNTR) INTEGER NTEXT,NCASE REAL XYZ(3),SIZEIN(3),UP(3),ORIENT - BYTE TEXT(1),CASE(1) + INTEGER*1 TEXT(1),CASE(1) COMMON/TXCOM/PLIM(4,3),DLIM(4,3), XLINE,YLINE,XFRMFC,TXTSIZ,TXTANG *,TXTAN0,TXTWID,TXTTXT,TXTCOL, IPAT,NPAT, PAT(20),PATCUM(20),PATTOT *,XPAT,YPAT, XARRAY(60),YARRAY(60), NPTS,IDDEVC,IDDFLG,SIDEWZ,MOVDR @@ -23,10 +23,10 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING REAL POS(3,2),BBITS(2),T12(3,2),T1(3),T2(3), XY(2),XY1(2),XY3(2), *SIZE(3) - BYTE DOT,TEXT2(2) + CHARACTER*1 DOT,TEXT2(2) INTEGER*4 NLONG2,ONE,TWO character*128 ptext, stext, ctext DATA DOT/ 1H//,ONE,TWO/1,2/ diff -uNr tdr-1.7.orig/tdr1.6/txcont.f tdr-1.7/tdr1.6/txcont.f --- tdr-1.7.orig/tdr1.6/txcont.f 1996-08-22 20:01:32.000000000 +0900 +++ tdr-1.7/tdr1.6/txcont.f 2005-09-28 13:00:56.000000000 +0900 @@ -20,9 +20,9 @@ ccccccccccccccccccccc Dec 24, 1992, Modified by Y.Teramoto call pflush if( index( device, 'lbp8' ) .eq. 0 - 1 .and. index( device, 'canonlbp' ) .eq. 0 - 2 .and. index( device, 'psl' ) .eq. 0 - 3 .and. index( device, 'psp' ) .eq. 0 ) then + 1 .and. index( device, 'canonlbp' ) .eq. 0 + 2 .and. index( device, 'psl' ) .eq. 0 + 3 .and. index( device, 'psp' ) .eq. 0 ) then ccccccccccccccccccccc 2-Mar-96 Removed a few lines by Y.Teramoto ccccccccccccccccccccc 5-Feb-93 Modified by A.Miyamoto/Y.Teramoto ccccccccccccccccccccc 4-Apr-96 Modified by A.Miyamoto/Y.Teramoto diff -uNr tdr-1.7.orig/tdr1.6/txdef1.f tdr-1.7/tdr1.6/txdef1.f --- tdr-1.7.orig/tdr1.6/txdef1.f 1996-08-22 20:01:32.000000000 +0900 +++ tdr-1.7/tdr1.6/txdef1.f 2005-09-28 13:00:56.000000000 +0900 @@ -18,7 +18,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING REAL SCRTMP(2) LOGICAL QPX(4) CHARACTER*8 STRYES,STRQPX,QPXCHR(5) diff -uNr tdr-1.7.orig/tdr1.6/txdevc.f tdr-1.7/tdr1.6/txdevc.f --- tdr-1.7.orig/tdr1.6/txdevc.f 1996-08-22 20:01:33.000000000 +0900 +++ tdr-1.7/tdr1.6/txdevc.f 2005-09-28 13:00:56.000000000 +0900 @@ -11,7 +11,7 @@ INTEGER NPTS,TXTWID,TXTTXT,TXTCOL,IDDEVC,IDDFLG,SIDEWZ ,IPAT,NPAT INTEGER*4 DLIM INTEGER INFOIN(9) - BYTE CARDIN(25) + CHARACTER*1 CARDIN(25) COMMON /T2FLGC/ FLAGS(100) LOGICAL FLAGS ccccccccccccccccccc 26-Jan-96 Modified by Y.Teramoto @@ -22,9 +22,9 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING - BYTE LBUFFR(400) - BYTE BLANK,UNDRSC,PERIOD,COMMA1 + CHARACTER*1 STRING + CHARACTER*1 LBUFFR(400) + CHARACTER*1 BLANK,UNDRSC,PERIOD,COMMA1 CHARACTER*8 STAR,COMMA8,OARX(20),QCAL(8),QEXT ,DDNAME,DDLIST(14) LOGICAL FLUSH(14),ALLOW(14),ALLOWX,HARD(14) EQUIVALENCE (BUFFER(1),LBUFFR(1)) diff -uNr tdr-1.7.orig/tdr1.6/txdot.f tdr-1.7/tdr1.6/txdot.f --- tdr-1.7.orig/tdr1.6/txdot.f 1996-08-22 20:01:33.000000000 +0900 +++ tdr-1.7/tdr1.6/txdot.f 2005-09-28 13:00:56.000000000 +0900 @@ -18,7 +18,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING INTEGER NOWWID,NOWCOL CHARACTER*8 QDOT(2),QWID(4),QCOL(7) INTEGER*4 ONE,NLONG diff -uNr tdr-1.7.orig/tdr1.6/txend.f tdr-1.7/tdr1.6/txend.f --- tdr-1.7.orig/tdr1.6/txend.f 1996-08-22 20:01:33.000000000 +0900 +++ tdr-1.7/tdr1.6/txend.f 2005-09-28 13:00:56.000000000 +0900 @@ -20,7 +20,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING IF(.NOT.(FLAGS(29)))GOTO 12071 WRITE(DBGFIL,12080) 12080 FORMAT (60X, 12HTXEND CALLED) diff -uNr tdr-1.7.orig/tdr1.6/txline.f tdr-1.7/tdr1.6/txline.f --- tdr-1.7.orig/tdr1.6/txline.f 1996-08-22 20:01:33.000000000 +0900 +++ tdr-1.7/tdr1.6/txline.f 2005-09-28 13:00:56.000000000 +0900 @@ -24,7 +24,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING INTEGER NOWCOL,NOWTEX,NOWWID CHARACTER*8 QWID(4),QTEX(4),QCOL(7) INTEGER*4 ONE,NLONG diff -uNr tdr-1.7.orig/tdr1.6/txlpat.f tdr-1.7/tdr1.6/txlpat.f --- tdr-1.7.orig/tdr1.6/txlpat.f 1996-08-22 20:01:34.000000000 +0900 +++ tdr-1.7/tdr1.6/txlpat.f 2005-09-28 13:00:56.000000000 +0900 @@ -18,7 +18,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING ccccccccccccccccccc 26-Jan-96 Modified by Y.Teramoto integer*4 style, color integer*4 pxtexsty diff -uNr tdr-1.7.orig/tdr1.6/txnext.f tdr-1.7/tdr1.6/txnext.f --- tdr-1.7.orig/tdr1.6/txnext.f 1996-08-22 20:01:34.000000000 +0900 +++ tdr-1.7/tdr1.6/txnext.f 2005-09-28 13:00:56.000000000 +0900 @@ -18,7 +18,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING ccccccccccccccccc 6-Sep-91 Modified by Y.Teramoto real*4 scrnsize( 4 ) character*9 device @@ -42,11 +42,11 @@ call pxdev( 0, device ) call pfclr if( index( device, 'X' ) .eq. 0 - 1 .and. index( device, 'XM' ) .eq. 0 - 2 .and. index( device, 'XN' ) .eq. 0 - 3 .and. index( device, 'XMN' ) .eq. 0 - 4 .and. index( device, 'psl' ) .eq. 0 - 5 .and. index( device, 'psp' ) .eq. 0 ) then + 1 .and. index( device, 'XM' ) .eq. 0 + 2 .and. index( device, 'XN' ) .eq. 0 + 3 .and. index( device, 'XMN' ) .eq. 0 + 4 .and. index( device, 'psl' ) .eq. 0 + 5 .and. index( device, 'psp' ) .eq. 0 ) then call pfclos( 'clear' ) call pfopen( device ) endif diff -uNr tdr-1.7.orig/tdr1.6/txscis.f tdr-1.7/tdr1.6/txscis.f --- tdr-1.7.orig/tdr1.6/txscis.f 1996-08-22 20:01:34.000000000 +0900 +++ tdr-1.7/tdr1.6/txscis.f 2005-09-28 13:00:56.000000000 +0900 @@ -18,7 +18,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING ccccccccccccccccccc 6-Sep-91 Modified by Y.Teramoto real*4 scrnsize( 4 ) cccccccccccccccccccccccc @@ -46,7 +46,7 @@ call pfwdow( PLIM( 1,I ), PLIM( 2,I ), PLIM( 3,I ), PLIM( 4,I ) ) call pxscrn( 0, i, scrnsize ) call pfscrn( scrnsize( 1 ), scrnsize( 2 ), - 1 scrnsize( 3 ), scrnsize( 4 ) ) + 1 scrnsize( 3 ), scrnsize( 4 ) ) ccccccccccccccccc end of modification RETURN END diff -uNr tdr-1.7.orig/tdr1.6/txsym.f tdr-1.7/tdr1.6/txsym.f --- tdr-1.7.orig/tdr1.6/txsym.f 1996-08-22 20:01:35.000000000 +0900 +++ tdr-1.7/tdr1.6/txsym.f 2005-09-28 13:00:56.000000000 +0900 @@ -1,5 +1,5 @@ REAL FUNCTION TXSYM(TEXT) - BYTE TEXT(3) + INTEGER*1 TEXT(3) INTEGER*4 ONE DATA ONE/1/ CHARACTER TSYMC diff -uNr tdr-1.7.orig/tdr1.6/txtext.f tdr-1.7/tdr1.6/txtext.f --- tdr-1.7.orig/tdr1.6/txtext.f 1996-08-22 20:01:35.000000000 +0900 +++ tdr-1.7/tdr1.6/txtext.f 2005-09-28 13:00:56.000000000 +0900 @@ -1,7 +1,7 @@ SUBROUTINE TXTEXT(X,Y,SIZEIN,ORIENT,TEXT,NTEXT,CASE,NCASE) INTEGER NTEXT,NCASE REAL X,Y,SIZEIN,ORIENT - BYTE TEXT,CASE + INTEGER*1 TEXT,CASE DIMENSION TEXT(*),CASE(*) COMMON/TXCOM/PLIM(4,3),DLIM(4,3), XLINE,YLINE,XFRMFC,TXTSIZ,TXTANG *,TXTAN0,TXTWID,TXTTXT,TXTCOL, IPAT,NPAT, PAT(20),PATCUM(20),PATTOT @@ -24,9 +24,9 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING CHARACTER*8 SPACE,XSPACE,QWID(4),QTXR(4),QCOL(7) - BYTE CRMTXT(8),EQUALS + CHARACTER*1 CRMTXT(8),EQUALS INTEGER*4 NLONG CHARACTER*256 CHRTXT,CHRCAS ccccccccccccccc 2-Mar-96 Modified by Y.Teramoto @@ -59,8 +59,8 @@ call pxangle( 1, ANGLE ) call pxsize( 1, SIZE ) call pxtext( - 1 qtxt(1)//qtxt(2)//qtxt(3)//qtxt(4)//qtxt(5)//qtxt(6)//qtxt(7), - 1 x, y, chrtxt( 1:NTEXT ), chrcas( 1:NTEXT ) ) + 1 qtxt(1)//qtxt(2)//qtxt(3)//qtxt(4)//qtxt(5)//qtxt(6)//qtxt(7), + 1 x, y, chrtxt( 1:NTEXT ), chrcas( 1:NTEXT ) ) ccccccccccccccccccc end of modification FLAGS(1) = .FALSE. GOTO 13071 @@ -142,8 +142,8 @@ call pxangle( 1, ANGLE ) call pxsize( 1, sizep ) call pxtext( - 1 qtxt(1)//qtxt(2)//qtxt(3)//qtxt(4)//qtxt(5)//qtxt(6)//qtxt(7), - 1 x, y, chrtxt( 1:NTEXT ), chrcas( 1:NTEXT ) ) + 1 qtxt(1)//qtxt(2)//qtxt(3)//qtxt(4)//qtxt(5)//qtxt(6)//qtxt(7), + 1 x, y, chrtxt( 1:NTEXT ), chrcas( 1:NTEXT ) ) ccccccccccccccccccc end of modification FLAGS(1) = .FALSE. 13261 CONTINUE diff -uNr tdr-1.7.orig/tdr1.6/txtsym.f tdr-1.7/tdr1.6/txtsym.f --- tdr-1.7.orig/tdr1.6/txtsym.f 1996-08-22 20:01:35.000000000 +0900 +++ tdr-1.7/tdr1.6/txtsym.f 2005-09-28 13:00:56.000000000 +0900 @@ -26,9 +26,9 @@ cccc CALL UGPTXT(QTXT(1)//QTXT(2)//QTXT(3)//QTXT(4)//QTXT(5)// cccc >QTXT(6)//QTXT(7) cccc >,X,Y,CHRSYM,CHRCAS,PXEL) - call pxtext( - 1 qtxt(1)//qtxt(2)//qtxt(3)//qtxt(4)//qtxt(5)//qtxt(6)//qtxt(7), - 1 x, y, chrsym, chrcas ) + call pxtext( + 1 qtxt(1)//qtxt(2)//qtxt(3)//qtxt(4)//qtxt(5)//qtxt(6)//qtxt(7), + 1 x, y, chrsym, chrcas ) ccccccccccccccccccc end of modification RETURN END diff -uNr tdr-1.7.orig/tdr1.6/txvoid.f tdr-1.7/tdr1.6/txvoid.f --- tdr-1.7.orig/tdr1.6/txvoid.f 1996-08-22 20:01:35.000000000 +0900 +++ tdr-1.7/tdr1.6/txvoid.f 2005-09-28 13:00:56.000000000 +0900 @@ -20,7 +20,7 @@ REAL FLOTNG INTEGER MAXSTR,INTERP,KEYORD,NSTRNG INTEGER*4 INTEG - BYTE STRING + CHARACTER*1 STRING IF(.NOT.(FLAGS(24)))GOTO 13721 IF(PXEL(1) .LE. 3)GOTO 13741 CALL TXATTN diff -uNr tdr-1.7.ORIG/tdr1.6/pxplin.f tdr-1.7/tdr1.6/pxplin.f --- tdr-1.7.ORIG/tdr1.6/pxplin.f 2006-10-05 19:01:29.000000000 +0900 +++ tdr-1.7/tdr1.6/pxplin.f 2006-10-06 18:06:24.000000000 +0900 @@ -14,7 +14,10 @@ integer ibts integer kbts integer ibbt - integer bits( 32 ) +c>>> +c integer bits( 32 ) + integer*8 bits( 32 ) +c>>> integer int3 integer int4 logical btfg diff -uNr tdr-1.7.ORIG/tdr1.6/pxplins.f tdr-1.7/tdr1.6/pxplins.f --- tdr-1.7.ORIG/tdr1.6/pxplins.f 2006-10-05 19:01:29.000000000 +0900 +++ tdr-1.7/tdr1.6/pxplins.f 2006-10-06 18:07:29.000000000 +0900 @@ -15,7 +15,10 @@ integer ibts integer kbts integer ibbt - integer bits( 32 ) +c>>> +c integer bits( 32 ) + integer*8 bits( 32 ) +c>>> integer int3 integer int4 logical btfg diff -uNr tdr-1.7.ORIG/tdr1.6/topdrw.f tdr-1.7/tdr1.6/topdrw.f --- tdr-1.7.ORIG/tdr1.6/topdrw.f 2006-10-05 19:01:29.000000000 +0900 +++ tdr-1.7/tdr1.6/topdrw.f 2006-10-06 17:59:01.000000000 +0900 @@ -773,7 +773,16 @@ cccc INTEGER*1 iBLANK, iZERO, iMINUS EQUIVALENCE (BLANK,iBLANK), (ZERO,iZERO), (MINUS,iMINUS) - DATA iBLANK/x'40'/,iZERO/00/,iMINUS/x'FF'/ + +c>>> gfortran 4.2 +c DATA iBLANK/x'40'/,iZERO/00/,iMINUS/x'FF'/ + INTEGER*1 iBLANK1(4), iZERO1(4), iMINUS1(4) + INTEGER*4 iBLANK4, iZERO4, iMINUS4 + equivalence (iblank1(1),iblank4), (izero1(1), izero4) + equivalence (iminus1(1),iminus4) + DATA iBLANK4/x'40'/,iZERO4/00/,iMINUS4/x'FF'/ +c>>> + c Y.Teramoto modified DATA BLANK/1H / -> DATA BLANK/z40/ c DATA BLANK/x'40'/,ZERO/0/,MINUS/x'FF'/ DATA NERR/0/