🚀 go-pugleaf

Archive-name: psroff3.0/Patch.09
Submitted-by: clewis@ferret.ocunix.on.ca (Chris Lewis)

    This is official patch 09 for Psroff 3.0.
    Please apply it by:
	cd <psroff source directory>
	patch -N -p < <this file>
    
    The base release of psroff3.0 and patches were in
    comp.sources.unix volume 24 and 25.

    Boy did I ever screw up.  Patch 8 wouldn't compile because
    the patch generator didn't see the change to lj.h, *and*
    I forgot to adjust the character shifts in lj.c to compensate
    for the resolution change.  The rest of this patch is documentation
    change necessitated by the resolution change.

../lib/lj3.fonts
../lib/psrofflib.S
../lib/lj3u.fonts
../lj.h
../README
../MISC
../defs.h
../lj.c

Patchwrapped: 920128230528

Index: ./lib/lj3.fonts
*** /tmp/PATCHold/./lib/lj3.fonts	Tue Jan 28 23:03:45 1992
--- ./lib/lj3.fonts	Tue Jan 28 23:03:46 1992
***************
*** 1,4 ****
! #@(#)lj3.fonts 2.6 91/04/05
  #	Laserjet III fonts file.
  #	See lj.fonts for more explanation.
  #	The first ten fonts are the built-in scaleable typefaces.
--- 1,4 ----
! #@(#)lj3.fonts 2.8 92/01/28
  #	Laserjet III fonts file.
  #	See lj.fonts for more explanation.
  #	The first ten fonts are the built-in scaleable typefaces.
***************
*** 60,65 ****
--- 60,66 ----
  co N \245
  sq N \273
  symbol
+ br N | -92 0
  eq S =
  ts S \133
  mi S -
***************
*** 84,86 ****
--- 85,101 ----
  #bs 4 \305
  #rh 4 \301
  #lh 4 \341
+ extensions
+ *A N A
+ *B N B
+ *E N E
+ *Z N Z
+ *Y N Y
+ *I N I
+ *K N K
+ *M N M
+ *N N N
+ *O N O
+ *R N R
+ *T N T
+ *X N X
Index: ./lib/psrofflib.S
*** /tmp/PATCHold/./lib/psrofflib.S	Tue Jan 28 23:03:55 1992
--- ./lib/psrofflib.S	Tue Jan 28 23:03:58 1992
***************
*** 1,4 ****
! #	2.23 92/01/23
  #	This file controls psroff, you can insert additional printer
  #	types here.  These are eval'd *late* in processing, so that
  #	you can insert $copies etc.
--- 1,4 ----
! #	2.24 92/01/28
  #	This file controls psroff, you can insert additional printer
  #	types here.  These are eval'd *late* in processing, so that
  #	you can insert $copies etc.
***************
*** 35,41 ****
  #	ptr: default physical printer name (eg: "lp -d$ptr")
  #
  #	Useful troff2ps args:
! #		-T<type>	driver type (ps, lj, dt)
  #		-p<printer>	printer-specific initializations - eg:
  #				prefix for *.lib and *.fonts files.
  #				(defaults to <type>).  Should be set
--- 35,41 ----
  #	ptr: default physical printer name (eg: "lp -d$ptr")
  #
  #	Useful troff2ps args:
! #		-T<type>	driver type (ps, lj, lj3, dt)
  #		-p<printer>	printer-specific initializations - eg:
  #				prefix for *.lib and *.fonts files.
  #				(defaults to <type>).  Should be set
Index: ./lib/lj3u.fonts
*** /tmp/PATCHold/./lib/lj3u.fonts	Tue Jan 28 23:04:08 1992
--- ./lib/lj3u.fonts	Tue Jan 28 23:04:09 1992
***************
*** 1,4 ****
! #@(#)lj3u.fonts 2.1 91/04/05
  #	Laserjet III fonts file.  Shuffled for Universal as primary typeface.
  #	See lj.fonts for more explanation.
  #	The first ten fonts are the built-in scaleable typefaces.
--- 1,4 ----
! #@(#)lj3u.fonts 2.2 92/01/28
  #	Laserjet III fonts file.  Shuffled for Universal as primary typeface.
  #	See lj.fonts for more explanation.
  #	The first ten fonts are the built-in scaleable typefaces.
***************
*** 60,65 ****
--- 60,66 ----
  co N \245
  sq N \273
  symbol
+ br N | -92 0
  eq S =
  ts S \133
  mi S -
***************
*** 84,86 ****
--- 85,101 ----
  #bs 4 \305
  #rh 4 \301
  #lh 4 \341
+ extensions
+ *A N A
+ *B N B
+ *E N E
+ *Z N Z
+ *Y N Y
+ *I N I
+ *K N K
+ *M N M
+ *N N N
+ *O N O
+ *R N R
+ *T N T
+ *X N X
Index: ./lj.h
*** /tmp/PATCHold/./lj.h	Tue Jan 28 23:04:16 1992
--- ./lj.h	Tue Jan 28 23:04:17 1992
***************
*** 8,14 ****
      Function:		Laserjet Driver definitions
   */
  
