Attachment #42742 for bug #66595

View | Details | Raw Unified | Return to bug 66595
Collapse All | Expand All





CATEGORIES=	chinese

MAINTAINER=	rafan@infor.org
MASTERDIR=	${.CURDIR}/../../print/enscript-letter

MAINTAINER=	keith@FreeBSD.org

RUN_DEPENDS=	ttfm.sh:${PORTSDIR}/chinese/ttfm

PAPERSIZE=	a4
MASTERDIR=	${.CURDIR}/../../print/enscript-letter

EXTRA_PATCHES=	${.CURDIR}/files/patch-*
PLIST=		${WRKDIR}/pkg-plist
PKGMESSAGE=	${.CURDIR}/pkg-message

USE_GHOSTSCRIPT_RUN=	yes

BROKEN=		"Fails to patch"
DEPRECATED=	${BROKEN}
EXPIRATION_DATE=2004-06-18

pre-fetch:
.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes




diff -ruN src.orib/gsint.h src/gsint.h
--- src.orib/gsint.h	Thu May 13 12:41:04 2004
+++ src/gsint.h	Thu May 13 12:58:29 2004
@@ -190,7 +190,9 @@
   ENC_VMS,
   ENC_HP8,
   ENC_KOI8,

+  ENC_UNICNS_UTF8,
 } InputEncoding;
 
 struct encoding_registry_st
diff -ruN src.orib/main.c src/main.c
--- src.orib/main.c	Thu May 13 12:41:04 2004
+++ src/main.c	Thu May 13 12:42:28 2004
@@ -817,6 +817,8 @@
   {{"koi8", NULL, NULL},		ENC_KOI8,		'\n', 8},
   {{"ps", "PS", NULL},			ENC_PS, 		'\n', 8},
   {{"pslatin1", "ISOLatin1Encoding", NULL},	ENC_ISO_8859_1,	'\n', 8},
+  {{"big5", "Formal Chinese", NULL},	ENC_BIG5,		'\n', 8},
+  {{"UniCNS-UTF8", "Formal Chinese", NULL},	ENC_UNICNS_UTF8,	'\n', 8},
 
   {{NULL, NULL, NULL}, 0, 0, 0},
 };
diff -ruN src.orib/psgen.c src/psgen.c
--- src.orib/psgen.c	Thu May 13 12:41:04 2004
+++ src/psgen.c	Thu May 13 12:53:07 2004
@@ -323,15 +323,21 @@
   if (!paste_file ("enscript", ".pro"))
     FATAL ((stderr, _("couldn't find prolog \"%s\": %s\n"), "enscript.pro",
 	    strerror (errno)));

+      FATAL ((stderr, _("couldn't find encoding file \"%s.enc\": %s\n"),
+	      encoding_name, strerror (errno)));
+    OUTPUT ((cofp, "%%%%EndResource\n"));
+  }
+    
 
   OUTPUT ((cofp, "%%%%EndProlog\n"));
 
@@ -1129,7 +1135,12 @@
   /* Select our fonts. */
 
   /* Header font HF. */
+  
   OUTPUT ((cofp, "/%s /HF-gs-font MF\n", HFname));
   OUTPUT ((cofp,
 	   "/HF /HF-gs-font findfont [HFpt_w 0 0 HFpt_h 0 0] makefont def\n"));
@@ -1033,7 +1041,12 @@
 /* Help macros. */
 
 /* Check if character <ch> fits to current line. */
-#define FITS_ON_LINE(ch) ((linepos + CHAR_WIDTH (ch) < linew) || col == 0)
+/* NO wraping for CJK at this moment. Added by C.S. Chin Sept.1 */
+
+#define FITS_ON_LINE(ch) ( ( (encoding == ENC_BIG5 && b5firstc) ||\
+			     (encoding == ENC_UNICNS_UTF8 && u8firstc) ) ?\
+			     (linepos + 2 * CHAR_WIDTH (ch) < linew) :\
+			     (linepos + CHAR_WIDTH (ch) < linew || in_u8) )
 
 /* Is line buffer empty? */
 #define BUFFER_EMPTY() (bufpos == 0)
