iUpdate port: print/ghostscript-afpl

	- Update EPLASER driver to version 3.1.1
	- Fix papersize handling of LIPS driver

PR:		ports/57008
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

1 files changed, 64 insertions, 7 deletions

diff --git a/print/ghostscript8/files/patch-lips:gdevl4v.c b/print/ghostscript8/files/patch-lips:gdevl4v.c
index c4b3bfb38e76..91da63b0b63e 100644
--- a/print/ghostscript8/files/patch-lips:gdevl4v.c
+++ b/print/ghostscript8/files/patch-lips:gdevl4v.c
@@ -1,6 +1,6 @@
 --- lips/gdevl4v.c.orig	Thu Nov  2 12:09:18 2000
-+++ lips/gdevl4v.c	Sun Nov 10 21:17:34 2002
-@@ -230,41 +230,35 @@
++++ lips/gdevl4v.c	Fri Sep 12 10:11:25 2003
+@@ -230,41 +230,66 @@
  };
  
  /* Vector device implementation */
@@ -12,6 +12,7 @@
 -private int lips4v_setdash(P4(gx_device_vector * vdev, const float *pattern,
 -			      uint count, floatp offset));
 -private int lips4v_setflat(P2(gx_device_vector * vdev, floatp flatness));
++#if GS_VERSION_MAJOR >= 8
 +private int lips4v_beginpage(gx_device_vector * vdev);
 +private int lips4v_setfillcolor(gx_device_vector * vdev,
 +				   const gx_drawing_color * pdc);
@@ -20,25 +21,52 @@
 +private int lips4v_setdash(gx_device_vector * vdev, const float *pattern,
 +			      uint count, floatp offset);
 +private int lips4v_setflat(gx_device_vector * vdev, floatp flatness);
++private int
++lips4v_setlogop(gx_device_vector * vdev, gs_logical_operation_t lop,
++		 gs_logical_operation_t diff);
  private int
 -lips4v_setlogop(P3
--
+ 
 -		(gx_device_vector * vdev, gs_logical_operation_t lop,
 -		 gs_logical_operation_t diff));
++lips4v_beginpath(gx_device_vector * vdev, gx_path_type_t type);
++private int
++lips4v_moveto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
++	       floatp y, gx_path_type_t type);
++private int
++lips4v_lineto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
++	       floatp y, gx_path_type_t type);
++private int
++lips4v_curveto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x1,
++		floatp y1, floatp x2, floatp y2, floatp x3, floatp y3,
++		gx_path_type_t type);
++lips4v_closepath(gx_device_vector * vdev, floatp x, floatp y, floatp x_start,
++		  floatp y_start, gx_path_type_t type);
++
++private int lips4v_endpath(gx_device_vector * vdev, gx_path_type_t type);
++#else
++private int lips4v_beginpage(P1(gx_device_vector * vdev));
++private int lips4v_setfillcolor(gx_device_vector * vdev,
++				   const gx_drawing_color * pdc);
++private int lips4v_setstrokecolor(gx_device_vector * vdev,
++				     const gx_drawing_color * pdc);
++private int lips4v_setdash(gx_device_vector * vdev, const float *pattern,
++			      uint count, floatp offset);
++private int lips4v_setflat(gx_device_vector * vdev, floatp flatness);
++private int
 +lips4v_setlogop(gx_device_vector * vdev, gs_logical_operation_t lop,
 +		 gs_logical_operation_t diff);
  private int
  
 -lips4v_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type));
 +lips4v_beginpath(gx_device_vector * vdev, gx_path_type_t type);
-+private int
-+lips4v_moveto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
-+	       floatp y, gx_path_type_t type);
  private int
 -lips4v_moveto(P6
 -	      (gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
 -	       floatp y, gx_path_type_t type));
--private int
++lips4v_moveto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
++	       floatp y, gx_path_type_t type);
+ private int
 -lips4v_lineto(P6
 -	      (gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
 -	       floatp y, gx_path_type_t type));
@@ -60,6 +88,35 @@
  
 -private int lips4v_endpath(P2(gx_device_vector * vdev, gx_path_type_t type));
 +private int lips4v_endpath(gx_device_vector * vdev, gx_path_type_t type);
++#endif
  private int lips4v_setlinewidth(gx_device_vector * vdev, floatp width);
  private int lips4v_setlinecap(gx_device_vector * vdev, gs_line_cap cap);
  private int lips4v_setlinejoin(gx_device_vector * vdev, gs_line_join join);
+@@ -758,10 +783,10 @@
+     /* 用紙サイズ */
+     if (pdev->prev_paper_size != paper_size) {
+ 	if (paper_size == USER_SIZE) {
+-	    sprintf(paper, "%c80;%d;%dp", LIPS_CSI, width * 10, height * 10);
++	    sprintf(paper, "%c80;%d;%dp", LIPS_CSI, height * 10, width * 10);
+ 	    lputs(s, paper);
+ 	} else if (paper_size == USER_SIZE + LANDSCAPE) {
+-	    sprintf(paper, "%c81;%d;%dp", LIPS_CSI, height * 10, width * 10);
++	    sprintf(paper, "%c81;%d;%dp", LIPS_CSI, width * 10, height * 10);
+ 	    lputs(s, paper);
+ 	} else {
+ 	    sprintf(paper, "%c%dp", LIPS_CSI, paper_size);
+@@ -770,12 +795,12 @@
+     } else if (paper_size == USER_SIZE) {
+ 	if (pdev->prev_paper_width != width ||
+ 	    pdev->prev_paper_height != height)
+-		sprintf(paper, "%c80;%d;%dp", LIPS_CSI, width * 10, height * 10);
++		sprintf(paper, "%c80;%d;%dp", LIPS_CSI, height * 10, width * 10);
+ 	lputs(s, paper);
+     } else if (paper_size == USER_SIZE + LANDSCAPE) {
+ 	if (pdev->prev_paper_width != width ||
+ 	    pdev->prev_paper_height != height)
+-		sprintf(paper, "%c81;%d;%dp", LIPS_CSI, height * 10, width * 10);
++		sprintf(paper, "%c81;%d;%dp", LIPS_CSI, width * 10, height * 10);
+ 	lputs(s, paper);
+     }
+     pdev->prev_paper_size = paper_size;