! /* 2.3 92/01/12 */
  
  /*	We're using dots now */
  #define	LJRESOLUTION	300
--- 8,14 ----
      Function:		Laserjet Driver definitions
   */
  
! /* 2.4 92/01/26 */
  
  /*	We're using dots now */
  #define	LJRESOLUTION	300
***************
*** 21,28 ****
  /*	11" paper length */
  #define	TROFF2LJY(y) (((long) (y)+pageyoffset)*LJRESOLUTION/TROFFRESOLUTION)
  
! extern int ljProlog(), ljEpilog(), ljChar(), ljPage(), ljDraw();
  
  extern struct troff2befont ljSymFont[], ljStdFont[];
  
  extern int fontCount;
--- 21,31 ----
  /*	11" paper length */
  #define	TROFF2LJY(y) (((long) (y)+pageyoffset)*LJRESOLUTION/TROFFRESOLUTION)
  
! extern int ljProlog(), ljEpilog(), ljChar(), ljPage(), ljDraw(), lj3Draw();
  
  extern struct troff2befont ljSymFont[], ljStdFont[];
  
  extern int fontCount;
+ 
+ #define	XY	"\033*p%dx%dY"
+ #define	X	"\033*p%dX"
Index: ./README
*** /tmp/PATCHold/./README	Tue Jan 28 23:04:27 1992
--- ./README	Tue Jan 28 23:04:31 1992
***************
*** 1,4 ****
! 		PSROFF RELEASE 3.0 README 2.22 91/12/07
  
  			Feb 19, 1991
  			Chris Lewis
--- 1,4 ----
! 		PSROFF RELEASE 3.0 README 2.23 92/01/28
  
  			Feb 19, 1991
  			Chris Lewis