@@ -1594,8 +1605,12 @@
   static unsigned int buflen = 0; /* output buffer's length */
   unsigned int bufpos = 0;	/* current position in output buffer */
   int ch = 0;

   static int pending_token = tNONE;
   unsigned int original_col = col;
 
@@ -1745,6 +1760,39 @@
 	      break;
 	    }
 

 	  /* Check normal characters. */
 	  if (EXISTS (ch))
 	    {
diff -ruN src.orib/util.c src/util.c
--- src.orib/util.c	Thu May 13 12:41:04 2004
+++ src/util.c	Thu May 13 12:56:31 2004
@@ -890,11 +890,18 @@
-  if (done == DONE_WRAP)
+  if (done == DONE_WRAP) 
     {
       /* This line is too long. */
       ch = nl;
--- ./src/util.c.orig	Wed Jun 24 14:48:21 1998
+++ ./src/util.c	Mon Nov 27 22:18:18 2000
@@ -774,6 +774,7 @@
       if (!strhash_get (afm_cache, Fname, strlen (Fname), (void **) &font))
 	{
 	  /* AFM file was not cached, open it from disk. */
+	  
 	  error = afm_open_font (afm, AFM_I_COMPOSITES, Fname, &font);
 	  if (error != AFM_SUCCESS)
 	    {
@@ -782,11 +783,18 @@
 	       * Do not report failures for "Courier*" fonts because
 	       * AFM library's default font will fix them.
 	       */

 	      error = afm_open_default_font (afm, &font);
 	      if (error != AFM_SUCCESS)
 		{
@@ -997,6 +1004,12 @@
 			  buf));
 		}
 	    }
-
+	    
 	  /* Apply encoding. */
 	  switch (encoding)
 	    {
@@ -879,6 +887,12 @@
 	    case ENC_PS:
 	      /* Let's use font's default encoding -- nothing here. */
 	      break;

 	    }
 
 	  /* Put it to the AFM cache. */
@@ -1006,20 +1019,56 @@
 
       font_info = (CachedFontInfo *) xcalloc (1, sizeof (*font_info));
       /* Read character widths and types. */

+	    else
+	      font_info->font_ctype[i] = '*';
+	  }
+       } else {
+	if (encoding == ENC_BIG5) 
+	  {
+	    for (i = 0; i < 256; i++)

+		  }
+	      }
+	  }
+       }
+
 
       font_info->font_is_fixed
 	= font->writing_direction_metrics[0].IsFixedPitch;

Lines 1-7 Link Here

(-)enscript/pkg-message (-1 / +2 lines)
1	========================================================================	1	========================================================================
2	For BIG5 users, use commands like this to generate PS documents:	2	For BIG5 users, use commands like this to generate PS documents:
3		3
4	enscript -X big5 -f DefaultMingB5-Regular-B5pc-H@12 -o [output.ps] [file]	4	enscript -X big5 -f ShanHeiSun-Light-B5pc-H@12 -o [output.ps] [file]
5		5
6	Make sure to use those fonts having "B5pc" in their names.	6	Make sure to use those fonts having "B5pc" in their names.
		7	If you don't have them, install chinese/arphicttf with WANT_GS=yes.
7	========================================================================	8	========================================================================

Return to bug 66595

Lines 7-28 Link Here

(-)enscript/Makefile (-8 / +4 lines)
7		7
8	CATEGORIES= chinese	8	CATEGORIES= chinese
9		9
10	PAPERSIZE= a4	10	MAINTAINER= rafan@infor.org
11	MASTERDIR= ${.CURDIR}/../../print/enscript-letter
12
13	MAINTAINER= keith@FreeBSD.org
14		11
15	RUN_DEPENDS= ttfm.sh:${PORTSDIR}/chinese/ttfm	12	RUN_DEPENDS= ttfm.sh:${PORTSDIR}/chinese/ttfm
16		13
		14	PAPERSIZE= a4
		15	MASTERDIR= ${.CURDIR}/../../print/enscript-letter
		16
