diff options
| author | Satoshi Taoka <taoka@FreeBSD.org> | 1999-06-14 01:02:35 +0000 |
|---|---|---|
| committer | Satoshi Taoka <taoka@FreeBSD.org> | 1999-06-14 01:02:35 +0000 |
| commit | 05ab7db287a09519b3654bc38c1eb72141ee1beb (patch) | |
| tree | 51900912a44da711a89bcade2482051ce6a5ebe7 /japanese/vfghostscript55 | |
| parent | c0fe7588fc51d633cf2455698bf798a85c0a8122 (diff) | |
| download | ports-05ab7db287a09519b3654bc38c1eb72141ee1beb.tar.gz ports-05ab7db287a09519b3654bc38c1eb72141ee1beb.zip | |
Updated printer drivers:
(1) from gdevlips4-1.2.0, gdevnpdl-1.4, epag-3.08 to gdevlips-2.3.2
[Merged printer driver sources (gdevnpdl and epag) into
the gdevlips's tar-ball]
(2) from gdevrpdl-1.0 to gdevrpdl-1.2
(3) from gdevalps-0.1 to gdevalps-0.2
(4) from gdevmjc-0.7 to gdevmjc-0.8
Submitted by: candy@ops.dti.ne.jp
Added a printer driver:
(5) gdevmd2k-0.2a
Added a patch (patches/patch-ad) to be able to use A4 in lj5mono and lj5gray
Fixed files/mk5 (pdf_sec.ps)
Sbumitted by: MIHIRA Sanpei Yoshiro <sanpei@sanpei.org>
and
Submitted by: Tatsuto Toyonaga <toyonaga@msd.ts.fujitsu.co.jp>
PR: ports/11755
Notes
Notes:
svn path=/head/; revision=19461
Diffstat (limited to 'japanese/vfghostscript55')
| -rw-r--r-- | japanese/vfghostscript55/Makefile | 84 | ||||
| -rw-r--r-- | japanese/vfghostscript55/distinfo | 13 | ||||
| -rw-r--r-- | japanese/vfghostscript55/files/gdevmjc.c.patch | 795 | ||||
| -rw-r--r-- | japanese/vfghostscript55/files/mjc.dev.patch | 84 | ||||
| -rw-r--r-- | japanese/vfghostscript55/files/patch-ad | 14 | ||||
| -rw-r--r-- | japanese/vfghostscript55/pkg-plist | 453 | ||||
| -rw-r--r-- | japanese/vfghostscript55/scripts/configure | 22 |
7 files changed, 673 insertions, 792 deletions
diff --git a/japanese/vfghostscript55/Makefile b/japanese/vfghostscript55/Makefile index 0a0daa4ea2ae..e41c8cf69730 100644 --- a/japanese/vfghostscript55/Makefile +++ b/japanese/vfghostscript55/Makefile @@ -3,7 +3,7 @@ # Date created: 26 Aug 1997 # Whom: Mita Yoshio <mita@jp.FreeBSD.org> # -# $Id: Makefile,v 1.30 1999/03/15 12:37:41 taoka Exp $ +# $Id: Makefile,v 1.31 1999/04/16 23:35:00 sada Exp $ # DISTNAME= ghostscript-5.50 @@ -13,7 +13,6 @@ MASTER_SITES= ftp://ftp.cs.wisc.edu/ghost/aladdin/gs550/ \ ftp://ftp.cs.wisc.edu/ghost/aladdin/fonts/ \ ftp://ftp.uu.net/graphics/png/src/ \ ftp://ftp.uu.net/graphics/jpeg/ \ - ftp://i1nws2.fukui-u.ac.jp/pub/TeX/dvipr/ \ http://www.bukka.p.chiba-u.ac.jp/~ohmori/gs/ \ ftp://ftp.mei.co.jp/free/gnu/util/ghostscript/drivers/ \ ${MASTER_SITE_LOCAL} \ @@ -22,9 +21,10 @@ MASTER_SITES= ftp://ftp.cs.wisc.edu/ghost/aladdin/gs550/ \ http://www.jaist.ac.jp/~daisuke/Linux/gs/gs5/Original-sources/OLD/ \ http://www.rd.nacsis.ac.jp/~katayama/homepage/ghostscript/jpdf/ \ http://itohws03.ee.noda.sut.ac.jp/~matsuda/VFlib-FT/ \ - http://www.ceres.dti.ne.jp/~owatanab/gdevnpdl/ \ ftp://ftp.humblesoft.com/pub/ \ - http://www.necs.co.jp/~umi/ + http://www.necs.co.jp/~umi/ \ + http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/ \ + http://www.aial.hiroshima-u.ac.jp/~sakai/Linux/gs5.50/ DISTFILES= ${GS_SOURCES} ${GS_DRIVERS} ${GS_FONTS_STD} ${GS_FONTS_OTHER} MAINTAINER= mita@jp.FreeBSD.org @@ -47,14 +47,13 @@ GS_SOURCES= ghostscript-5.50.tar.gz GS_SOURCES+= jpegsrc.v6b.tar.gz GS_SOURCES+= libpng-1.0.2.tar.gz GS_DRIVERS= gs5.50-vflib-1.0.tar.gz -GS_DRIVERS+= gdevlips-2.0.0.tar.gz -GS_DRIVERS+= gdevmjc-0.7.tar.gz -GS_DRIVERS+= gdevrpdl.tar.gz +GS_DRIVERS+= gdevlips-2.3.2.tar.gz +GS_DRIVERS+= gdevmjc-0.8.tar.gz GS_DRIVERS+= gdev10v.tar.gz GS_DRIVERS+= dmprt-2.01.tar.gz -GS_DRIVERS+= gdevnpdl-1.5.tar.gz -GS_DRIVERS+= epag-3.08.tar.gz -GS_DRIVERS+= gdevalps-0.1.tar.gz +GS_DRIVERS+= gdevalps-0.2.tar.gz +GS_DRIVERS+= gdevmd2k-0.2a.tar.gz +GS_DRIVERS+= gdevrpdl-1.2.tar.gz # Note: the following two are real files that have symlinks with # later version numbers pointing to them. To avoid unnecessarily # downloading distfiles, do not change these when upgrading the port @@ -79,46 +78,37 @@ pre-patch: post-patch: @( ${MKDIR} ${PRINTER} ; \ cd ${PRINTER} ; \ - tar xzf ${DISTDIR}/gdevlips-2.0.0.tar.gz ; \ - tar xzf ${DISTDIR}/gdevmjc-0.7.tar.gz ; \ - tar xzf ${DISTDIR}/gdevrpdl.tar.gz ; \ + tar xzf ${DISTDIR}/gdevlips-2.3.2.tar.gz ; \ + tar xzf ${DISTDIR}/gdevmjc-0.8.tar.gz ; \ tar xzf ${DISTDIR}/gdev10v.tar.gz ; \ ${MKDIR} ${PRINTER}/gdevdmpr ; \ tar -C gdevdmpr -xzf ${DISTDIR}/dmprt-2.01.tar.gz ; \ - tar xzf ${DISTDIR}/gdevnpdl-1.5.tar.gz ; \ - tar xzf ${DISTDIR}/epag-3.08.tar.gz ; \ - tar xzf ${DISTDIR}/gdevalps-0.1.tar.gz ; \ + tar xzf ${DISTDIR}/gdevalps-0.2.tar.gz ; \ + tar xzf ${DISTDIR}/gdevmd2k-0.2a.tar.gz ; \ + tar xzf ${DISTDIR}/gdevrpdl-1.2.tar.gz ; \ ${CP} gdev10v/gdev10v.c gdev10v/gdev10v.mak ${WRKSRC}; \ - ${CP} gdevmjc-0.7/gdevmjc.c gdevmjc-0.7/mjc.dev ${WRKSRC}; \ - ${CP} gdevlips-2.0.0/gdevlips.c gdevlips-2.0.0/gdevlips.mak ${WRKSRC}; \ - ${CP} gdevlips-2.0.0/gdevl4r.c gdevlips-2.0.0/gdevlips.h ${WRKSRC}; \ + ${CP} gdevmjc-0.8/*.[ch] gdevmjc-0.8/gdevmjc.mak ${WRKSRC}; \ + ${CP} gdevlips-2.3.2/*.[ch] gdevlips-2.3.2/gdevlips.mak ${WRKSRC}; \ ${CP} gdevdmpr/gdevdmpr.c gdevdmpr/gdevdmpr.mak ${WRKSRC}; \ ${CP} gdevdmpr/dviprlib.c gdevdmpr/dviprlib.h ${WRKSRC}; \ - ${CP} epag-3.08/gdevepag.c epag-3.08/gdevepag.mak ${WRKSRC}; \ - ${CP} gdevrpdl/gdevrpdl.c gdevrpdl/gdevrpdl.mak ${WRKSRC}; \ - ${CP} gdevnpdl/gdevnpdl.c gdevnpdl/gdevnpdl.mak ${WRKSRC}; \ - ${CP} gdevalps/gdevalps.c gdevalps/gdevalps.mk ${WRKSRC}; \ + ${CP} gdevalps-0.2/gdevalps.c gdevalps-0.2/gdevalps.mak-5.50 ${WRKSRC}; \ + ${CP} gdevmd2k-0.2a/gdevmd2k.c gdevmd2k-0.2a/gdevmd2k.mak-5.50 ${WRKSRC}; \ + ${CP} gdevrpdl-1.2/gdevrpdl.c gdevrpdl-1.2/gdevrpdl.mak ${WRKSRC}; \ ) @${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdev10v.mak.patch @${PATCH} ${PATCH_ARGS} < ${FILESDIR}/mjc.dev.patch @${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevdmpr.mak.patch - @${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevepag.mak.patch - @${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevnpdl.mak.patch - @${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevrpdl.mak.patch - @${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevalps.mak.patch @${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevmjc.c.patch +# @${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevmjc.mak.patch @${PATCH} ${PATCH_ARGS} < ${FILESDIR}/gdevdmpr.patch @${CAT} ${WRKSRC}/gdev10v.mak >> ${WRKSRC}/contrib.mak @${CAT} ${WRKSRC}/gdevdmpr.mak >> ${WRKSRC}/contrib.mak - @${CAT} ${WRKSRC}/gdevepag.mak >> ${WRKSRC}/contrib.mak +# @${CAT} ${WRKSRC}/mjc.dev >> ${WRKSRC}/contrib.mak @${CAT} ${WRKSRC}/gdevlips.mak >> ${WRKSRC}/contrib.mak @${CAT} ${WRKSRC}/gdevrpdl.mak >> ${WRKSRC}/contrib.mak - @${CAT} ${WRKSRC}/gdevnpdl.mak >> ${WRKSRC}/contrib.mak - @${CAT} ${WRKSRC}/mjc.dev >> ${WRKSRC}/contrib.mak - @${CAT} ${WRKSRC}/gdevalps.mk >> ${WRKSRC}/contrib.mak - -post-build: - @(cd ${PRINTER}/epag-3.08 ; ${MAKE}) + @${CAT} ${WRKSRC}/gdevmjc.mak >> ${WRKSRC}/contrib.mak + @${CAT} ${WRKSRC}/gdevalps.mak-5.50 >> ${WRKSRC}/contrib.mak + @${CAT} ${WRKSRC}/gdevmd2k.mak-5.50 >> ${WRKSRC}/contrib.mak pre-install: @${MKDIR} ${PREFIX}/share/ghostscript @@ -126,35 +116,35 @@ pre-install: @tar -C ${PREFIX}/share/ghostscript/fonts -xzf ${DISTDIR}/${GS_FONTS_OTHER} post-install: - ${INSTALL_PROGRAM} ${PRINTER}/epag-3.08/ert ${PREFIX}/bin @strip ${PREFIX}/bin/gs @( \ ${CP} ${WRKSRC}/gs5.50-vflib-1.0/README ${DOC_DIR}/README.gs5.10-vflib ; \ ${CP} ${WRKSRC}/gs5.50-vflib-1.0/OLD-DOC/gs261d13-doc/* ${DOC_DIR} ; \ ${CP} ${WRKSRC}/gs5.50-vflib-1.0/OLD-DOC/gs261j11-doc/* ${DOC_DIR} ; \ ${CP} ${PRINTER}/gdev10v/gdev10v.jis ${DOC_DIR} ; \ - ${CP} ${PRINTER}/gdevlips-2.0.0/Lips.htm ${DOC_DIR} ; \ - ${CP} ${PRINTER}/gdevlips-2.0.0/gs_statd.dif ${DOC_DIR} ; \ - ${CP} ${PRINTER}/gdevlips-2.0.0/gslipsif.sh ${DOC_DIR} ; \ - ${CP} ${PRINTER}/gdevmjc-0.7/README.jis ${DOC_DIR}/gdevmjc.jis ; \ - ${CP} ${PRINTER}/gdevmjc-0.7/MJ700V2C.FAQ ${DOC_DIR} ; \ + ${CP} ${PRINTER}/gdevlips-2.3.2/Gdevlips.htm ${DOC_DIR} ; \ + ${CP} ${PRINTER}/gdevlips-2.3.2/gs_statd.dif ${DOC_DIR} ; \ + ${MKDIR} ${DOC_DIR}/gdevmjc-0.8 + ${CP} ${PRINTER}/gdevmjc-0.8/README.mjc ${DOC_DIR}/gdevmjc-0.8/ ; \ + ${CP} ${PRINTER}/gdevmjc-0.8/README.noz ${DOC_DIR}/gdevmjc-0.8/ ; \ + ${CP} ${PRINTER}/gdevmjc-0.8/README.mje ${DOC_DIR}/gdevmjc-0.8/ ; \ + ${CP} ${PRINTER}/gdevmjc-0.8/cpem.doc ${DOC_DIR}/gdevmjc-0.8/ ; \ + ${CP} ${PRINTER}/gdevmjc-0.8/MJ700V2C.FAQ ${DOC_DIR}/gdevmjc.0.8/ ; \ + ${CP} ${PRINTER}/gdevalps-0.2/README.gdevalps ${DOC_DIR}/README.gdevalps ; \ + ${CP} ${PRINTER}/gdevmd2k-0.2a/README.jis ${DOC_DIR}/gdevmd2k.jis ; \ + ${CP} ${PRINTER}/gdevrpdl-1.2/gdevrpdl.doc ${DOC_DIR} ; \ ${CP} ${PRINTER}/gdevdmpr/gdevdmpr.sj ${DOC_DIR} ; \ - ${CP} ${PRINTER}/gdevnpdl/gdevnpdl.jis ${DOC_DIR} ; \ ${CP} ${PRINTER}/gdevdmpr/dmp_init.ps ${GSINST_DIR} ; \ ${CP} ${PRINTER}/gdevdmpr/dmp_site.ps ${GSINST_DIR} ; \ ${CP} ${PRINTER}/gdevdmpr/escp_24.src ${GSINST_DIR} ; \ ${CP} ${PRINTER}/gdevdmpr/testpage.ps ${GSINST_DIR} ; \ - ${MKDIR} ${DOC_DIR}/epag-3.08 ; \ - ${CP} ${PRINTER}/epag-3.08/FILES ${DOC_DIR}/epag-3.08 ; \ - ${CP} ${PRINTER}/epag-3.08/*.txt ${DOC_DIR}/epag-3.08 ; \ - ${CP} ${PRINTER}/epag-3.08/adjust.ps ${DOC_DIR}/epag-3.08 ; \ - ${CP} ${PRINTER}/epag-3.08/gsepagif.sh ${DOC_DIR}/epag-3.08 ; \ - ${CP} ${PRINTER}/epag-3.08/psprint ${DOC_DIR}/epag-3.08 ; \ + ${CP} ${PRINTER}/gdevmjc-0.8/gdevmjc.ps ${GSINST_DIR} ; \ ) .if defined(PDFENCRYPT) @${CP} -f ${DISTDIR}/pdf_sec.ps ${GSINST_DIR} .endif + # encrypted PDF support. can't be packaged due to export control issues. .if defined(PDFENCRYPT) MASTER_SITES+= http://www.ozemail.com.au/~geoffk/pdfencrypt/ diff --git a/japanese/vfghostscript55/distinfo b/japanese/vfghostscript55/distinfo index bcfaea63329a..be35d7f53ecd 100644 --- a/japanese/vfghostscript55/distinfo +++ b/japanese/vfghostscript55/distinfo @@ -2,14 +2,13 @@ MD5 (ghostscript-5.50.tar.gz) = f51e92976c4cda9a05de5388fdbbbbbd MD5 (jpegsrc.v6b.tar.gz) = dbd5f3b47ed13132f04c685d608a7547 MD5 (libpng-1.0.2.tar.gz) = a8b093154f07f7b82e5c9bb77c11a0c4 MD5 (gs5.50-vflib-1.0.tar.gz) = e934d1bd3a48a1c151e2a15af0640c97 -MD5 (gdevlips-2.0.0.tar.gz) = 88e7a44073a9f35e126a9b7ef383354a -MD5 (gdevmjc-0.7.tar.gz) = c96febe81ef1b467cf2050cc918001e7 -MD5 (gdevrpdl.tar.gz) = 9606f3cca1a8f85be76944fa4eda09b7 +MD5 (gdevlips-2.3.2.tar.gz) = 5484c0530330adb7d7bb8ec4daf37203 +MD5 (gdevmjc-0.8.tar.gz) = 228f41c3cccce22c8f477c7a9407527c MD5 (gdev10v.tar.gz) = 1486bb54c214ce215044a6c606280d73 MD5 (dmprt-2.01.tar.gz) = c7a9fb127fde5d888a798bf5e1822b88 -MD5 (gdevnpdl-1.5.tar.gz) = 8b1185b489c14c723f0fd0960fccffa0 -MD5 (epag-3.08.tar.gz) = e5e57176f55abc2c5224d405b5c402d1 -MD5 (gdevalps-0.1.tar.gz) = 67c9da9feae4e16938e43d5430cbd9c5 +MD5 (gdevalps-0.2.tar.gz) = 8690b96eeb79fe770983a86beae84a11 +MD5 (gdevmd2k-0.2a.tar.gz) = 5ed2b4218b8f77cb411f3d2e4509ed24 +MD5 (gdevrpdl-1.2.tar.gz) = af11f7926674b5b59c2028efab281889 MD5 (ghostscript-fonts-std-5.50.tar.gz) = 8462a429e2672d332a510da076dca6d2 MD5 (ghostscript-fonts-other-5.50.tar.gz) = e3540578f33caf5dfc384e5518890f57 -MD5 (pdf_sec.ps) = 33b855032c90a0e0e6d5a460be82c749 +MD5 (pdf_sec.ps) = 92cd6af5b4d7219e91e61b8351f0f7c4 diff --git a/japanese/vfghostscript55/files/gdevmjc.c.patch b/japanese/vfghostscript55/files/gdevmjc.c.patch index b1313a081801..02c2ed71fae1 100644 --- a/japanese/vfghostscript55/files/gdevmjc.c.patch +++ b/japanese/vfghostscript55/files/gdevmjc.c.patch @@ -1,3 +1,12 @@ +This is gdevmjc.c-0.8 patch for ghostscript 5.50 by kurosawa +with mj_put_params() fix by Inagaki Kentaro. + +NO WARRANTY + +-- Toshihiro Kanda <candy@ops.dti.ne.jp> + + +>>>>>>>>>>>>>>> original (0.7) patch preamble >>>>>>>>>>>>>> From root Fri Nov 22 01:20:20 1996 Received: from theta.iis.u-tokyo.ac.jp by daikon.fujita3.iis.u-tokyo.ac.jp (AIX 3.2/UCB 5.64/3.4W2) id AA18127; Fri, 22 Nov 1996 01:20:20 +0900 @@ -31,462 +40,332 @@ X-Mailer: mnews [version 1.19PL2] 1996-01/26(Fri) # $B%*%j%8%J%k$+$i$N%Q%C%A$K$7$?$O$:$G$9$1$I(B, $B:#F|$N>u67$@$H$A$g$C$H<+?.(B # $B$r;}$F$J$$(B(^^;) +<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< -*** gdevmjc.c.org Fri Nov 22 00:27:16 1996 ---- gdevmjc.c Fri Nov 22 00:35:20 1996 -*************** -*** 43,49 **** - #include <limits.h> - #include "gdevprn.h" - #include "gdevpcl.h" -! #include "gsprops.h" - - /*** - *** Note: Original driver gdevcdj.c for HP color printer was written ---- 43,50 ---- - #include <limits.h> - #include "gdevprn.h" - #include "gdevpcl.h" -! #include "gsparam.h" -! #include "gsstate.h" - - /*** - *** Note: Original driver gdevcdj.c for HP color printer was written -*************** -*** 139,145 **** ---- 140,148 ---- - - /* Undefined macros expected to be defined in gdevpcl.h */ - #define PAPER_SIZE_A3_NOBI 28 -+ #ifndef PAPER_SIZE_A2 - #define PAPER_SIZE_A2 29 -+ #endif - #define PAPER_SIZE_B4 30 - #define PAPER_SIZE_B5 31 - -*************** -*** 179,193 **** - private dev_proc_print_page(mjc720_print_page); - private dev_proc_print_page(mj500c_print_page); - -! private dev_proc_get_props(mj_get_props); -! private dev_proc_put_props(mj_put_props); - - private void expand_line(word *, int, int, int); - -! private int put_prop_float(gs_prop_item *, float *, float, float, int); -! private int put_prop_int(gs_prop_item *, int *, int, int, int); -! -! private void set_bpp(gx_device *, int); - - private uint gdev_prn_rasterwidth(const gx_device_printer *, int ); - ---- 182,194 ---- - private dev_proc_print_page(mjc720_print_page); - private dev_proc_print_page(mj500c_print_page); - -! private dev_proc_get_params(mj_get_params); -! private dev_proc_put_params(mj_put_params); - - private void expand_line(word *, int, int, int); - -! private int mj_put_param_int(P6(gs_param_list *, gs_param_name, int *, int, int, int)); -! private void mj_set_bpp(P2(gx_device *, int)); - - private uint gdev_prn_rasterwidth(const gx_device_printer *, int ); - -*************** -*** 214,220 **** - #define mj ((gx_device_mj *) pdev) - - #define prn_hp_colour_device(procs, dev_name, x_dpi, y_dpi, bpp, print_page)\ -! prn_device_body(gx_device_printer, procs, dev_name,\ - WIDTH_10THS, HEIGHT_10THS, x_dpi, y_dpi, 0, 0, 0, 0, 0,\ - bpp, 0, 0, 0, 0, print_page) - ---- 215,221 ---- - #define mj ((gx_device_mj *) pdev) - - #define prn_hp_colour_device(procs, dev_name, x_dpi, y_dpi, bpp, print_page)\ -! prn_device_body(gx_device_mj, procs, dev_name,\ - WIDTH_10THS, HEIGHT_10THS, x_dpi, y_dpi, 0, 0, 0, 0, 0,\ - bpp, 0, 0, 0, 0, print_page) - -*************** -*** 226,234 **** - } - - -! #define mj_colour_procs(proc_colour_open, proc_get_props, proc_put_props) {\ - proc_colour_open,\ -! gdev_pcl_get_initial_matrix,\ - gx_default_sync_output,\ - gdev_prn_output_page,\ - gdev_prn_close,\ ---- 227,235 ---- - } - - -! #define mj_colour_procs(proc_colour_open, proc_get_params, proc_put_params) {\ - proc_colour_open,\ -! gx_default_get_initial_matrix,\ - gx_default_sync_output,\ - gdev_prn_output_page,\ - gdev_prn_close,\ -*************** -*** 240,247 **** - NULL, /* copy_color */\ - NULL, /* draw_line */\ - gx_default_get_bits,\ -! proc_get_props,\ -! proc_put_props\ - } - - private int mjc_open(gx_device *); ---- 241,248 ---- - NULL, /* copy_color */\ - NULL, /* draw_line */\ - gx_default_get_bits,\ -! proc_get_params,\ -! proc_put_params\ - } - - private int mjc_open(gx_device *); -*************** -*** 249,255 **** - - - private gx_device_procs mj_procs = -! mj_colour_procs(mjc_open, mj_get_props, mj_put_props); - - gx_device_mj far_data gs_mjc180_device = - mj_device(mj_procs, "mjc180", 180, 180, BITSPERPIXEL, ---- 250,256 ---- - - - private gx_device_procs mj_procs = -! mj_colour_procs(mjc_open, mj_get_params, mj_put_params); - - gx_device_mj far_data gs_mjc180_device = - mj_device(mj_procs, "mjc180", 180, 180, BITSPERPIXEL, -*************** -*** 305,311 **** - - /* Set up colour params if put_props has not already done so */ - if (pdev->color_info.num_components == 0) -! set_bpp(pdev, pdev->color_info.depth); - - paper_size = gdev_mjc_paper_size(pdev); - if (paper_size == PAPER_SIZE_A2 ) { ---- 306,312 ---- - - /* Set up colour params if put_props has not already done so */ - if (pdev->color_info.num_components == 0) -! mj_set_bpp(pdev, pdev->color_info.depth); - - paper_size = gdev_mjc_paper_size(pdev); - if (paper_size == PAPER_SIZE_A2 ) { -*************** -*** 324,333 **** - m = mj_letter; - } - -! pdev->l_margin = m[0]; -! pdev->b_margin = m[1]; -! pdev->r_margin = m[2]; -! pdev->t_margin = m[3]; - - switch (mj->colorcomp) { - case 1: ---- 325,331 ---- - m = mj_letter; - } - -! gx_device_set_margins(pdev, m, true); - - switch (mj->colorcomp) { - case 1: -*************** -*** 352,430 **** - * and control over the bits-per-pixel used in output rendering */ - /* Added properties for DeskJet 5xxC */ - -- private const gs_prop_item props_mj[] = { -- /* Read-write properties. */ -- prop_def("Density", prt_int), -- prop_def("Cyan", prt_int), -- prop_def("Magenta", prt_int), -- prop_def("Yellow", prt_int), -- prop_def("Black", prt_int), -- prop_def("Dither", prt_int), -- prop_def("ColorComponent", prt_int), -- prop_def("Direction", prt_int), -- prop_def("MicroWeave", prt_int), -- prop_def("DotSize", prt_int), -- }; -- - private int -! mj_get_props(gx_device *pdev, gs_prop_item *plist) -! { int start = gdev_prn_get_props(pdev, plist); -! if ( plist != 0 ) { -! register gs_prop_item *pi = plist + start; -! memcpy(pi, props_mj, sizeof(props_mj)); -! pi[0].value.i = mj->density; -! pi[1].value.i = mj->cyan; -! pi[2].value.i = mj->magenta; -! pi[3].value.i = mj->yellow; -! pi[4].value.i = mj->black; -! pi[5].value.i = mj->dither; -! pi[6].value.i = mj->colorcomp; -! pi[7].value.i = mj->direction; -! pi[8].value.i = mj->microweave; -! pi[9].value.i = mj->dotsize; -! } -! return start + sizeof(props_mj) / sizeof(gs_prop_item); - } - - /* Put properties. */ - private int -! mj_put_props(gx_device *pdev, gs_prop_item *plist, int count) - { -- static const argn = 10; -- gs_prop_item *known[argn]; - int old_bpp = mj->color_info.depth; - int bpp = 0; - int code = 0; -! -! props_extract(plist, count, props_mj, argn, known, 0); -! code = gdev_prn_put_props(pdev, plist, count); -! if ( code < 0 ) return code; -! -! code = put_prop_int(known[0], &mj->density, 0, INT_MAX, code); -! code = put_prop_int(known[1], &mj->cyan, 0, INT_MAX, code); -! code = put_prop_int(known[2], &mj->magenta, 0, INT_MAX, code); -! code = put_prop_int(known[3], &mj->yellow, 0, INT_MAX, code); -! code = put_prop_int(known[4], &mj->black, 0, INT_MAX, code); -! code = put_prop_int(known[5], &mj->dither, 0, 1, code); -! code = put_prop_int(known[6], &mj->colorcomp, 1, 4, code); -! code = put_prop_int(known[7], &mj->direction, 1, 2, code); -! code = put_prop_int(known[8], &mj->microweave, 0, 1, code); -! code = put_prop_int(known[9], &mj->dotsize, 0, 1, code); - - if ( code < 0 ) -! return_error(code); - -! if (bpp != 0) { -! set_bpp(pdev, bpp); -! -! /* Close the device; gs_putdeviceprops will reopen it. */ - if ( bpp != old_bpp && pdev->is_open ) -! { int ccode = gs_closedevice(pdev); -! if ( ccode < 0 ) return ccode; -! } - } -! -! return code; - } - - /* ------ Internal routines ------ */ ---- 350,427 ---- - * and control over the bits-per-pixel used in output rendering */ - /* Added properties for DeskJet 5xxC */ - - private int -! mj_get_params(gx_device *pdev, gs_param_list *plist) -! { int code = gdev_prn_get_params(pdev, plist); -! if ( code < 0 || -! (code = param_write_int(plist, "Density", &mj->density)) < 0 || -! (code = param_write_int(plist, "Cyan", &mj->cyan)) < 0 || -! (code = param_write_int(plist, "Magenta", &mj->magenta)) < 0 || -! (code = param_write_int(plist, "Yellow", &mj->yellow)) < 0 || -! (code = param_write_int(plist, "Black", &mj->black)) < 0 || -! (code = param_write_int(plist, "Dither", &mj->dither)) < 0 || -! (code = param_write_int(plist, "ColorComponent", &mj->colorcomp)) < 0 || -! (code = param_write_int(plist, "Direction", &mj->direction)) < 0 || -! (code = param_write_int(plist, "MicroWeave", &mj->microweave)) < 0 || -! (code = param_write_int(plist, "DotSize", &mj->dotsize)) < 0 -! ) -! return code; -! -! return code; - } - - /* Put properties. */ - private int -! mj_put_params(gx_device *pdev, gs_param_list *plist) - { - int old_bpp = mj->color_info.depth; - int bpp = 0; - int code = 0; -! int density = mj->density; -! int cyan = mj->cyan; -! int magenta = mj->magenta; -! int yellow = mj->yellow; -! int black = mj->black; -! int dither = mj->dither; -! int colorcomp = mj->colorcomp; -! int direction = mj->direction; -! int microweave = mj->microweave; -! int dotsize = mj->dotsize; -! -! code = mj_put_param_int(plist, "Density", &density, 0, INT_MAX, code); -! code = mj_put_param_int(plist, "Cyan", &density, 0, INT_MAX, code); -! code = mj_put_param_int(plist, "Magenta", &density, 0, INT_MAX, code); -! code = mj_put_param_int(plist, "Yellow", &density, 0, INT_MAX, code); -! code = mj_put_param_int(plist, "Black", &density, 0, INT_MAX, code); -! code = mj_put_param_int(plist, "Dither", &density, 0, 1, code); -! code = mj_put_param_int(plist, "ColorComponent", &density, 1, 4, code); -! code = mj_put_param_int(plist, "Direction", &density, 1, 2, code); -! code = mj_put_param_int(plist, "MicroWeave", &density, 0, 1, code); -! code = mj_put_param_int(plist, "DotSize", &density, 0, 1, code); -! code = mj_put_param_int(plist, "BitsPerPixel", &bpp, 1, 32, code); - - if ( code < 0 ) -! return code; - -! mj->density = density; -! mj->cyan = cyan; -! mj->magenta = magenta; -! mj->yellow = yellow; -! mj->black = black; -! mj->dither = dither; -! mj->colorcomp = colorcomp; -! mj->direction = direction; -! mj->microweave = microweave; -! mj->dotsize = dotsize; -! if ( bpp != 0 ) { -! mj_set_bpp(pdev, bpp); -! gdev_prn_put_params(pdev, plist); - if ( bpp != old_bpp && pdev->is_open ) -! return gs_closedevice(pdev); -! return 0; - } -! else -! return gdev_prn_put_params(pdev, plist); - } - - /* ------ Internal routines ------ */ -*************** -*** 947,953 **** - - /* Send each scan line in turn */ - { -! long int lend = pdev->height - (pdev->t_margin + pdev->b_margin) * y_dpi; - int cErr, mErr, yErr, kErr; - int this_pass, i; - long int lnum; ---- 944,951 ---- - - /* Send each scan line in turn */ - { -! long int lend = pdev->height - -! (dev_t_margin_points(pdev) + dev_b_margin_points(pdev)); - int cErr, mErr, yErr, kErr; - int this_pass, i; - long int lnum; -*************** -*** 1323,1361 **** - } - - private int -! put_prop_int(gs_prop_item *pi, int *property, int minval, int maxval, int code) -! { -! if ( pi == 0 ) -! return (code); -! -! if ( pi->value.i < minval || pi->value.i > maxval ) -! { pi->status = pv_rangecheck; -! return (gs_error_rangecheck); -! } -! else -! { *property = pi->value.i; -! return (code ? code : 1); -! } -! } -! -! private int -! put_prop_float(gs_prop_item *pi, float *property, float minval, float maxval, int code) -! { -! if ( pi == 0 ) -! return (code); -! -! if ( pi->value.f < minval || pi->value.f > maxval ) -! { pi->status = pv_rangecheck; -! return (gs_error_rangecheck); -! } -! else -! { *property = pi->value.f; -! return (code ? code : 1); -! } - } - - private void -! set_bpp(gx_device *pdev, int bits_per_pixel) - { gx_device_color_info *ci = &pdev->color_info; - /* Only valid bits-per-pixel are 1, 3, 8, 16, 24, 32 */ - int bpp = bits_per_pixel < 3 ? 1 : bits_per_pixel < 8 ? 3 : ---- 1321,1345 ---- - } - - private int -! mj_put_param_int(gs_param_list *plist, gs_param_name pname, int *pvalue, -! int minval, int maxval, int ecode) -! { int code, value; -! switch ( code = param_read_int(plist, pname, &value) ) -! { -! default: -! return code; -! case 1: -! return ecode; -! case 0: -! if ( value < minval || value > maxval ) -! param_signal_error(plist, pname, gs_error_rangecheck); -! *pvalue = value; -! return (ecode < 0 ? ecode : 1); -! } - } - - private void -! mj_set_bpp(gx_device *pdev, int bits_per_pixel) - { gx_device_color_info *ci = &pdev->color_info; - /* Only valid bits-per-pixel are 1, 3, 8, 16, 24, 32 */ - int bpp = bits_per_pixel < 3 ? 1 : bits_per_pixel < 8 ? 3 : -*************** -*** 1363,1371 **** - ci->num_components = ((bpp == 1) || (bpp == 8) ? 1 : 3); - ci->depth = ((bpp > 1) && (bpp < 8) ? 8 : bpp); - ci->max_gray = (bpp >= 8 ? 255 : 1); -! ci->max_rgb = (bpp >= 8 ? 255 : bpp > 1 ? 1 : 0); -! ci->dither_gray = (bpp >= 8 ? 5 : 2); -! ci->dither_rgb = (bpp >= 8 ? 5 : bpp > 1 ? 2 : 0); - } - - /* This returns either the number of pixels in a scan line, or the number ---- 1347,1355 ---- - ci->num_components = ((bpp == 1) || (bpp == 8) ? 1 : 3); - ci->depth = ((bpp > 1) && (bpp < 8) ? 8 : bpp); - ci->max_gray = (bpp >= 8 ? 255 : 1); -! ci->max_color = (bpp >= 8 ? 255 : bpp > 1 ? 1 : 0); -! ci->dither_grays = (bpp >= 8 ? 5 : 2); -! ci->dither_colors = (bpp >= 8 ? 5 : bpp > 1 ? 2 : 0); - } - - /* This returns either the number of pixels in a scan line, or the number -*************** -*** 1374,1380 **** - gdev_prn_rasterwidth(const gx_device_printer *pdev, int pixelcount) - { - word raster_width = -! pdev->width - pdev->x_pixels_per_inch * (pdev->l_margin + pdev->r_margin); - return (pixelcount ? - (uint)raster_width : - (uint)((raster_width * pdev->color_info.depth + 7) >> 3)); ---- 1358,1364 ---- - gdev_prn_rasterwidth(const gx_device_printer *pdev, int pixelcount) - { - word raster_width = -! pdev->width - (pdev->HWMargins[0] + pdev->HWMargins[2]); - return (pixelcount ? - (uint)raster_width : - (uint)((raster_width * pdev->color_info.depth + 7) >> 3)); - +--- gdevmjc.c.orig Fri Jun 4 00:54:24 1999 ++++ gdevmjc.c Fri Jun 4 01:06:06 1999 +@@ -43,7 +43,8 @@ + #include <limits.h> + #include "gdevprn.h" + #include "gdevpcl.h" +-#include "gsprops.h" ++#include "gsparam.h" ++#include "gsstate.h" + + #include "mjmtx2.c" + #include "mjbksep.c" +@@ -150,7 +151,9 @@ + + /* Undefined macros expected to be defined in gdevpcl.h */ + #define PAPER_SIZE_A3_NOBI 28 ++#ifndef PAPER_SIZE_A2 + #define PAPER_SIZE_A2 29 ++#endif + #define PAPER_SIZE_B4 30 + #define PAPER_SIZE_B5 31 + +@@ -190,14 +193,12 @@ + private dev_proc_print_page(mjc720_print_page); + private dev_proc_print_page(mj500c_print_page); + +-private dev_proc_get_props(mj_get_props); +-private dev_proc_put_props(mj_put_props); ++private dev_proc_get_params(mj_get_params); ++private dev_proc_put_params(mj_put_params); + + private void expand_line(P4(word*, int, int, int)); +-private int put_prop_float(P5(gs_prop_item *, float *, float, float, int)); +-private int put_prop_int(P5(gs_prop_item *, int *, int, int, int)); +- +-private void set_bpp(P2(gx_device *, int)); ++private int mj_put_param_int(P6(gs_param_list *, gs_param_name, int *, int, int, int)); ++private void mj_set_bpp(P2(gx_device *, int)); + + private uint gdev_prn_rasterwidth(P2(const gx_device_printer *, int )); + +@@ -224,7 +225,7 @@ + #define mj ((gx_device_mj *) pdev) + + #define prn_hp_colour_device(procs, dev_name, x_dpi, y_dpi, bpp, print_page)\ +- prn_device_body(gx_device_printer, procs, dev_name,\ ++ prn_device_body(gx_device_mj, procs, dev_name,\ + WIDTH_10THS, HEIGHT_10THS, x_dpi, y_dpi, 0, 0, 0, 0, 0,\ + bpp, 0, 0, 0, 0, print_page) + +@@ -235,9 +236,9 @@ + } + + +-#define mj_colour_procs(proc_colour_open, proc_get_props, proc_put_props) {\ ++#define mj_colour_procs(proc_colour_open, proc_get_params, proc_put_params) {\ + proc_colour_open,\ +- gdev_pcl_get_initial_matrix,\ ++ gx_default_get_initial_matrix,\ + gx_default_sync_output,\ + gdev_prn_output_page,\ + gdev_prn_close,\ +@@ -249,15 +250,15 @@ + NULL, /* copy_color */\ + NULL, /* draw_line */\ + gx_default_get_bits,\ +- proc_get_props,\ +- proc_put_props\ ++ proc_get_params,\ ++ proc_put_params\ + } + + private int mjc_open(P1(gx_device *)); + private int mj_colour_open(P1(gx_device *)); + + private gx_device_procs mj_procs = +-mj_colour_procs(mjc_open, mj_get_props, mj_put_props); ++mj_colour_procs(mjc_open, mj_get_params, mj_put_params); + + gx_device_mj far_data gs_mjc180_device = + mj_device(mj_procs, "mjc180", 180, 180, BITSPERPIXEL, +@@ -313,7 +314,7 @@ + + /* Set up colour params if put_props has not already done so */ + if (pdev->color_info.num_components == 0) +- set_bpp(pdev, pdev->color_info.depth); ++ mj_set_bpp(pdev, pdev->color_info.depth); + + paper_size = gdev_mjc_paper_size(pdev); + if (paper_size == PAPER_SIZE_A2 ) { +@@ -332,10 +333,7 @@ + m = mj_letter; + } + +- pdev->l_margin = m[0]; +- pdev->b_margin = m[1]; +- pdev->r_margin = m[2]; +- pdev->t_margin = m[3]; ++ gx_device_set_margins(pdev, m, true); + + switch (mj->colorcomp) { + case 1: +@@ -360,80 +358,74 @@ + * and control over the bits-per-pixel used in output rendering */ + /* Added properties for DeskJet 5xxC */ + +-private const gs_prop_item props_mj[] = { +- /* Read-write properties. */ +- prop_def("Density", prt_int), +- prop_def("Cyan", prt_int), +- prop_def("Magenta", prt_int), +- prop_def("Yellow", prt_int), +- prop_def("Black", prt_int), +- prop_def("Dither", prt_int), +- prop_def("ColorComponent", prt_int), +- prop_def("Direction", prt_int), +- prop_def("MicroWeave", prt_int), +- prop_def("DotSize", prt_int), +-}; +- + private int +-mj_get_props(gx_device *pdev, gs_prop_item *plist) +-{ int start = gdev_prn_get_props(pdev, plist); +- if ( plist != 0 ) { +- register gs_prop_item *pi = plist + start; +- memcpy(pi, props_mj, sizeof(props_mj)); +- pi[0].value.i = mj->density; +- pi[1].value.i = mj->cyan; +- pi[2].value.i = mj->magenta; +- pi[3].value.i = mj->yellow; +- pi[4].value.i = mj->black; +- pi[5].value.i = mj->dither; +- pi[6].value.i = mj->colorcomp; +- pi[7].value.i = mj->direction; +- pi[8].value.i = mj->microweave; +- pi[9].value.i = mj->dotsize; +- } +- return start + sizeof(props_mj) / sizeof(gs_prop_item); ++mj_get_params(gx_device *pdev, gs_param_list *plist) ++{ int code = gdev_prn_get_params(pdev, plist); ++ if ( code < 0 || ++ (code = param_write_int(plist, "Density", &mj->density)) < 0 || ++ (code = param_write_int(plist, "Cyan", &mj->cyan)) < 0 || ++ (code = param_write_int(plist, "Magenta", &mj->magenta)) < 0 || ++ (code = param_write_int(plist, "Yellow", &mj->yellow)) < 0 || ++ (code = param_write_int(plist, "Black", &mj->black)) < 0 || ++ (code = param_write_int(plist, "Dither", &mj->dither)) < 0 || ++ (code = param_write_int(plist, "ColorComponent", &mj->colorcomp)) < 0 || ++ (code = param_write_int(plist, "Direction", &mj->direction)) < 0 || ++ (code = param_write_int(plist, "MicroWeave", &mj->microweave)) < 0 || ++ (code = param_write_int(plist, "DotSize", &mj->dotsize)) < 0 ++ ) ++ return code; ++ return code; + } + + /* Put properties. */ + private int +-mj_put_props(gx_device *pdev, gs_prop_item *plist, int count) ++mj_put_params(gx_device *pdev, gs_param_list *plist) + { +- static const argn = 10; +-/* gs_prop_item *known[argn]; */ +- gs_prop_item *known[10]; + int old_bpp = mj->color_info.depth; + int bpp = 0; + int code = 0; +- +- props_extract(plist, count, props_mj, argn, known, 0); +- code = gdev_prn_put_props(pdev, plist, count); +- if ( code < 0 ) return code; +- +- code = put_prop_int(known[0], &mj->density, 0, INT_MAX, code); +- code = put_prop_int(known[1], &mj->cyan, 0, INT_MAX, code); +- code = put_prop_int(known[2], &mj->magenta, 0, INT_MAX, code); +- code = put_prop_int(known[3], &mj->yellow, 0, INT_MAX, code); +- code = put_prop_int(known[4], &mj->black, 0, INT_MAX, code); +- code = put_prop_int(known[5], &mj->dither, 0, 1, code); +- code = put_prop_int(known[6], &mj->colorcomp, 1, 4, code); +- code = put_prop_int(known[7], &mj->direction, 1, 2, code); +- code = put_prop_int(known[8], &mj->microweave, 0, 1, code); +- code = put_prop_int(known[9], &mj->dotsize, 0, 1, code); +- ++ int density = mj->density; ++ int cyan = mj->cyan; ++ int magenta = mj->magenta; ++ int yellow = mj->yellow; ++ int black = mj->black; ++ int dither = mj->dither; ++ int colorcomp = mj->colorcomp; ++ int direction = mj->direction; ++ int microweave = mj->microweave; ++ int dotsize = mj->dotsize; ++ code = mj_put_param_int(plist, "Density", &density, 0, INT_MAX, code); ++ code = mj_put_param_int(plist, "Cyan", &cyan, 0, INT_MAX, code); ++ code = mj_put_param_int(plist, "Magenta", &magenta, 0, INT_MAX, code); ++ code = mj_put_param_int(plist, "Yellow", &yellow, 0, INT_MAX, code); ++ code = mj_put_param_int(plist, "Black", &black, 0, INT_MAX, code); ++ code = mj_put_param_int(plist, "Dither", &dither, 0, 1, code); ++ code = mj_put_param_int(plist, "ColorComponent", &colorcomp, 1, 4, code); ++ code = mj_put_param_int(plist, "Direction", &direction, 1, 2, code); ++ code = mj_put_param_int(plist, "MicroWeave", µweave, 0, 1, code); ++ code = mj_put_param_int(plist, "DotSize", &dotsize, 0, 1, code); ++ code = mj_put_param_int(plist, "BitsPerPixel", &bpp, 1, 32, code); + if ( code < 0 ) +- return_error(code); +- +- if (bpp != 0) { +- set_bpp(pdev, bpp); +- +- /* Close the device; gs_putdeviceprops will reopen it. */ ++ return code; ++ mj->density = density; ++ mj->cyan = cyan; ++ mj->magenta = magenta; ++ mj->yellow = yellow; ++ mj->black = black; ++ mj->dither = dither; ++ mj->colorcomp = colorcomp; ++ mj->direction = direction; ++ mj->microweave = microweave; ++ mj->dotsize = dotsize; ++ if ( bpp != 0 ) { ++ mj_set_bpp(pdev, bpp); ++ gdev_prn_put_params(pdev, plist); + if ( bpp != old_bpp && pdev->is_open ) +- { int ccode = gs_closedevice(pdev); +- if ( ccode < 0 ) return ccode; +- } ++ return gs_closedevice(pdev); ++ return 0; + } +- +- return code; ++ else ++ return gdev_prn_put_params(pdev, plist); + } + + /* ------ Internal routines ------ */ +@@ -1163,7 +1155,8 @@ + + /* Send each scan line in turn */ + { +- long int lend = pdev->height - (pdev->t_margin + pdev->b_margin) * y_dpi; ++ long int lend = pdev->height - ++ (dev_t_margin_points(pdev) + dev_b_margin_points(pdev)); + int cErr, mErr, yErr, kErr; + int this_pass, i; + long int lnum; +@@ -1685,39 +1678,25 @@ + } + + private int +-put_prop_int(gs_prop_item *pi, int *property, int minval, int maxval, int code) +-{ +- if ( pi == 0 ) +- return (code); +- +- if ( pi->value.i < minval || pi->value.i > maxval ) +- { pi->status = pv_rangecheck; +- return (gs_error_rangecheck); +- } +- else +- { *property = pi->value.i; +- return (code ? code : 1); +- } +-} +- +-private int +-put_prop_float(gs_prop_item *pi, float *property, float minval, float maxval, int code) +-{ +- if ( pi == 0 ) +- return (code); +- +- if ( pi->value.f < minval || pi->value.f > maxval ) +- { pi->status = pv_rangecheck; +- return (gs_error_rangecheck); +- } +- else +- { *property = pi->value.f; +- return (code ? code : 1); +- } ++mj_put_param_int(gs_param_list *plist, gs_param_name pname, int *pvalue, ++ int minval, int maxval, int ecode) ++{ int code, value; ++ switch ( code = param_read_int(plist, pname, &value) ) ++ { ++ default: ++ return code; ++ case 1: ++ return ecode; ++ case 0: ++ if ( value < minval || value > maxval ) ++ param_signal_error(plist, pname, gs_error_rangecheck); ++ *pvalue = value; ++ return (ecode < 0 ? ecode : 1); ++ } + } + + private void +-set_bpp(gx_device *pdev, int bits_per_pixel) ++mj_set_bpp(gx_device *pdev, int bits_per_pixel) + { gx_device_color_info *ci = &pdev->color_info; + /* Only valid bits-per-pixel are 1, 3, 8, 16, 24, 32 */ + int bpp = bits_per_pixel < 3 ? 1 : bits_per_pixel < 8 ? 3 : +@@ -1725,9 +1704,9 @@ + ci->num_components = ((bpp == 1) || (bpp == 8) ? 1 : 3); + ci->depth = ((bpp > 1) && (bpp < 8) ? 8 : bpp); + ci->max_gray = (bpp >= 8 ? 255 : 1); +- ci->max_rgb = (bpp >= 8 ? 255 : bpp > 1 ? 1 : 0); +- ci->dither_gray = (bpp >= 8 ? 5 : 2); +- ci->dither_rgb = (bpp >= 8 ? 5 : bpp > 1 ? 2 : 0); ++ ci->max_color = (bpp >= 8 ? 255 : bpp > 1 ? 1 : 0); ++ ci->dither_grays = (bpp >= 8 ? 5 : 2); ++ ci->dither_colors = (bpp >= 8 ? 5 : bpp > 1 ? 2 : 0); + } + + /* This returns either the number of pixels in a scan line, or the number +@@ -1736,7 +1715,7 @@ + gdev_prn_rasterwidth(const gx_device_printer *pdev, int pixelcount) + { + word raster_width = +- pdev->width - pdev->x_pixels_per_inch * (pdev->l_margin + pdev->r_margin); ++ pdev->width - (pdev->HWMargins[0] + pdev->HWMargins[2]); + return (pixelcount ? + (uint)raster_width : + (uint)((raster_width * pdev->color_info.depth + 7) >> 3)); diff --git a/japanese/vfghostscript55/files/mjc.dev.patch b/japanese/vfghostscript55/files/mjc.dev.patch index 2191c90894c6..cc012e28d1f9 100644 --- a/japanese/vfghostscript55/files/mjc.dev.patch +++ b/japanese/vfghostscript55/files/mjc.dev.patch @@ -1,44 +1,40 @@ -*** mjc.dev.orig Sun Nov 15 23:30:39 1998 ---- mjc.dev Sun Nov 15 23:43:17 1998 -*************** -*** 9,27 **** - # - ## - -! mj700v2c_=gdevmjc.$(OBJ) $(HPPCL) - - # To make A4 paper the default, change the second line below this to -! # $(CCC) -DA4 gdevmjc.c -! gdevmjc.$(OBJ): gdevmjc.c $(PDEVH) $(gdevpcl_h) -! $(CCC) gdevmjc.c - -! mjc180.dev: $(mj700v2c_) -! $(SHP)gssetdev mjc180 $(mj700v2c_) -! mjc360.dev: $(mj700v2c_) -! $(SHP)gssetdev mjc360 $(mj700v2c_) -! mjc720.dev: $(mj700v2c_) -! $(SHP)gssetdev mjc720 $(mj700v2c_) -! mj500c.dev: $(mj700v2c_) -! $(SHP)gssetdev mj500c $(mj700v2c_) - ---- 9,28 ---- - # - ## - -! mj700v2c_=$(GLOBJ)gdevmjc.$(OBJ) $(HPPCL) - - # To make A4 paper the default, change the second line below this to -! # $(CC) -DA4 -o gdevmjc.o gdevmjc.c -! $(GLOBJ)gdevmjc.$(OBJ): $(GLSRC)gdevmjc.c $(PDEVH) $(gdevpcl_h) -! $(GLCC) $(GLO_)gdevmjc.$(OBJ) $(C_) $(GLSRC)gdevmjc.c -! - -! mjc180.dev: $(mj700v2c_) page.dev -! $(SETPDEV) mjc180 $(mj700v2c_) -! mjc360.dev: $(mj700v2c_) page.dev -! $(SETPDEV) mjc360 $(mj700v2c_) -! mjc720.dev: $(mj700v2c_) page.dev -! $(SETPDEV) mjc720 $(mj700v2c_) -! mj500c.dev: $(mj700v2c_) page.dev -! $(SETPDEV) mj500c $(mj700v2c_) - +--- gdevmjc.mak.orig Fri Jun 4 01:44:35 1999 ++++ gdevmjc.mak Fri Jun 4 01:53:04 1999 +@@ -10,19 +10,25 @@ + ## + MJCSRC = gdevmjc.c mjmtx2.c mjbksep.c mjhtocmy.c mjvtbl.c \ + mjgrnsp.c mjgrnsp2.c mjespdtc.c mjespdtm.c mjespdty.c mjbarrie.c ++MJCSRC2 = ${MJCSRC:S/^/$(GLOBJ)/g} + +-mj700v2c_=gdevmjc.$(OBJ) $(HPPCL) ++all: ++ echo $(MJCSRC2) ++ echo $(SETPDEV) mjc180 $(mj700v2c_) + +-# To make A4 paper the default, change the second line below this to +-gdevmjc.$(OBJ): $(MJCSRC) $(PDEVH) $(gdevpcl_h) +- $(CCC) -DA4 gdevmjc.c ++mj700v2c_=$(GLOBJ)gdevmjc.$(OBJ) $(HPPCL) + +-mjc180.dev: $(mj700v2c_) +- $(SHP)gssetdev mjc180 $(mj700v2c_) +-mjc360.dev: $(mj700v2c_) +- $(SHP)gssetdev mjc360 $(mj700v2c_) +-mjc720.dev: $(mj700v2c_) +- $(SHP)gssetdev mjc720 $(mj700v2c_) +-mj500c.dev: $(mj700v2c_) +- $(SHP)gssetdev mj500c $(mj700v2c_) ++# To make A4 paper the default, change the second line below this to ++# $(CC) -DA4 -o gdevmjc.o gdevmjc.c ++$(GLOBJ)gdevmjc.$(OBJ): $(GLSRC)gdevmjc.c $(PDEVH) $(gdevpcl_h) ++ $(GLCC) $(GLO_)gdevmjc.$(OBJ) $(C_) $(GLSRC)gdevmjc.c ++ + ++mjc180.dev: $(mj700v2c_) page.dev ++ $(SETPDEV) mjc180 $(mj700v2c_) ++mjc360.dev: $(mj700v2c_) page.dev ++ $(SETPDEV) mjc360 $(mj700v2c_) ++mjc720.dev: $(mj700v2c_) page.dev ++ $(SETPDEV) mjc720 $(mj700v2c_) ++mj500c.dev: $(mj700v2c_) page.dev ++ $(SETPDEV) mj500c $(mj700v2c_) diff --git a/japanese/vfghostscript55/files/patch-ad b/japanese/vfghostscript55/files/patch-ad new file mode 100644 index 000000000000..073f90860719 --- /dev/null +++ b/japanese/vfghostscript55/files/patch-ad @@ -0,0 +1,14 @@ +--- gdevlj56.c.~1~ Thu Jul 16 06:54:03 1998 ++++ gdevlj56.c Fri Jun 11 18:29:26 1999 +@@ -195,7 +195,11 @@ + static const byte page_header[] = + { + dub(ePortraitOrientation), da(pxaOrientation), ++#ifdef A4 ++ dub(eA4Paper), da(pxaMediaSize), ++#else + dub(eLetterPaper), da(pxaMediaSize), ++#endif + dub(eAutoSelect), da(pxaMediaSource), + pxtBeginPage, + dusp(0, 0), da(pxaPoint), diff --git a/japanese/vfghostscript55/pkg-plist b/japanese/vfghostscript55/pkg-plist index 8d44f6920522..7d8d5f043eb4 100644 --- a/japanese/vfghostscript55/pkg-plist +++ b/japanese/vfghostscript55/pkg-plist @@ -1,13 +1,13 @@ -bin/gs +bin/bdftops bin/dvipdf +bin/font2c +bin/gs bin/gsbj bin/gsdj bin/gsdj500 bin/gslj bin/gslp bin/gsnd -bin/bdftops -bin/font2c bin/pdf2dsc bin/pdf2ps bin/printafm @@ -16,10 +16,10 @@ bin/ps2epsi bin/ps2pdf bin/ps2ps bin/wftopfa -bin/ert share/ghostscript/5.50vflib/Fontmap -share/ghostscript/5.50vflib/cbjc600.ppd -share/ghostscript/5.50vflib/cbjc800.ppd +share/ghostscript/5.50vflib/acctest.ps +share/ghostscript/5.50vflib/align.ps +share/ghostscript/5.50vflib/bdftops.ps share/ghostscript/5.50vflib/bjc610a0.upp share/ghostscript/5.50vflib/bjc610a1.upp share/ghostscript/5.50vflib/bjc610a2.upp @@ -36,36 +36,17 @@ share/ghostscript/5.50vflib/bjc610b4.upp share/ghostscript/5.50vflib/bjc610b6.upp share/ghostscript/5.50vflib/bjc610b7.upp share/ghostscript/5.50vflib/bjc610b8.upp +share/ghostscript/5.50vflib/caption.ps +share/ghostscript/5.50vflib/cbjc600.ppd +share/ghostscript/5.50vflib/cbjc800.ppd share/ghostscript/5.50vflib/cdj550.upp -share/ghostscript/5.50vflib/necp2x.upp -share/ghostscript/5.50vflib/necp2x6.upp -share/ghostscript/5.50vflib/ras1.upp -share/ghostscript/5.50vflib/ras24.upp -share/ghostscript/5.50vflib/ras3.upp -share/ghostscript/5.50vflib/ras32.upp -share/ghostscript/5.50vflib/ras4.upp -share/ghostscript/5.50vflib/ras8m.upp -share/ghostscript/5.50vflib/stc.upp -share/ghostscript/5.50vflib/stc1520h.upp -share/ghostscript/5.50vflib/stc2.upp -share/ghostscript/5.50vflib/stc2_h.upp -share/ghostscript/5.50vflib/stc2s_h.upp -share/ghostscript/5.50vflib/stc500p.upp -share/ghostscript/5.50vflib/stc500ph.upp -share/ghostscript/5.50vflib/stc600ih.upp -share/ghostscript/5.50vflib/stc600p.upp -share/ghostscript/5.50vflib/stc600pl.upp -share/ghostscript/5.50vflib/stc800ih.upp -share/ghostscript/5.50vflib/stc800p.upp -share/ghostscript/5.50vflib/stc800pl.upp -share/ghostscript/5.50vflib/stc_h.upp -share/ghostscript/5.50vflib/stc_l.upp -share/ghostscript/5.50vflib/stcany.upp -share/ghostscript/5.50vflib/gs_init.ps -share/ghostscript/5.50vflib/doc/PUBLIC -share/ghostscript/5.50vflib/doc/ps2epsi.txt +share/ghostscript/5.50vflib/cid2code.ps +share/ghostscript/5.50vflib/decrypt.ps +share/ghostscript/5.50vflib/dmp_init.ps +share/ghostscript/5.50vflib/dmp_site.ps share/ghostscript/5.50vflib/doc/Bug-form.htm share/ghostscript/5.50vflib/doc/C-style.htm +share/ghostscript/5.50vflib/doc/COPYING share/ghostscript/5.50vflib/doc/Commprod.htm share/ghostscript/5.50vflib/doc/Copying.htm share/ghostscript/5.50vflib/doc/Current.htm @@ -73,6 +54,7 @@ share/ghostscript/5.50vflib/doc/DLL.htm share/ghostscript/5.50vflib/doc/Devices.htm share/ghostscript/5.50vflib/doc/Drivers.htm share/ghostscript/5.50vflib/doc/Fonts.htm +share/ghostscript/5.50vflib/doc/Gdevlips.htm share/ghostscript/5.50vflib/doc/Helpers.htm share/ghostscript/5.50vflib/doc/Hershey.htm share/ghostscript/5.50vflib/doc/History1.htm @@ -84,42 +66,59 @@ share/ghostscript/5.50vflib/doc/Humor.htm share/ghostscript/5.50vflib/doc/Install.htm share/ghostscript/5.50vflib/doc/Language.htm share/ghostscript/5.50vflib/doc/Lib.htm +share/ghostscript/5.50vflib/doc/MJ700V2C.FAQ share/ghostscript/5.50vflib/doc/Make.htm share/ghostscript/5.50vflib/doc/New-user.htm share/ghostscript/5.50vflib/doc/News.htm +share/ghostscript/5.50vflib/doc/PUBLIC share/ghostscript/5.50vflib/doc/Ps2pdf.htm share/ghostscript/5.50vflib/doc/Psfiles.htm share/ghostscript/5.50vflib/doc/Public.htm +share/ghostscript/5.50vflib/doc/README.gdevalps +share/ghostscript/5.50vflib/doc/README.gs5.10-vflib share/ghostscript/5.50vflib/doc/Readme.htm share/ghostscript/5.50vflib/doc/Source.htm share/ghostscript/5.50vflib/doc/Unix-lpr.htm share/ghostscript/5.50vflib/doc/Use.htm share/ghostscript/5.50vflib/doc/Xfonts.htm -share/ghostscript/5.50vflib/doc/README.gs5.10-vflib -share/ghostscript/5.50vflib/doc/kfvflib.sj share/ghostscript/5.50vflib/doc/djgpp.sj -share/ghostscript/5.50vflib/doc/COPYING -share/ghostscript/5.50vflib/doc/Lips.htm -share/ghostscript/5.50vflib/doc/gs261j.jis -share/ghostscript/5.50vflib/doc/gs261j.doc share/ghostscript/5.50vflib/doc/gdev10v.jis -share/ghostscript/5.50vflib/doc/gdevmjc.jis -share/ghostscript/5.50vflib/doc/MJ700V2C.FAQ share/ghostscript/5.50vflib/doc/gdevdmpr.sj -share/ghostscript/5.50vflib/doc/gdevnpdl.jis +share/ghostscript/5.50vflib/doc/gdevmd2k.jis +share/ghostscript/5.50vflib/doc/gdevmjc-0.8/README.mjc +share/ghostscript/5.50vflib/doc/gdevmjc-0.8/README.mje +share/ghostscript/5.50vflib/doc/gdevmjc-0.8/README.noz +share/ghostscript/5.50vflib/doc/gdevmjc-0.8/MJ700V2C.FAQ +share/ghostscript/5.50vflib/doc/gdevmjc-0.8/cpem.doc +share/ghostscript/5.50vflib/doc/gdevrpdl.doc +share/ghostscript/5.50vflib/doc/gs261j.doc +share/ghostscript/5.50vflib/doc/gs261j.jis share/ghostscript/5.50vflib/doc/gs_statd.dif -share/ghostscript/5.50vflib/doc/gslipsif.sh -share/ghostscript/5.50vflib/doc/epag-3.08/FILES -share/ghostscript/5.50vflib/doc/epag-3.08/gdevepag.txt -share/ghostscript/5.50vflib/doc/epag-3.08/ert.txt -share/ghostscript/5.50vflib/doc/epag-3.08/adjust.ps -share/ghostscript/5.50vflib/doc/epag-3.08/gsepagif.sh -share/ghostscript/5.50vflib/doc/epag-3.08/psprint +share/ghostscript/5.50vflib/doc/kfvflib.sj +share/ghostscript/5.50vflib/doc/ps2epsi.txt +share/ghostscript/5.50vflib/docie.ps +share/ghostscript/5.50vflib/escp_24.src +share/ghostscript/5.50vflib/examples/alphabet.ps +share/ghostscript/5.50vflib/examples/cheq.ps +share/ghostscript/5.50vflib/examples/chess.ps +share/ghostscript/5.50vflib/examples/colorcir.ps +share/ghostscript/5.50vflib/examples/escher.ps +share/ghostscript/5.50vflib/examples/golfer.ps +share/ghostscript/5.50vflib/examples/grayalph.ps +share/ghostscript/5.50vflib/examples/ridt91.eps +share/ghostscript/5.50vflib/examples/snowflak.ps +share/ghostscript/5.50vflib/examples/tiger.ps +share/ghostscript/5.50vflib/examples/vasarely.ps +share/ghostscript/5.50vflib/examples/waterfal.ps +share/ghostscript/5.50vflib/font2c.ps +share/ghostscript/5.50vflib/font2pcl.ps +share/ghostscript/5.50vflib/gdevmjc.ps share/ghostscript/5.50vflib/gs_btokn.ps share/ghostscript/5.50vflib/gs_ccfnt.ps share/ghostscript/5.50vflib/gs_cff.ps share/ghostscript/5.50vflib/gs_cidfn.ps share/ghostscript/5.50vflib/gs_cmap.ps +share/ghostscript/5.50vflib/gs_dbt_e.ps share/ghostscript/5.50vflib/gs_diskf.ps share/ghostscript/5.50vflib/gs_dpnxt.ps share/ghostscript/5.50vflib/gs_dps.ps @@ -127,31 +126,28 @@ share/ghostscript/5.50vflib/gs_dps1.ps share/ghostscript/5.50vflib/gs_dps2.ps share/ghostscript/5.50vflib/gs_epsf.ps share/ghostscript/5.50vflib/gs_fonts.ps +share/ghostscript/5.50vflib/gs_init.ps +share/ghostscript/5.50vflib/gs_iso_e.ps share/ghostscript/5.50vflib/gs_kanji.ps +share/ghostscript/5.50vflib/gs_ksb_e.ps +share/ghostscript/5.50vflib/gs_l2img.ps share/ghostscript/5.50vflib/gs_lev2.ps share/ghostscript/5.50vflib/gs_ll3.ps +share/ghostscript/5.50vflib/gs_mex_e.ps +share/ghostscript/5.50vflib/gs_mro_e.ps +share/ghostscript/5.50vflib/gs_pdf_e.ps +share/ghostscript/5.50vflib/gs_pdfwr.ps share/ghostscript/5.50vflib/gs_pfile.ps share/ghostscript/5.50vflib/gs_res.ps share/ghostscript/5.50vflib/gs_setpd.ps share/ghostscript/5.50vflib/gs_statd.ps +share/ghostscript/5.50vflib/gs_std_e.ps +share/ghostscript/5.50vflib/gs_sym_e.ps share/ghostscript/5.50vflib/gs_ttf.ps share/ghostscript/5.50vflib/gs_typ32.ps share/ghostscript/5.50vflib/gs_typ42.ps share/ghostscript/5.50vflib/gs_type1.ps -share/ghostscript/5.50vflib/gs_dbt_e.ps -share/ghostscript/5.50vflib/gs_iso_e.ps -share/ghostscript/5.50vflib/gs_ksb_e.ps -share/ghostscript/5.50vflib/gs_std_e.ps -share/ghostscript/5.50vflib/gs_sym_e.ps -share/ghostscript/5.50vflib/acctest.ps -share/ghostscript/5.50vflib/align.ps -share/ghostscript/5.50vflib/bdftops.ps -share/ghostscript/5.50vflib/caption.ps -share/ghostscript/5.50vflib/cid2code.ps -share/ghostscript/5.50vflib/decrypt.ps -share/ghostscript/5.50vflib/docie.ps -share/ghostscript/5.50vflib/font2c.ps -share/ghostscript/5.50vflib/font2pcl.ps +share/ghostscript/5.50vflib/gs_wan_e.ps share/ghostscript/5.50vflib/gslp.ps share/ghostscript/5.50vflib/impath.ps share/ghostscript/5.50vflib/landscap.ps @@ -159,61 +155,58 @@ share/ghostscript/5.50vflib/level1.ps share/ghostscript/5.50vflib/lines.ps share/ghostscript/5.50vflib/markhint.ps share/ghostscript/5.50vflib/markpath.ps +share/ghostscript/5.50vflib/necp2x.upp +share/ghostscript/5.50vflib/necp2x6.upp share/ghostscript/5.50vflib/packfile.ps share/ghostscript/5.50vflib/pcharstr.ps +share/ghostscript/5.50vflib/pdf2dsc.ps +share/ghostscript/5.50vflib/pdf_base.ps +share/ghostscript/5.50vflib/pdf_draw.ps +share/ghostscript/5.50vflib/pdf_font.ps +share/ghostscript/5.50vflib/pdf_main.ps +share/ghostscript/5.50vflib/pdf_ops.ps +share/ghostscript/5.50vflib/pdf_sec.ps share/ghostscript/5.50vflib/pf2afm.ps share/ghostscript/5.50vflib/ppath.ps share/ghostscript/5.50vflib/prfont.ps share/ghostscript/5.50vflib/printafm.ps -share/ghostscript/5.50vflib/quit.ps share/ghostscript/5.50vflib/ps2ai.ps share/ghostscript/5.50vflib/ps2ascii.ps share/ghostscript/5.50vflib/ps2epsi.ps +share/ghostscript/5.50vflib/quit.ps +share/ghostscript/5.50vflib/ras1.upp +share/ghostscript/5.50vflib/ras24.upp +share/ghostscript/5.50vflib/ras3.upp +share/ghostscript/5.50vflib/ras32.upp +share/ghostscript/5.50vflib/ras4.upp +share/ghostscript/5.50vflib/ras8m.upp share/ghostscript/5.50vflib/showchar.ps share/ghostscript/5.50vflib/showpage.ps +share/ghostscript/5.50vflib/stc.upp +share/ghostscript/5.50vflib/stc1520h.upp +share/ghostscript/5.50vflib/stc2.upp +share/ghostscript/5.50vflib/stc2_h.upp +share/ghostscript/5.50vflib/stc2s_h.upp +share/ghostscript/5.50vflib/stc500p.upp +share/ghostscript/5.50vflib/stc500ph.upp +share/ghostscript/5.50vflib/stc600ih.upp +share/ghostscript/5.50vflib/stc600p.upp +share/ghostscript/5.50vflib/stc600pl.upp +share/ghostscript/5.50vflib/stc800ih.upp +share/ghostscript/5.50vflib/stc800p.upp +share/ghostscript/5.50vflib/stc800pl.upp +share/ghostscript/5.50vflib/stc_h.upp +share/ghostscript/5.50vflib/stc_l.upp +share/ghostscript/5.50vflib/stcany.upp share/ghostscript/5.50vflib/stcinfo.ps share/ghostscript/5.50vflib/stcolor.ps +share/ghostscript/5.50vflib/testpage.ps share/ghostscript/5.50vflib/traceimg.ps share/ghostscript/5.50vflib/traceop.ps share/ghostscript/5.50vflib/type1enc.ps share/ghostscript/5.50vflib/type1ops.ps share/ghostscript/5.50vflib/uninfo.ps share/ghostscript/5.50vflib/unprot.ps -share/ghostscript/5.50vflib/viewcmyk.ps -share/ghostscript/5.50vflib/viewgif.ps -share/ghostscript/5.50vflib/viewjpeg.ps -share/ghostscript/5.50vflib/viewpcx.ps -share/ghostscript/5.50vflib/viewpbm.ps -share/ghostscript/5.50vflib/viewps2a.ps -share/ghostscript/5.50vflib/winmaps.ps -share/ghostscript/5.50vflib/wftopfa.ps -share/ghostscript/5.50vflib/wrfont.ps -share/ghostscript/5.50vflib/zeroline.ps -share/ghostscript/5.50vflib/gs_l2img.ps -share/ghostscript/5.50vflib/pdf2dsc.ps -share/ghostscript/5.50vflib/pdf_base.ps -share/ghostscript/5.50vflib/pdf_draw.ps -share/ghostscript/5.50vflib/pdf_font.ps -share/ghostscript/5.50vflib/pdf_main.ps -share/ghostscript/5.50vflib/pdf_ops.ps -share/ghostscript/5.50vflib/pdf_sec.ps -share/ghostscript/5.50vflib/gs_mex_e.ps -share/ghostscript/5.50vflib/gs_mro_e.ps -share/ghostscript/5.50vflib/gs_pdf_e.ps -share/ghostscript/5.50vflib/gs_wan_e.ps -share/ghostscript/5.50vflib/gs_pdfwr.ps -share/ghostscript/5.50vflib/examples/alphabet.ps -share/ghostscript/5.50vflib/examples/chess.ps -share/ghostscript/5.50vflib/examples/cheq.ps -share/ghostscript/5.50vflib/examples/colorcir.ps -share/ghostscript/5.50vflib/examples/escher.ps -share/ghostscript/5.50vflib/examples/golfer.ps -share/ghostscript/5.50vflib/examples/grayalph.ps -share/ghostscript/5.50vflib/examples/snowflak.ps -share/ghostscript/5.50vflib/examples/tiger.ps -share/ghostscript/5.50vflib/examples/vasarely.ps -share/ghostscript/5.50vflib/examples/waterfal.ps -share/ghostscript/5.50vflib/examples/ridt91.eps share/ghostscript/5.50vflib/vflib/allkanji.ps share/ghostscript/5.50vflib/vflib/article9.ps share/ghostscript/5.50vflib/vflib/fmaptype.ps @@ -228,180 +221,186 @@ share/ghostscript/5.50vflib/vflib/koutline.ps share/ghostscript/5.50vflib/vflib/metrics2.ps share/ghostscript/5.50vflib/vflib/vchars.ps share/ghostscript/5.50vflib/vflib/vchars1.ps -share/ghostscript/5.50vflib/dmp_init.ps -share/ghostscript/5.50vflib/dmp_site.ps -share/ghostscript/5.50vflib/escp_24.src -share/ghostscript/5.50vflib/testpage.ps +share/ghostscript/5.50vflib/viewcmyk.ps +share/ghostscript/5.50vflib/viewgif.ps +share/ghostscript/5.50vflib/viewjpeg.ps +share/ghostscript/5.50vflib/viewpbm.ps +share/ghostscript/5.50vflib/viewpcx.ps +share/ghostscript/5.50vflib/viewps2a.ps +share/ghostscript/5.50vflib/wftopfa.ps +share/ghostscript/5.50vflib/winmaps.ps +share/ghostscript/5.50vflib/wrfont.ps +share/ghostscript/5.50vflib/zeroline.ps share/ghostscript/fonts/a010013l.afm -share/ghostscript/fonts/a010015l.afm -share/ghostscript/fonts/a010033l.afm -share/ghostscript/fonts/a010035l.afm -share/ghostscript/fonts/b018012l.afm -share/ghostscript/fonts/b018015l.afm -share/ghostscript/fonts/b018032l.afm -share/ghostscript/fonts/b018035l.afm -share/ghostscript/fonts/c059013l.afm -share/ghostscript/fonts/c059016l.afm -share/ghostscript/fonts/c059033l.afm -share/ghostscript/fonts/c059036l.afm -share/ghostscript/fonts/d050000l.afm -share/ghostscript/fonts/n019003l.afm -share/ghostscript/fonts/n019004l.afm -share/ghostscript/fonts/n019023l.afm -share/ghostscript/fonts/n019024l.afm -share/ghostscript/fonts/n019043l.afm -share/ghostscript/fonts/n019044l.afm -share/ghostscript/fonts/n019063l.afm -share/ghostscript/fonts/n019064l.afm -share/ghostscript/fonts/n021003l.afm -share/ghostscript/fonts/n021004l.afm -share/ghostscript/fonts/n021023l.afm -share/ghostscript/fonts/n021024l.afm -share/ghostscript/fonts/n022003l.afm -share/ghostscript/fonts/n022004l.afm -share/ghostscript/fonts/n022023l.afm -share/ghostscript/fonts/n022024l.afm -share/ghostscript/fonts/p052003l.afm -share/ghostscript/fonts/p052004l.afm -share/ghostscript/fonts/p052023l.afm -share/ghostscript/fonts/p052024l.afm -share/ghostscript/fonts/s050000l.afm -share/ghostscript/fonts/z003034l.afm -share/ghostscript/fonts/a010013l.pfm -share/ghostscript/fonts/a010015l.pfm -share/ghostscript/fonts/a010033l.pfm -share/ghostscript/fonts/a010035l.pfm -share/ghostscript/fonts/b018012l.pfm -share/ghostscript/fonts/b018015l.pfm -share/ghostscript/fonts/b018032l.pfm -share/ghostscript/fonts/b018035l.pfm -share/ghostscript/fonts/c059013l.pfm -share/ghostscript/fonts/c059016l.pfm -share/ghostscript/fonts/c059033l.pfm -share/ghostscript/fonts/c059036l.pfm -share/ghostscript/fonts/d050000l.pfm -share/ghostscript/fonts/n019003l.pfm -share/ghostscript/fonts/n019004l.pfm -share/ghostscript/fonts/n019023l.pfm -share/ghostscript/fonts/n019024l.pfm -share/ghostscript/fonts/n019043l.pfm -share/ghostscript/fonts/n019044l.pfm -share/ghostscript/fonts/n019063l.pfm -share/ghostscript/fonts/n019064l.pfm -share/ghostscript/fonts/n021003l.pfm -share/ghostscript/fonts/n021004l.pfm -share/ghostscript/fonts/n021023l.pfm -share/ghostscript/fonts/n021024l.pfm -share/ghostscript/fonts/n022003l.pfm -share/ghostscript/fonts/n022004l.pfm -share/ghostscript/fonts/n022023l.pfm -share/ghostscript/fonts/n022024l.pfm -share/ghostscript/fonts/p052003l.pfm -share/ghostscript/fonts/p052004l.pfm -share/ghostscript/fonts/p052023l.pfm -share/ghostscript/fonts/p052024l.pfm -share/ghostscript/fonts/s050000l.pfm -share/ghostscript/fonts/z003034l.pfm share/ghostscript/fonts/a010013l.pfb +share/ghostscript/fonts/a010013l.pfm +share/ghostscript/fonts/a010015l.afm share/ghostscript/fonts/a010015l.pfb +share/ghostscript/fonts/a010015l.pfm +share/ghostscript/fonts/a010033l.afm share/ghostscript/fonts/a010033l.pfb +share/ghostscript/fonts/a010033l.pfm +share/ghostscript/fonts/a010035l.afm share/ghostscript/fonts/a010035l.pfb +share/ghostscript/fonts/a010035l.pfm +share/ghostscript/fonts/b018012l.afm share/ghostscript/fonts/b018012l.pfb +share/ghostscript/fonts/b018012l.pfm +share/ghostscript/fonts/b018015l.afm share/ghostscript/fonts/b018015l.pfb +share/ghostscript/fonts/b018015l.pfm +share/ghostscript/fonts/b018032l.afm share/ghostscript/fonts/b018032l.pfb +share/ghostscript/fonts/b018032l.pfm +share/ghostscript/fonts/b018035l.afm share/ghostscript/fonts/b018035l.pfb +share/ghostscript/fonts/b018035l.pfm +share/ghostscript/fonts/bchb.afm +share/ghostscript/fonts/bchb.pfa +share/ghostscript/fonts/bchbi.afm +share/ghostscript/fonts/bchbi.pfa +share/ghostscript/fonts/bchr.afm +share/ghostscript/fonts/bchr.pfa +share/ghostscript/fonts/bchri.afm +share/ghostscript/fonts/bchri.pfa +share/ghostscript/fonts/c059013l.afm share/ghostscript/fonts/c059013l.pfb +share/ghostscript/fonts/c059013l.pfm +share/ghostscript/fonts/c059016l.afm share/ghostscript/fonts/c059016l.pfb +share/ghostscript/fonts/c059016l.pfm +share/ghostscript/fonts/c059033l.afm share/ghostscript/fonts/c059033l.pfb +share/ghostscript/fonts/c059033l.pfm +share/ghostscript/fonts/c059036l.afm share/ghostscript/fonts/c059036l.pfb +share/ghostscript/fonts/c059036l.pfm +share/ghostscript/fonts/d050000l.afm share/ghostscript/fonts/d050000l.pfb -share/ghostscript/fonts/n019003l.pfb -share/ghostscript/fonts/n019004l.pfb -share/ghostscript/fonts/n019023l.pfb -share/ghostscript/fonts/n019024l.pfb -share/ghostscript/fonts/n019043l.pfb -share/ghostscript/fonts/n019044l.pfb -share/ghostscript/fonts/n019063l.pfb -share/ghostscript/fonts/n019064l.pfb -share/ghostscript/fonts/n021003l.pfb -share/ghostscript/fonts/n021004l.pfb -share/ghostscript/fonts/n021023l.pfb -share/ghostscript/fonts/n021024l.pfb -share/ghostscript/fonts/n022003l.pfb -share/ghostscript/fonts/n022004l.pfb -share/ghostscript/fonts/n022023l.pfb -share/ghostscript/fonts/n022024l.pfb -share/ghostscript/fonts/p052003l.pfb -share/ghostscript/fonts/p052004l.pfb -share/ghostscript/fonts/p052023l.pfb -share/ghostscript/fonts/p052024l.pfb -share/ghostscript/fonts/s050000l.pfb -share/ghostscript/fonts/z003034l.pfb -share/ghostscript/fonts/fhirw.pfm -share/ghostscript/fonts/u003043t.pfm -share/ghostscript/fonts/u004006t.pfm -share/ghostscript/fonts/fkarw.pfm -share/ghostscript/fonts/bchb.pfa -share/ghostscript/fonts/bchbi.pfa -share/ghostscript/fonts/bchr.pfa -share/ghostscript/fonts/bchri.pfa -share/ghostscript/fonts/hrpldi.pfa -share/ghostscript/fonts/hrpld.pfa -share/ghostscript/fonts/hrger.pfa -share/ghostscript/fonts/hrgrr.pfa -share/ghostscript/fonts/hritr.pfa -share/ghostscript/fonts/hrscc.pfa -share/ghostscript/fonts/hrscs.pfa -share/ghostscript/fonts/hrplti.pfa -share/ghostscript/fonts/hrplt.pfa -share/ghostscript/fonts/putb.pfa -share/ghostscript/fonts/putbi.pfa -share/ghostscript/fonts/putr.pfa -share/ghostscript/fonts/putri.pfa +share/ghostscript/fonts/d050000l.pfm +share/ghostscript/fonts/fcyr.afm share/ghostscript/fonts/fcyr.gsf +share/ghostscript/fonts/fcyri.afm share/ghostscript/fonts/fcyri.gsf share/ghostscript/fonts/fhirw.gsf -share/ghostscript/fonts/u003043t.gsf -share/ghostscript/fonts/u004006t.gsf +share/ghostscript/fonts/fhirw.pfm share/ghostscript/fonts/fkarw.gsf +share/ghostscript/fonts/fkarw.pfm +share/ghostscript/fonts/hrger.pfa share/ghostscript/fonts/hrgerb.gsf -share/ghostscript/fonts/hrgero.gsf share/ghostscript/fonts/hrgerd.gsf +share/ghostscript/fonts/hrgero.gsf share/ghostscript/fonts/hrgkc.gsf share/ghostscript/fonts/hrgks.gsf +share/ghostscript/fonts/hrgrr.pfa share/ghostscript/fonts/hrgrrb.gsf share/ghostscript/fonts/hrgrro.gsf +share/ghostscript/fonts/hritr.pfa share/ghostscript/fonts/hritrb.gsf share/ghostscript/fonts/hritro.gsf +share/ghostscript/fonts/hrpld.pfa share/ghostscript/fonts/hrpldb.gsf share/ghostscript/fonts/hrpldbi.gsf +share/ghostscript/fonts/hrpldi.pfa share/ghostscript/fonts/hrplr.gsf share/ghostscript/fonts/hrplrb.gsf +share/ghostscript/fonts/hrplrbo.gsf share/ghostscript/fonts/hrplro.gsf share/ghostscript/fonts/hrpls.gsf share/ghostscript/fonts/hrplsb.gsf share/ghostscript/fonts/hrplsbo.gsf share/ghostscript/fonts/hrplso.gsf +share/ghostscript/fonts/hrplt.pfa share/ghostscript/fonts/hrpltb.gsf share/ghostscript/fonts/hrpltbi.gsf +share/ghostscript/fonts/hrplti.pfa +share/ghostscript/fonts/hrscc.pfa share/ghostscript/fonts/hrsccb.gsf share/ghostscript/fonts/hrscco.gsf +share/ghostscript/fonts/hrscs.pfa share/ghostscript/fonts/hrscsb.gsf share/ghostscript/fonts/hrscso.gsf -share/ghostscript/fonts/hrplrbo.gsf share/ghostscript/fonts/hrsyr.gsf -share/ghostscript/fonts/bchb.afm -share/ghostscript/fonts/bchbi.afm -share/ghostscript/fonts/bchr.afm -share/ghostscript/fonts/bchri.afm -share/ghostscript/fonts/fcyr.afm -share/ghostscript/fonts/fcyri.afm +share/ghostscript/fonts/n019003l.afm +share/ghostscript/fonts/n019003l.pfb +share/ghostscript/fonts/n019003l.pfm +share/ghostscript/fonts/n019004l.afm +share/ghostscript/fonts/n019004l.pfb +share/ghostscript/fonts/n019004l.pfm +share/ghostscript/fonts/n019023l.afm +share/ghostscript/fonts/n019023l.pfb +share/ghostscript/fonts/n019023l.pfm +share/ghostscript/fonts/n019024l.afm +share/ghostscript/fonts/n019024l.pfb +share/ghostscript/fonts/n019024l.pfm +share/ghostscript/fonts/n019043l.afm +share/ghostscript/fonts/n019043l.pfb +share/ghostscript/fonts/n019043l.pfm +share/ghostscript/fonts/n019044l.afm +share/ghostscript/fonts/n019044l.pfb +share/ghostscript/fonts/n019044l.pfm +share/ghostscript/fonts/n019063l.afm +share/ghostscript/fonts/n019063l.pfb +share/ghostscript/fonts/n019063l.pfm +share/ghostscript/fonts/n019064l.afm +share/ghostscript/fonts/n019064l.pfb +share/ghostscript/fonts/n019064l.pfm +share/ghostscript/fonts/n021003l.afm +share/ghostscript/fonts/n021003l.pfb +share/ghostscript/fonts/n021003l.pfm +share/ghostscript/fonts/n021004l.afm +share/ghostscript/fonts/n021004l.pfb +share/ghostscript/fonts/n021004l.pfm +share/ghostscript/fonts/n021023l.afm +share/ghostscript/fonts/n021023l.pfb +share/ghostscript/fonts/n021023l.pfm +share/ghostscript/fonts/n021024l.afm +share/ghostscript/fonts/n021024l.pfb +share/ghostscript/fonts/n021024l.pfm +share/ghostscript/fonts/n022003l.afm +share/ghostscript/fonts/n022003l.pfb +share/ghostscript/fonts/n022003l.pfm +share/ghostscript/fonts/n022004l.afm +share/ghostscript/fonts/n022004l.pfb +share/ghostscript/fonts/n022004l.pfm +share/ghostscript/fonts/n022023l.afm +share/ghostscript/fonts/n022023l.pfb +share/ghostscript/fonts/n022023l.pfm +share/ghostscript/fonts/n022024l.afm +share/ghostscript/fonts/n022024l.pfb +share/ghostscript/fonts/n022024l.pfm +share/ghostscript/fonts/p052003l.afm +share/ghostscript/fonts/p052003l.pfb +share/ghostscript/fonts/p052003l.pfm +share/ghostscript/fonts/p052004l.afm +share/ghostscript/fonts/p052004l.pfb +share/ghostscript/fonts/p052004l.pfm +share/ghostscript/fonts/p052023l.afm +share/ghostscript/fonts/p052023l.pfb +share/ghostscript/fonts/p052023l.pfm +share/ghostscript/fonts/p052024l.afm +share/ghostscript/fonts/p052024l.pfb +share/ghostscript/fonts/p052024l.pfm +share/ghostscript/fonts/putb.pfa +share/ghostscript/fonts/putbi.pfa +share/ghostscript/fonts/putr.pfa +share/ghostscript/fonts/putri.pfa +share/ghostscript/fonts/s050000l.afm +share/ghostscript/fonts/s050000l.pfb +share/ghostscript/fonts/s050000l.pfm share/ghostscript/fonts/u003043t.afm +share/ghostscript/fonts/u003043t.gsf +share/ghostscript/fonts/u003043t.pfm share/ghostscript/fonts/u004006t.afm -@dirrm share/ghostscript/fonts -@dirrm share/ghostscript/5.50vflib/doc/epag-3.08 +share/ghostscript/fonts/u004006t.gsf +share/ghostscript/fonts/u004006t.pfm +share/ghostscript/fonts/z003034l.afm +share/ghostscript/fonts/z003034l.pfb +share/ghostscript/fonts/z003034l.pfm +@dirrm share/ghostscript/5.50vflib/doc/gdevmjc-0.8 @dirrm share/ghostscript/5.50vflib/doc @dirrm share/ghostscript/5.50vflib/examples @dirrm share/ghostscript/5.50vflib/vflib @dirrm share/ghostscript/5.50vflib +@dirrm share/ghostscript/fonts @dirrm share/ghostscript diff --git a/japanese/vfghostscript55/scripts/configure b/japanese/vfghostscript55/scripts/configure index f055a4d59b97..9d227038f3a6 100644 --- a/japanese/vfghostscript55/scripts/configure +++ b/japanese/vfghostscript55/scripts/configure @@ -4,7 +4,7 @@ if [ ! "X"${BATCH} = "X" ] ; then -PRINTER_JAPAN=' epag.dev mjc180.dev mjc360.dev mjc720.dev mj500c.dev lips3.dev lips4.dev lips4c.dev rpdlA3.dev rpdlA4.dev rpdlB4.dev rpdlB5.dev bj10v.dev bj10vh.dev dmprt.dev npdl.dev alps.dev' +PRINTER_JAPAN=' mjc180.dev mjc360.dev mjc720.dev mj500c.dev lips2p.dev lips3.dev lips4.dev lips4v.dev bjc880j.dev lp2000.dev escpage.dev npdl.dev nx100f.dev nx100v.dev bj10v.dev bj10vh.dev dmprt.dev md2k.dev md5k.dev' sed -e "s;XINCLUDE=-I/usr/local/X/include;XINCLUDE=-I/usr/X11R6/include;" \ -e "s;XLIBDIRS=-L/usr/X11/lib;XLIBDIRS=-L/usr/X11R6/lib;" \ @@ -74,7 +74,6 @@ Have fun with this new configuration style ! -andreas \n\n\ "x11gray2" "X masquer. as device with 2-bit gray-scale device" ON \ "x11gray4" "X masquer. as device with 4-bit gray-scale device" OFF \ "x11mono" "X masquer. as black-and-white device" ON \ - "alps" "ALPS MD5000 monochrome printer driver" ON \ "appledmp" "Apple Dot Matrix Printer / Imagewriter" OFF \ "iwhi" "Apple Imagewriter, high-resolution mode" OFF \ "iwlo" "Apple Imagewriter, low-resolution mode" OFF \ @@ -88,14 +87,21 @@ Have fun with this new configuration style ! -andreas \n\n\ "lbp8" "Canon LBP-8II laser printer" OFF \ "lips2p" "Canon LIPS II+ laser printer " OFF \ "lips3" "Canon LIPS III laser printer " ON \ - "lips4" "Canon LIPSIV laser printer 600dpi, mono" ON \ - "lips4c" "Canon LIPSIV laser printer 600dpi,CMYK" ON \ + "lips4" "Canon LIPSIV laser printer, mono" ON \ + "bjc880j" "Canon Color BubbleJet BJC-680J/880J (LIPS IV)" ON \ + "lips4v" "Canon LIPSIV laser printer(Vector)" ON \ "ccr" "CalComp Raster format" OFF \ "lj250" "DEC LJ250 Companion color printer" OFF \ "declj250" "alternate DEC LJ250 driver" OFF \ "dmprt" "Generic Printer" ON \ "ap3250" "Epson AP3250" OFF \ - "epag" "Epson ESC/Page laser printer 60-600dpi, mono" ON \ + "escpage" "Epson ESC/Page laser printer 60-600dpi, mono" ON \ + "lp2000" "Epson LP-2000/3000/7000/7000G, mono" ON \ + "md2k" "ALPS MD2000/2010/4000/1300/1500/5000 driver" ON \ + "md5k" "ALPS MD5000 driver" ON \ + "md50Mono" "ALPS MD5000 monochrome driver" OFF \ + "md50Eco" "ALPS MD5000 monochrome driver, economy mode" OFF \ + "md1xMono" "ALPS MD1300 MD5000 monochrome driver" OFF \ "mjc180" "Epson MachJet series 180dpi, CMYK" ON \ "mjc360" "Epson MachJet series 360dpi, CMYK" ON \ "mjc720" "Epson MachJet series 720dpi, CMYK" ON \ @@ -146,10 +152,8 @@ Have fun with this new configuration style ! -andreas \n\n\ "oki182" "Okidata MicroLine 182" OFF \ "okiibm" "Okidata MicroLine IBM-compatible printers" OFF \ "r4081" "Ricoh 4081 laser printer" OFF \ - "rpdlA3" "Ricoh Printer Description Language (RPDL) A3 600 dpi" ON \ - "rpdlA4" "Ricoh Printer Description Language (RPDL) A4 600 dpi" ON \ - "rpdlB4" "Ricoh Printer Description Language (RPDL) B4 600 dpi" ON \ - "rpdlB5" "Ricoh Printer Description Language (RPDL) B5 600 dpi" ON \ + "nx100f" "Ricoh Printer Description Language (RPDL) (fixed)" ON \ + "nx100v" "Ricoh Printer Description Language (RPDL) (variable)" ON \ "nwp533" "Sony Microsystems NWP533 laser printer" OFF \ "sj48" "StarJet 48 inkjet printer" OFF \ "t4693d2" "Tektronix 4693d color, 2 bits per R/G/B component" OFF \ |