***************
*** 418,427 ****
  	- all drawing commands (including the newer \D'fn' (set fill),
  	  \D'tn' (line thickness), \D'p x y x y x y ...' (draw polygon),
  	  and filled versions of \D'c...', \D'e...', \D'p...' (by capitalizing
! 	  the letter)).  Drawing commands are NOT supported in HPPCL.
  	  (I think I have polygons right, but I don't know whether I got fill
  	  parameters correct - "n" is 0...1000, where 0 is all black, and 1000
  	  is all white).
  	- psfig.
      - catconv/CAT Troff and psroff do not support:
  	- \s(nn, \S, \H, \f(xx
--- 418,429 ----
  	- all drawing commands (including the newer \D'fn' (set fill),
  	  \D'tn' (line thickness), \D'p x y x y x y ...' (draw polygon),
  	  and filled versions of \D'c...', \D'e...', \D'p...' (by capitalizing
! 	  the letter)).  
  	  (I think I have polygons right, but I don't know whether I got fill
  	  parameters correct - "n" is 0...1000, where 0 is all black, and 1000
  	  is all white).
+ 	  Drawing commands are NOT supported in HPPCL before PCL5 on the 
+ 	  LJIII.  As of PL8, all of the \D commands are supported on the LJIII.
  	- psfig.
      - catconv/CAT Troff and psroff do not support:
  	- \s(nn, \S, \H, \f(xx
Index: ./MISC
*** /tmp/PATCHold/./MISC	Tue Jan 28 23:04:46 1992
--- ./MISC	Tue Jan 28 23:04:48 1992
***************
*** 1,5 ****
  		Miscellaneous Tuning/Customization
! 			2.16 91/11/13
  
      - Vertical bars in eqn may not be vertical.  This is a botch
        in some versions of eqn - namely, eqn is asking for "|"
--- 1,5 ----
  		Miscellaneous Tuning/Customization
! 			2.17 92/01/28
  
      - Vertical bars in eqn may not be vertical.  This is a botch
        in some versions of eqn - namely, eqn is asking for "|"
***************
*** 147,160 ****
  	    append to lj.fonts:
  
  		normal
! 		ru N _ 0 -200
  		symbol
! 		br N | -220 0
  
  	    The two numbers are the X and Y shifts of the corresponding
  	    characters, where the numbers are scaled by (.01 * pointsize)
! 	    to get a shift in 1/720'ds.  Adjust these (carefully examine
! 	    tbl output to decide whether you want to move ru or br).
  
  	    The distributed defaults (which are shown here) are suitable
  	    for HP Times-Roman font floppies.
--- 147,161 ----
  	    append to lj.fonts:
  
  		normal
! 		ru N _ 0 -83
  		symbol
! 		br N | -92 0
  
  	    The two numbers are the X and Y shifts of the corresponding
  	    characters, where the numbers are scaled by (.01 * pointsize)
! 	    to get a shift in 1/300ths (the LJ driver uses units of 300dpi).
! 	    Adjust these (carefully examine tbl output to decide whether 
! 	    you want to move ru or br).
  
  	    The distributed defaults (which are shown here) are suitable
  	    for HP Times-Roman font floppies.
Index: ./defs.h
*** /tmp/PATCHold/./defs.h	Tue Jan 28 23:05:01 1992
--- ./defs.h	Tue Jan 28 23:05:05 1992
***************
*** 9,15 ****
   */
  
  /*	Official Release and Patch level:	*/
! #define	T2VERSION	"@(#)PSROFF Copyright 92/01/23 Chris Lewis - R3 PL8"
  
  /*	Configuration parameters:
   */
--- 9,15 ----
   */
  
  /*	Official Release and Patch level:	*/
! #define	T2VERSION	"@(#)PSROFF Copyright 92/01/27 Chris Lewis - R3 PL9"
  
  /*	Configuration parameters:
   */
Index: ./lj.c
*** /tmp/PATCHold/./lj.c	Tue Jan 28 23:05:18 1992
--- ./lj.c	Tue Jan 28 23:05:20 1992
***************
*** 32,38 ****
  
  #ifndef	lint
  static char SCCSid[] =
!     "@(#)lj.c: 2.8 Copyright 92/01/23 14:24:06 Chris Lewis";
  #endif
  
  struct troff2befont ljStdFont[108] = {
--- 32,38 ----
  
  #ifndef	lint
  static char SCCSid[] =
!     "@(#)lj.c: 2.11 Copyright 92/01/28 22:50:03 Chris Lewis";
  #endif
  
  struct troff2befont ljStdFont[108] = {
***************
*** 54,62 ****
              |    |                            D: draw macro
              |    |                            n: new font
              |    |
!             |    |  +------------------------ X-shift: scale by deci-point*100
              |    |  |
!             |    |  |  +--------------------- Y-shift: scale by deci-point*100
              |    |  |  |
              |    |  |  |  +------------------ Point-scale
              |    |  |  |  |
--- 54,62 ----
              |    |                            D: draw macro
              |    |                            n: new font
              |    |
!             |    |  +------------------------ X-shift: scale by 1/300*100
              |    |  |
!             |    |  |  +--------------------- Y-shift: scale by 1/300*100
              |    |  |  |
              |    |  |  |  +------------------ Point-scale
              |    |  |  |  |
***************
*** 84,90 ****
  	/* 18*/	{N, 0, 0, 0, ";"},
  	/* 19*/	{N, 0, 0, 0, NOC},
  	/* 20*/	{N, 0, 0, 0, "a"},
! 	/* 21*/	{N, 0, -200, 0, "_"},
  	/* 22*/	{N, 0, 0, 0, "c"},
  	/* 23*/	{N, 0, 0, 0, "`"},
  	/* 24*/	{N, 0, 0, 0, "e"},
--- 84,90 ----
  	/* 18*/	{N, 0, 0, 0, ";"},
  	/* 19*/	{N, 0, 0, 0, NOC},
  	/* 20*/	{N, 0, 0, 0, "a"},
! 	/* 21*/	{N, 0, -83, 0, "_"},
  	/* 22*/	{N, 0, 0, 0, "c"},
  	/* 23*/	{N, 0, 0, 0, "`"},
  	/* 24*/	{N, 0, 0, 0, "e"},
***************
*** 182,190 ****
              |    |                            D: draw macro
              |    |                            n: new font
              |    |
!             |    |  +------------------------ X-shift: scale by deci-point*100
              |    |  |
!             |    |  |  +--------------------- Y-shift: scale by deci-point*100
              |    |  |  |
              |    |  |  |  +------------------ Point-scale (scaled by 100)
              |    |  |  |  |
--- 182,190 ----
              |    |                            D: draw macro
              |    |                            n: new font
              |    |
!             |    |  +------------------------ X-shift: scale by 1/300*100
              |    |  |
!             |    |  |  +--------------------- Y-shift: scale by 1/300*100
              |    |  |  |
              |    |  |  |  +------------------ Point-scale (scaled by 100)
              |    |  |  |  |
***************
*** 291,297 ****
  	/* 97*/	{N, 0, 0, 0, "\322"},
  	/* 98*/	{N, 0, 0, 0, NOC},
  	/* 99*/	{S, 0, 0, 0, "\317"},
! 	/*100*/	{N, -220, 0, 0, "|"},
  	/*101*/	{N, 0, 2, 0, "*"},
  	/*102*/	{S, 0, 0, 0, "\276"},
  	/*103*/	{S, 0, 0, 0, "\315"},
--- 291,297 ----
  	/* 97*/	{N, 0, 0, 0, "\322"},
  	/* 98*/	{N, 0, 0, 0, NOC},
  	/* 99*/	{S, 0, 0, 0, "\317"},
! 	/*100*/	{N, -58, 0, 0, "|"},
  	/*101*/	{N, 0, 2, 0, "*"},
  	/*102*/	{S, 0, 0, 0, "\276"},
  	/*103*/	{S, 0, 0, 0, "\315"},