17	EXTRA_PATCHES= ${.CURDIR}/files/patch-*	17	EXTRA_PATCHES= ${.CURDIR}/files/patch-*
18	PLIST= ${WRKDIR}/pkg-plist	18	PLIST= ${WRKDIR}/pkg-plist
19	PKGMESSAGE= ${.CURDIR}/pkg-message	19	PKGMESSAGE= ${.CURDIR}/pkg-message
20		20
21	USE_GHOSTSCRIPT_RUN= yes	21	USE_GHOSTSCRIPT_RUN= yes
22
23	BROKEN= "Fails to patch"
24	DEPRECATED= ${BROKEN}
25	EXPIRATION_DATE=2004-06-18
26		22
27	pre-fetch:	23	pre-fetch:
28	.if !defined(WITH_GHOSTSCRIPT_AFPL) \|\| ${WITH_GHOSTSCRIPT_AFPL} != yes	24	.if !defined(WITH_GHOSTSCRIPT_AFPL) \|\| ${WITH_GHOSTSCRIPT_AFPL} != yes

Lines 1-6 Link Here

(-)enscript/files/patch-aa (-70 / +37 lines)
1	--- ./src/gsint.h.orig Thu Jun 25 15:18:32 1998	1	diff -ruN src.orib/gsint.h src/gsint.h
2	+++ ./src/gsint.h Mon Nov 27 22:18:18 2000	2	--- src.orib/gsint.h Thu May 13 12:41:04 2004
3	@@ -188,7 +188,9 @@	3	+++ src/gsint.h Thu May 13 12:58:29 2004
		4	@@ -190,7 +190,9 @@
4	ENC_VMS,	5	ENC_VMS,
5	ENC_HP8,	6	ENC_HP8,
6	ENC_KOI8,	7	ENC_KOI8,
Lines 10-31 Link Here
10	+ ENC_UNICNS_UTF8,	11	+ ENC_UNICNS_UTF8,
11	} InputEncoding;	12	} InputEncoding;
12		13
13	typedef enum	14	struct encoding_registry_st
14	--- ./src/main.c.orig Thu Jun 25 16:26:00 1998	15	diff -ruN src.orib/main.c src/main.c
15	+++ ./src/main.c Mon Nov 27 22:18:18 2000	16	--- src.orib/main.c Thu May 13 12:41:04 2004
16	@@ -864,7 +864,8 @@	17	+++ src/main.c Thu May 13 12:42:28 2004
17	{{"koi8", NULL, NULL}, ENC_KOI8, '\n', 8},	18	@@ -817,6 +817,8 @@
18	{{"ps", "PS", NULL}, ENC_PS, '\n', 8},	19	{{"koi8", NULL, NULL}, ENC_KOI8, '\n', 8},
19	{{"pslatin1", "ISOLatin1Encoding", NULL}, ENC_ISO_8859_1, '\n', 8},	20	{{"ps", "PS", NULL}, ENC_PS, '\n', 8},
20	-	21	{{"pslatin1", "ISOLatin1Encoding", NULL}, ENC_ISO_8859_1, '\n', 8},
21	+ {{"big5", "Formal Chinese", NULL}, ENC_BIG5, '\n', 8},	22	+ {{"big5", "Formal Chinese", NULL}, ENC_BIG5, '\n', 8},
22	+ {{"UniCNS-UTF8", "Formal Chinese", NULL}, ENC_UNICNS_UTF8, '\n', 8},	23	+ {{"UniCNS-UTF8", "Formal Chinese", NULL}, ENC_UNICNS_UTF8, '\n', 8},
23	{{NULL, NULL, NULL}, 0, 0, 0},	24
24	};	25	{{NULL, NULL, NULL}, 0, 0, 0},
25		26	};
26	--- ./src/psgen.c.orig Thu Jun 25 15:18:54 1998	27	diff -ruN src.orib/psgen.c src/psgen.c
27	+++ ./src/psgen.c Mon Nov 27 22:18:18 2000	28	--- src.orib/psgen.c Thu May 13 12:41:04 2004
28	@@ -303,15 +303,22 @@	29	+++ src/psgen.c Thu May 13 12:53:07 2004
		30	@@ -323,15 +323,21 @@
29	if (!paste_file ("enscript", ".pro"))	31	if (!paste_file ("enscript", ".pro"))
30	FATAL ((stderr, _("couldn't find prolog \"%s\": %s\n"), "enscript.pro",	32	FATAL ((stderr, _("couldn't find prolog \"%s\": %s\n"), "enscript.pro",
31	strerror (errno)));	33	strerror (errno)));
Lines 49-82 Link Here
49	+ FATAL ((stderr, _("couldn't find encoding file \"%s.enc\": %s\n"),	51	+ FATAL ((stderr, _("couldn't find encoding file \"%s.enc\": %s\n"),
50	+ encoding_name, strerror (errno)));	52	+ encoding_name, strerror (errno)));
51	+ OUTPUT ((cofp, "%%%%EndResource\n"));	53	+ OUTPUT ((cofp, "%%%%EndResource\n"));
52	+ }	54	+ }
53	+
54		55
55	OUTPUT ((cofp, "%%%%EndProlog\n"));	56	OUTPUT ((cofp, "%%%%EndProlog\n"));
56		57
57	@@ -339,6 +346,7 @@	58	@@ -1129,7 +1135,12 @@
58	/* Select our fonts. */
59
60	/* Header font HF. */
61	+
62	OUTPUT ((cofp, "/%s /HF-gs-font MF\n", HFname));
63	OUTPUT ((cofp,
64	"/HF /HF-gs-font findfont [HFpt_w 0 0 HFpt_h 0 0] makefont def\n"));
65	@@ -1033,7 +1041,12 @@
66	/* Help macros. */	59	/* Help macros. */
67		60
68	/* Check if character <ch> fits to current line. */	61	/* Check if character <ch> fits to current line. */
69	-#define FITS_ON_LINE(ch) ((linepos + CHAR_WIDTH (ch) < linew) \|\| col == 0)	62	-#define FITS_ON_LINE(ch) ((linepos + CHAR_WIDTH (ch) < linew) \|\| col == 0)
70	+/* NO wraping for CJK at this moment. Added by C.S. Chin Sept.1 */	63	+/* NO wraping for CJK at this moment. Added by C.S. Chin Sept.1 */
71	+	64	+
72	+#define FITS_ON_LINE(ch) ( ( (encoding == ENC_BIG5 && b5firstc) \|\|\	65	+#define FITS_ON_LINE(ch) ( ( (encoding == ENC_BIG5 && b5firstc) \|\|\
73	+ (encoding == ENC_UNICNS_UTF8 && u8firstc) ) ?\	66	+ (encoding == ENC_UNICNS_UTF8 && u8firstc) ) ?\
74	+ (linepos + 2 * CHAR_WIDTH (ch) < linew) :\	67	+ (linepos + 2 * CHAR_WIDTH (ch) < linew) :\
75	+ (linepos + CHAR_WIDTH (ch) < linew \|\| in_u8) )	68	+ (linepos + CHAR_WIDTH (ch) < linew \|\| in_u8) )
76		69
77	/* Is line buffer empty? */	70	/* Is line buffer empty? */
78	#define BUFFER_EMPTY() (bufpos == 0)	71	#define BUFFER_EMPTY() (bufpos == 0)
79	@@ -1473,8 +1486,12 @@	72	@@ -1594,8 +1605,12 @@
80	static unsigned int buflen = 0; /* output buffer's length */	73	static unsigned int buflen = 0; /* output buffer's length */
81	unsigned int bufpos = 0; /* current position in output buffer */	74	unsigned int bufpos = 0; /* current position in output buffer */
82	int ch = 0;	75	int ch = 0;
Lines 89-95 Link Here
89	static int pending_token = tNONE;	82	static int pending_token = tNONE;
90	unsigned int original_col = col;	83	unsigned int original_col = col;
91		84
92	@@ -1624,6 +1641,39 @@	85	@@ -1745,6 +1760,39 @@
93	break;	86	break;
94	}	87	}
95		88
Lines 129-154 Link Here
129	/* Check normal characters. */	122	/* Check normal characters. */
130	if (EXISTS (ch))	123	if (EXISTS (ch))
131	{	124	{
132	@@ -1741,7 +1791,7 @@	125	diff -ruN src.orib/util.c src/util.c
133	/* Got a string. */	126	--- src.orib/util.c Thu May 13 12:41:04 2004
134		127	+++ src/util.c Thu May 13 12:56:31 2004
135	/* Check for wrapped line. */	128	@@ -890,11 +890,18 @@
136	- if (done == DONE_WRAP)
137	+ if (done == DONE_WRAP)
138	{
139	/* This line is too long. */
140	ch = nl;
141	--- ./src/util.c.orig Wed Jun 24 14:48:21 1998
142	+++ ./src/util.c Mon Nov 27 22:18:18 2000
143	@@ -774,6 +774,7 @@
144	if (!strhash_get (afm_cache, Fname, strlen (Fname), (void **) &font))
145	{
146	/* AFM file was not cached, open it from disk. */
147	+
148	error = afm_open_font (afm, AFM_I_COMPOSITES, Fname, &font);
149	if (error != AFM_SUCCESS)
150	{
151	@@ -782,11 +783,18 @@
152	* Do not report failures for "Courier*" fonts because	129	* Do not report failures for "Courier*" fonts because
153	* AFM library's default font will fix them.	130	* AFM library's default font will fix them.
154	*/	131	*/
Lines 172-187 Link Here
172	error = afm_open_default_font (afm, &font);	149	error = afm_open_default_font (afm, &font);
173	if (error != AFM_SUCCESS)	150	if (error != AFM_SUCCESS)
174	{	151	{
175	@@ -796,7 +804,7 @@	152	@@ -997,6 +1004,12 @@
176	buf));
177	}
178	}
179	-
180	+
181	/* Apply encoding. */
182	switch (encoding)
183	{
184	@@ -879,6 +887,12 @@
185	case ENC_PS:	153	case ENC_PS:
186	/* Let's use font's default encoding -- nothing here. */	154	/* Let's use font's default encoding -- nothing here. */
187	break;	155	break;
Lines 194-200 Link Here
194	}	162	}
195		163
196	/* Put it to the AFM cache. */	164	/* Put it to the AFM cache. */
197	@@ -888,20 +902,57 @@	165	@@ -1006,20 +1019,56 @@
198		166
199	font_info = (CachedFontInfo ) xcalloc (1, sizeof (font_info));	167	font_info = (CachedFontInfo ) xcalloc (1, sizeof (font_info));
200	/* Read character widths and types. */	168	/* Read character widths and types. */
Lines 227-233 Link Here
227	+ else	195	+ else
228	+ font_info->font_ctype[i] = '*';	196	+ font_info->font_ctype[i] = '*';
229	+ }	197	+ }
230	+ } else {	198	+ } else {
231	+ if (encoding == ENC_BIG5)	199	+ if (encoding == ENC_BIG5)
232	+ {	200	+ {
233	+ for (i = 0; i < 256; i++)	201	+ for (i = 0; i < 256; i++)
Lines 261-268 Link Here
261	+ }	229	+ }
262	+ }	230	+ }
263	+ }	231	+ }
264	+ }	232	+ }
265	+
266		233
267	font_info->font_is_fixed	234	font_info->font_is_fixed
268	= font->writing_direction_metrics[0].IsFixedPitch;	235	= font->writing_direction_metrics[0].IsFixedPitch;