Attachment #47348 for bug #104656

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

Lines 520-531 Link Here

(-)lib/gs_ttf.ps-dist (-2 / +7 lines)
520	(name) 1 index	520	(name) 1 index
521	(OS/2) 1 index	521	(OS/2) 1 index
522	(post) { .readbigtable }	522	(post) { .readbigtable }
523	(vhea) 1 index	523	systemdict /DEVICE .knownget { (pdfwrite) ne } {true} ifelse {
		524	(vhea) 1 index % better to be ignored for virtical writing in pdfwrite
		525	} if
		526	(mort) 1 index % for WMode glyph substitution
524	% Big tables	527	% Big tables
525	(glyf) { .readbigtable }	528	(glyf) { .readbigtable }
526	(loca) 1 index	529	(loca) 1 index
527	(hmtx) 1 index	530	(hmtx) 1 index
528	(vmtx) 1 index	531	systemdict /DEVICE .knownget { (pdfwrite) ne } {true} ifelse {
		532	(vmtx) 1 index % better to be ignored for virtical writing in pdfwrite
		533	} if
529	% Tables only needed for embedding in PDF files	534	% Tables only needed for embedding in PDF files
530	(cvt ) { .readtable }	535	(cvt ) { .readtable }
531	(fpgm) 1 index	536	(fpgm) 1 index

Lines 125-131 Link Here

(-)lib/gs_fntem.ps-dist (-1 / +1 lines)
125	w 908 908 7924 w	125	w 908 908 7924 w
126	w 910 910 7925 w	126	w 910 910 7925 w
127	w 912 912 7926 w	127	w 912 912 7926 w
128	w 914 914 7927 w	128	w 919 919 7927 w % was `w 914 914 7927 w'
129	w 925 925 7928 w	129	w 925 925 7928 w
130	w 927 927 7929 w	130	w 927 927 7929 w
131	w 929 929 7930 w	131	w 929 929 7930 w

Lines 127-132 cshow_continue(i_ctx_t *i_ctx_p) Link Here

(-)src/zcfont.c-dist (+4 lines)
127	if (code < 0)	127	if (code < 0)
128	return code;	128	return code;
129	}	129	}
		130	#if 1 /* XXX */
		131	if (scaled_font != root_font)
		132	scaled_font->WMode = root_font->WMode; /* need for pdfwrite */
		133	#endif
130	push(3);	134	push(3);
131	make_int(op - 2, gs_text_current_char(penum) & 0xff);	135	make_int(op - 2, gs_text_current_char(penum) & 0xff);
132	make_real(op - 1, wpt.x);	136	make_real(op - 1, wpt.x);




	    pfont->data.metrics[1].offset = offset;
	    pfont->data.metrics[1].length = (uint)u32(tab + 12);
	}
#if 1 /* XXXX */
	else if (!memcmp(tab, "mort", 4)) {
	    /* find vertical substitution */
	    byte *mort;

	    ACCESS(offset, 20, mort);	/* length not accurate */
	    if ((uint)u32(mort) == 0x00010000) {
		int nChains, i;
		ulong Chainp = 8;

		nChains = (int)u32(mort+4);
		for (i=1; i <= nChains; i++) {
		  int nSub, j;
		  ulong Subp;

		  nSub = U16(mort+Chainp+10);
		  Subp = Chainp + U16(mort+Chainp+8)*12 + 12;
		  for (j=1; j <= nSub; j++) {
		     if ((U16(mort+Subp+2)&7) == 4) {
			if ((U16(mort+Subp+8) == 6) &&
			    (U16(mort+Subp+10) == 4)) {
			  byte *ncgsv;
			  int  cnt;
			  cnt = U16(mort+Subp+12);
			  ACCESS(offset+Subp+20, cnt*4, ncgsv);
			  if (!pfont->data.mort_ncgsv_off) {
			    pfont->data.mort_ncgsv_off = offset+Subp+20;
			    pfont->data.mort_ncgsv_len = cnt*4;
			  } else
			    dlprintf("multiple ncgsv ignored.\n");
			}
		     }
		     Subp += U16(mort+Subp);
		  }
		  Chainp += (int)u32(mort+Chainp+4);
		}
	    }
	}
#endif
    }
    loca_size >>= pfont->data.indexToLocFormat + 1;
    pfont->data.numGlyphs = (loca_size == 0 ? 0 : loca_size - 1);

	pfont->FontBBox.q.x = S16(head_box + 4) / upem;
	pfont->FontBBox.q.y = S16(head_box + 6) / upem;
    }
#if 1 /* XXX */
    if (! pfont->data.metrics[1].offset) {
	/* no vhea/vmtx
	 * shrink/expand the height to 1.0
 	 */
	float v;
	v = - pfont->FontBBox.p.y + pfont->FontBBox.q.y;
	    pfont->FontBBox.p.y /= v;
	    pfont->FontBBox.q.y /= v;

	    pfont->FontBBox.p.x /= v;
	    pfont->FontBBox.q.x /= v;
    }
#endif
#if NEW_TT_INTERPRETER
    pfont->data.warning_patented = false;
    pfont->data.warning_bad_instruction = false;




    if (pdsubf->u.cidfont.glyphshow_font_id != 0)
 	font0 = (gs_font_type0 *)gs_find_font_by_id(font->dir, 
 		    pdsubf->u.cidfont.glyphshow_font_id);
#if 1 /* XXX */
    if (font0 == NULL || font0->WMode != scaled_font->WMode) {
  	code = gs_font_type0_from_cidfont(&font0, font, scaled_font->WMode,
 					  &scale_matrix, font->memory);
	if (code < 0)
	    return code;
 	pdsubf->u.cidfont.glyphshow_font_id = font0->id;
 	font0->WMode = scaled_font->WMode; /* should not be here? */
    }
#else
    if (font0 == NULL) {
  	code = gs_font_type0_from_cidfont(&font0, font, font->WMode,
 					  &scale_matrix, font->memory);

	    return code;
 	pdsubf->u.cidfont.glyphshow_font_id = font0->id;
    }
#endif

    /* Now handle the glyphshow as a show in the Type 0 font. */


Lines 84-89 struct gs_type42_data_s { Link Here

(-)src/gxfont42.h-dist (+7 lines)
84	bool warning_patented;	84	bool warning_patented;
85	bool warning_bad_instruction;	85	bool warning_bad_instruction;
86	#endif	86	#endif
		87	#if 1 /* XXXX */
		88	/*
		89	* to find out glyph substitution
		90	*/
		91	uint mort_ncgsv_off; /* vertical substition entry offset */
		92	uint mort_ncgsv_len; /* total number of bytes (4#) /
		93	#endif
87	};	94	};
88	#define gs_font_type42_common\	95	#define gs_font_type42_common\
89	gs_font_base_common;\	96	gs_font_base_common;\

Lines 1797-1802 get_missing_width(gs_font_base *cfont, i Link Here

(-)src/gdevpdtt.c-dist (+49 lines)
1797	pwidths->Width.xy.y;	1797	pwidths->Width.xy.y;
1798	pwidths->Width.v.x = - pwidths->Width.xy.y / 2;	1798	pwidths->Width.v.x = - pwidths->Width.xy.y / 2;
1799	pwidths->Width.v.y = - pwidths->Width.xy.y;	1799	pwidths->Width.v.y = - pwidths->Width.xy.y;
		1800	#if 1 /* XXX */
		1801	/* pwidths->Width.v.y = 0.84; should use ascent/descent ratio /
		1802	pwidths->Width.v.y *=
		1803	cfont->FontBBox.q.y/(-cfont->FontBBox.p.y+cfont->FontBBox.q.y);
		1804	#endif
1800	} else {	1805	} else {
1801	pwidths->Width.xy.x = pwidths->real_width.xy.x =	1806	pwidths->Width.xy.x = pwidths->real_width.xy.x =
1802	finfo.MissingWidth * scale_c;	1807	finfo.MissingWidth * scale_c;
Lines 1875-1882 pdf_glyph_widths(pdf_font_resource_t *pd Link Here
1875		1880
1876	if (get_missing_width(cfont, 0, scale_c, &widths1) < 0)	1881	if (get_missing_width(cfont, 0, scale_c, &widths1) < 0)
1877	v.x = 0;	1882	v.x = 0;
		1883	#if 1 /* XXX / / Adobe-Japan specific */
		1884	#define in_cid(s,e,cid,g) \
		1885	((gs_min_cid_glyph + cid) <= g && g <= (gs_min_cid_glyph + cid + e - s))
		1886	#define Roman(g) in_cid(0x20, 0x7e, 231, g)
		1887	#define Hankaku(g) \
		1888	(in_cid(0x20, 0x5f, 231, g) \|\| in_cid(0x60, 0x60, 231, g) \|\| \
		1889	in_cid(0x61, 0x7e, 296, g) \|\| in_cid(0x81, 0x85, 327, g) \|\| \
		1890	in_cid(0x86, 0x8f, 516, g) \|\| in_cid(0x90, 0x90, 342, g) \|\| \
		1891	in_cid(0x91, 0x9f, 526, g) \|\| in_cid(0xa1, 0xdf, 327, g) \|\| \
		1892	in_cid(0xe0, 0xfd, 541, g) \|\| in_cid(0xfe, 0xff, 388, g))
		1893	#define Hiragana(g) \
		1894	(in_cid(0x20, 0x20, 515, g) \|\| in_cid(0x21, 0x25, 327, g) \|\| \
		1895	in_cid(0x26, 0x2f, 516, g) \|\| in_cid(0x30, 0x30, 342, g) \|\| \
		1896	in_cid(0x31, 0x5d, 526, g) \|\| in_cid(0x5e, 0x5f, 388, g) \|\| \
		1897	in_cid(0x60, 0x62, 571, g) \|\| in_cid(0x66, 0x7e, 574, g))
		1898
		1899	#define adobe_japan_ascii(fp, gly) \
		1900	fp->FontType == ft_CID_TrueType && \
		1901	((gs_font_cid2*)fp)->cidata.common.CIDSystemInfo.Registry.size == 5 && \
		1902	!memcmp(((gs_font_cid2*)fp)->cidata.common.CIDSystemInfo.Registry.data,"Adobe",5) && \
		1903	((gs_font_cid2*)fp)->cidata.common.CIDSystemInfo.Ordering.size == 6 && \
		1904	!memcmp(((gs_font_cid2*)fp)->cidata.common.CIDSystemInfo.Ordering.data,"Japan1",6) && \
		1905	(Roman(gly) \|\| Hankaku(gly) \|\| Hiragana(gly))
		1906
		1907	else {
		1908	v.x = widths1.Width.w / 2;
		1909	if (adobe_japan_ascii(ofont,glyph))
		1910	v.x /= 2;
		1911	}
		1912	#else
1878	else	1913	else
1879	v.x = widths1.Width.w / 2;	1914	v.x = widths1.Width.w / 2;
		1915	#endif
1880	} else	1916	} else
1881	v.x = pwidths->Width.v.x;	1917	v.x = pwidths->Width.v.x;
1882	} else if (code < 0)	1918	} else if (code < 0)
Lines 1898-1905 pdf_glyph_widths(pdf_font_resource_t *pd Link Here
1898		1934
1899	if (get_missing_width(cfont, 0, scale_c, &widths1) < 0)	1935	if (get_missing_width(cfont, 0, scale_c, &widths1) < 0)
1900	v.x = 0;	1936	v.x = 0;
		1937	#if 1 /* XXX / / Adobe-Japan specific */
		1938	else {
		1939	v.x = widths1.Width.w / 2;
		1940	if (adobe_japan_ascii(ofont,glyph))
		1941	v.x /= 2;
		1942	}
		1943	#undef in_cid
		1944	#undef Roman
		1945	#undef Hankaku
		1946	#undef Hiragana
		1947	#undef adobe_japan_ascii
		1948	#else
1901	else	1949	else
1902	v.x = widths1.Width.w / 2;	1950	v.x = widths1.Width.w / 2;
		1951	#endif
1903	}	1952	}
1904	} else {	1953	} else {
1905	if (info.members & (GLYPH_INFO_VVECTOR0 << wmode)) {	1954	if (info.members & (GLYPH_INFO_VVECTOR0 << wmode)) {

Lines 35-40 Link Here

(-)src/zfcid1.c-dist (+63 lines)
35	#include "stream.h"	35	#include "stream.h"
36	#include "files.h"	36	#include "files.h"
37		37
		38	#if 1 /* XXXX */
		39	private uint z11_find_repl_glyph(gs_font_cid2 *, uint);
		40	#endif
		41
38	/* ---------------- CIDFontType 1 (FontType 10) ---------------- */	42	/* ---------------- CIDFontType 1 (FontType 10) ---------------- */
39		43
40	/* <string\|name> <font_dict> .buildfont10 <string\|name> <font> */	44	/* <string\|name> <font_dict> .buildfont10 <string\|name> <font> */
Lines 67-72 zbuildfont10(i_ctx_t *i_ctx_p) Link Here
67		71
68	/* ------ Accessing ------ */	72	/* ------ Accessing ------ */
69		73
		74	/* Replace a glyph with a vertical substitution */
		75	private uint
		76	z11_find_repl_glyph(gs_font_cid2 *pfont, uint glyph)
		77	{
		78	int i;
		79	const byte *data;
		80
		81	if (pfont->data.mort_ncgsv_off == 0)
		82	return glyph;
		83
		84	if ((pfont->data.string_proc)((gs_font_type42)pfont,
		85	(ulong)pfont->data.mort_ncgsv_off,
		86	pfont->data.mort_ncgsv_len, &data) == 0) {
		87	for (i=0; i < pfont->data.mort_ncgsv_len; i += 4) {
		88	if (((data[i]<<8)+data[i+1]) == glyph) {
		89	return (uint)((data[i+2]<<8)+data[i+3]);
		90	}
		91	}
		92	}
		93	return glyph;
		94	}
		95
70	/* Map a glyph CID to a TrueType glyph number using the CIDMap. */	96	/* Map a glyph CID to a TrueType glyph number using the CIDMap. */
71	private int	97	private int
72	z11_CIDMap_proc(gs_font_cid2 *pfont, gs_glyph glyph)	98	z11_CIDMap_proc(gs_font_cid2 *pfont, gs_glyph glyph)
Lines 107-112 z11_CIDMap_proc(gs_font_cid2 *pfont, gs_ Link Here
107	}	133	}
108	for (i = 0; i < gdbytes; ++i)	134	for (i = 0; i < gdbytes; ++i)
109	gnum = (gnum << 8) + data[i];	135	gnum = (gnum << 8) + data[i];
		136	#if 1 /* XXXX */
		137	if ( gnum != 0 &&
		138	pfont->cidata.common.CIDSystemInfo.Registry.size == 5 &&
		139	!memcmp(pfont->cidata.common.CIDSystemInfo.Registry.data,"Adobe",5) &&
		140	pfont->cidata.common.CIDSystemInfo.Ordering.size == 6 &&
		141	!memcmp(pfont->cidata.common.CIDSystemInfo.Ordering.data,"Japan1",6)) {
		142	uint gnum0 = gnum;
		143
		144	/* ps string represented in EUC/ShiftJIS are mapped to CID string,
		145	* while certain characters (e.g. 0xa1c4) are mapped to different CID
		146	* (668 or 7897) depending on WMode(0 or 1).
		147	* But, when CID characters are mapped to ShiftJIS/Unicode to get
		148	* corresponding TTF glyphs, certain CID characters are mapped to
		149	* glyphs valid for horizonal writing
		150	* (there is no choice in ShiftJIS encoded TTF), using Resource/CMap
		151	*
		152	* Following code maps certain CID (for vertical writing chars)
		153	* to glyphs for vertical writing regardless of WMode!
		154	* This automatic mapping enables generating PDF of vertical writing.
		155	*
		156	* fixme: range correct?
		157	*/
		158	if (7887 <= cid && cid <= 7960) {
		159	/* substitute a glyph for vertical writing cid character */
		160	gnum = z11_find_repl_glyph(pfont, gnum);
		161	}
		162	if (gnum != gnum0) {
		163	if (gs_debug_c('J'))
		164	dlprintf3("[J]z11_CIDMap_proc(): cid:%d -> %d -> %d\n",
		165	cid, gnum0, gnum);
		166	} else if (gs_debug_c('J')) {
		167	dlprintf2("[J]z11_CIDMap_proc(): cid:%d -> %d\n", cid, gnum);
		168	}
		169	} else if (gs_debug_c('J')) {
		170	dlprintf2("[J]z11_CIDMap_proc(): cid:%d -> %d\n", cid, gnum);
		171	}
		172	#endif
110	return gnum;	173	return gnum;
111	}	174	}
112		175

Lines 181-187 Link Here

(-)Resource/CMap/UniJIS-UCS2-H-dist (-2 / +2 lines)
181	<2002> <2002> 231	181	<2002> <2002> 231
182	<2003> <2003> 633	182	<2003> <2003> 633
183	<2010> <2010> 662	183	<2010> <2010> 662
184	<2011> <2011> 14	184	%<2011> <2011> 14 % hides 14 in <0020> <005b> 1
185	<2012> <2012> 114	185	<2012> <2012> 114
186	<2013> <2013> 114	186	<2013> <2013> 114
187	<2014> <2014> 138	187	<2014> <2014> 138
Lines 294-300 Link Here
294	<22a5> <22a5> 757	294	<22a5> <22a5> 757
295	<22bf> <22bf> 7630	295	<22bf> <22bf> 7630
296	<22ee> <22ee> 7897	296	<22ee> <22ee> 7897
297	<22ef> <22ef> 668	297	%<22ef> <22ef> 668 % hides <2026> <2026> 668
298	<2300> <2300> 12184	298	<2300> <2300> 12184
299	<2307> <2307> 12219	299	<2307> <2307> 12219
300	<2312> <2312> 758	300	<2312> <2312> 758

Lines 52-68 Link Here

(-)Resource/CMap/UniJIS-UCS2-V-dist (-61 / +61 lines)
52	<00b0> <00b0> 8269	52	<00b0> <00b0> 8269
53	<2010> <2010> 7893	53	<2010> <2010> 7893
54	<2015> <2015> 7892	54	<2015> <2015> 7892
55	<2016> <2016> 7895	55	%<2016> <2016> 7895
56	<2018> <2019> 8281	56	<2018> <2019> 8281
57	<201c> <201d> 8279	57	<201c> <201d> 8279
58	<2025> <2025> 7898	58	<2025> <2025> 7898
59	<2026> <2026> 7897	59	<2026> <2026> 7897
60	<2032> <2032> 8273	60	<2032> <2032> 8273
61	<2033> <2033> 8283	61	<2033> <2033> 8283
62	<2190> <2190> 738	62	%<2190> <2190> 738
63	<2191> <2191> 736	63	%<2191> <2191> 736
64	<2192> <2192> 739	64	%<2192> <2192> 739
65	<2193> <2193> 737	65	%<2193> <2193> 737
66	<2195> <2195> 12214	66	<2195> <2195> 12214
67	<21c4> <21c4> 8311	67	<21c4> <21c4> 8311
68	<21c5> <21c5> 8310	68	<21c5> <21c5> 8310
Lines 74-135 Link Here
74	<2225> <2225> 7895	74	<2225> <2225> 7895
75	<223c> <223c> 7894	75	<223c> <223c> 7894
76	<22ef> <22ef> 7897	76	<22ef> <22ef> 7897
77	<2500> <2501> 7481	77	% <2500> <2501> 7481
78	<2502> <2503> 7479	78	% <2502> <2503> 7479
79	<2504> <2505> 7485	79	% <2504> <2505> 7485
80	<2506> <2507> 7483	80	% <2506> <2507> 7483
81	<2508> <2509> 7489	81	% <2508> <2509> 7489
82	<250a> <250b> 7487	82	% <250a> <250b> 7487
83	<250c> <250c> 7495	83	% <250c> <250c> 7495
84	<250d> <250d> 7497	84	% <250d> <250d> 7497
85	<250e> <250e> 7496	85	% <250e> <250e> 7496
86	<250f> <250f> 7498	86	% <250f> <250f> 7498
87	<2510> <2510> 7503	87	% <2510> <2510> 7503
88	<2511> <2511> 7505	88	% <2511> <2511> 7505
89	<2512> <2512> 7504	89	% <2512> <2512> 7504
90	<2513> <2513> 7506	90	% <2513> <2513> 7506
91	<2514> <2514> 7491	91	% <2514> <2514> 7491
92	<2515> <2515> 7493	92	% <2515> <2515> 7493
93	<2516> <2516> 7492	93	% <2516> <2516> 7492
94	<2517> <2517> 7494	94	% <2517> <2517> 7494
95	<2518> <2518> 7499	95	% <2518> <2518> 7499
96	<2519> <2519> 7501	96	% <2519> <2519> 7501
97	<251a> <251a> 7500	97	% <251a> <251a> 7500
98	<251b> <251b> 7502	98	% <251b> <251b> 7502
99	<251c> <251c> 7523	99	% <251c> <251c> 7523
100	<251d> <251d> 7527	100	% <251d> <251d> 7527
101	<251e> <251e> 7525	101	% <251e> <251e> 7525
102	<251f> <251f> 7524	102	% <251f> <251f> 7524
103	<2520> <2520> 7526	103	% <2520> <2520> 7526
104	<2521> <2521> 7529	104	% <2521> <2521> 7529
105	<2522> <2522> 7528	105	% <2522> <2522> 7528
106	<2523> <2524> 7530	106	% <2523> <2524> 7530
107	<2525> <2525> 7535	107	% <2525> <2525> 7535
108	<2526> <2526> 7533	108	% <2526> <2526> 7533
109	<2527> <2527> 7532	109	% <2527> <2527> 7532
110	<2528> <2528> 7534	110	% <2528> <2528> 7534
111	<2529> <2529> 7537	111	% <2529> <2529> 7537
112	<252a> <252a> 7536	112	% <252a> <252a> 7536
113	<252b> <252b> 7538	113	% <252b> <252b> 7538
114	<252c> <252c> 7515	114	% <252c> <252c> 7515
115	<252d> <252f> 7517	115	% <252d> <252f> 7517
116	<2530> <2530> 7516	116	% <2530> <2530> 7516
117	<2531> <2533> 7520	117	% <2531> <2533> 7520
118	<2534> <2534> 7507	118	% <2534> <2534> 7507
119	<2535> <2537> 7509	119	% <2535> <2537> 7509
120	<2538> <2538> 7508	120	% <2538> <2538> 7508
121	<2539> <253b> 7512	121	% <2539> <253b> 7512
122	<253d> <253f> 7543	122	% <253d> <253f> 7543
123	<2540> <2540> 7541	123	% <2540> <2540> 7541
124	<2541> <2541> 7540	124	% <2541> <2541> 7540
125	<2542> <2542> 7542	125	% <2542> <2542> 7542
126	<2543> <2543> 7547	126	% <2543> <2543> 7547
127	<2544> <2544> 7549	127	% <2544> <2544> 7549
128	<2545> <2545> 7546	128	% <2545> <2545> 7546
129	<2546> <2546> 7548	129	% <2546> <2546> 7548
130	<2547> <2547> 7553	130	% <2547> <2547> 7553
131	<2548> <2548> 7552	131	% <2548> <2548> 7552
132	<2549> <254a> 7550	132	% <2549> <254a> 7550
133	<261c> <261c> 8221	133	<261c> <261c> 8221
134	<261d> <261d> 8219	134	<261d> <261d> 8219
135	<261e> <261e> 8222	135	<261e> <261e> 8222

Lines 84-133 Link Here

(-)Resource/CMap/90ms-RKSJ-V-dist (-36 / +36 lines)
84	<838e> <838e> 7937	84	<838e> <838e> 7937
85	<8395> <8396> 7938	85	<8395> <8396> 7938
86	<849f> <849f> 7481	86	<849f> <849f> 7481
87	<84a0> <84a0> 7479	87	% <84a0> <84a0> 7479
88	<84a1> <84a1> 7495	88	% <84a1> <84a1> 7495
89	<84a2> <84a2> 7503	89	% <84a2> <84a2> 7503
90	<84a3> <84a3> 7499	90	% <84a3> <84a3> 7499
91	<84a4> <84a4> 7491	91	% <84a4> <84a4> 7491
92	<84a5> <84a5> 7523	92	% <84a5> <84a5> 7523
93	<84a6> <84a6> 7515	93	% <84a6> <84a6> 7515
94	<84a7> <84a7> 7531	94	% <84a7> <84a7> 7531
95	<84a8> <84a8> 7507	95	% <84a8> <84a8> 7507
96	<84a9> <84a9> 7539	96	% <84a9> <84a9> 7539
97	<84aa> <84aa> 7482	97	% <84aa> <84aa> 7482
98	<84ab> <84ab> 7480	98	% <84ab> <84ab> 7480
99	<84ac> <84ac> 7498	99	% <84ac> <84ac> 7498
100	<84ad> <84ad> 7506	100	% <84ad> <84ad> 7506
101	<84ae> <84ae> 7502	101	% <84ae> <84ae> 7502
102	<84af> <84af> 7494	102	% <84af> <84af> 7494
103	<84b0> <84b0> 7530	103	% <84b0> <84b0> 7530
104	<84b1> <84b1> 7522	104	% <84b1> <84b1> 7522
105	<84b2> <84b2> 7538	105	% <84b2> <84b2> 7538
106	<84b3> <84b3> 7514	106	% <84b3> <84b3> 7514
107	<84b4> <84b4> 7554	107	% <84b4> <84b4> 7554
108	<84b5> <84b5> 7526	108	% <84b5> <84b5> 7526
109	<84b6> <84b6> 7519	109	% <84b6> <84b6> 7519
110	<84b7> <84b7> 7534	110	% <84b7> <84b7> 7534
111	<84b8> <84b8> 7511	111	% <84b8> <84b8> 7511
112	<84b9> <84b9> 7545	112	% <84b9> <84b9> 7545
113	<84ba> <84ba> 7527	113	% <84ba> <84ba> 7527
114	<84bb> <84bb> 7516	114	% <84bb> <84bb> 7516
115	<84bc> <84bc> 7535	115	% <84bc> <84bc> 7535
116	<84bd> <84bd> 7508	116	% <84bd> <84bd> 7508
117	<84be> <84be> 7542	117	% <84be> <84be> 7542
118	<875f> <8760> 7940	118	<875f> <8760> 7940
119	<8761> <8761> 8329	119	<8761> <8761> 8329
120	<8762> <8762> 7943	120	<8762> <8762> 7943
121	<8763> <8763> 8339	121	<8763> <8763> 8339
122	<8764> <8764> 7945	122	% <8764> <8764> 7945
123	<8765> <8765> 8338	123	<8765> <8765> 8338
124	<8766> <8767> 7947	124	% <8766> <8767> 7947
125	<8768> <8768> 8344	125	<8768> <8768> 8344
126	<8769> <876a> 7950	126	% <8769> <876a> 7950
127	<876b> <876b> 8348	127	<876b> <876b> 8348
128	<876c> <876d> 7953	128	% <876c> <876d> 7953
129	<876e> <876e> 8349	129	<876e> <876e> 8349
130	<8780> <8781> 7956	130	% <8780> <8781> 7956
131	endcidrange	131	endcidrange
132	endcmap	132	endcmap
133	CMapName currentdict /CMap defineresource pop	133	CMapName currentdict /CMap defineresource pop

Return to bug 104656

Lines 648-653 process_cid_text(gs_text_enum_t *pte, vo Link Here

(-)src/gdevpdtc.c-dist (+11 lines)
648	if (pdsubf->u.cidfont.glyphshow_font_id != 0)	648	if (pdsubf->u.cidfont.glyphshow_font_id != 0)
649	font0 = (gs_font_type0 *)gs_find_font_by_id(font->dir,	649	font0 = (gs_font_type0 *)gs_find_font_by_id(font->dir,
650	pdsubf->u.cidfont.glyphshow_font_id);	650	pdsubf->u.cidfont.glyphshow_font_id);
		651	#if 1 /* XXX */
		652	if (font0 == NULL \|\| font0->WMode != scaled_font->WMode) {
		653	code = gs_font_type0_from_cidfont(&font0, font, scaled_font->WMode,
		654	&scale_matrix, font->memory);
		655	if (code < 0)
		656	return code;
		657	pdsubf->u.cidfont.glyphshow_font_id = font0->id;
		658	font0->WMode = scaled_font->WMode; /* should not be here? */
		659	}
		660	#else
651	if (font0 == NULL) {	661	if (font0 == NULL) {
652	code = gs_font_type0_from_cidfont(&font0, font, font->WMode,	662	code = gs_font_type0_from_cidfont(&font0, font, font->WMode,
653	&scale_matrix, font->memory);	663	&scale_matrix, font->memory);
Lines 655-660 process_cid_text(gs_text_enum_t *pte, vo Link Here
655	return code;	665	return code;
656	pdsubf->u.cidfont.glyphshow_font_id = font0->id;	666	pdsubf->u.cidfont.glyphshow_font_id = font0->id;
657	}	667	}
		668	#endif
658		669
659	/* Now handle the glyphshow as a show in the Type 0 font. */	670	/* Now handle the glyphshow as a show in the Type 0 font. */
660		671

Lines 146-151 gs_type42_font_init(gs_font_type42 * pfo Link Here

(-)src/gstype42.c-dist (+53 lines)
146	pfont->data.metrics[1].offset = offset;	146	pfont->data.metrics[1].offset = offset;
147	pfont->data.metrics[1].length = (uint)u32(tab + 12);	147	pfont->data.metrics[1].length = (uint)u32(tab + 12);
148	}	148	}
		149	#if 1 /* XXXX */
		150	else if (!memcmp(tab, "mort", 4)) {
		151	/* find vertical substitution */
		152	byte *mort;
		153
		154	ACCESS(offset, 20, mort); /* length not accurate */
		155	if ((uint)u32(mort) == 0x00010000) {
		156	int nChains, i;
		157	ulong Chainp = 8;
		158
		159	nChains = (int)u32(mort+4);
		160	for (i=1; i <= nChains; i++) {
		161	int nSub, j;
		162	ulong Subp;
		163
		164	nSub = U16(mort+Chainp+10);
		165	Subp = Chainp + U16(mort+Chainp+8)*12 + 12;
		166	for (j=1; j <= nSub; j++) {
		167	if ((U16(mort+Subp+2)&7) == 4) {
		168	if ((U16(mort+Subp+8) == 6) &&
		169	(U16(mort+Subp+10) == 4)) {
		170	byte *ncgsv;
		171	int cnt;
		172	cnt = U16(mort+Subp+12);
		173	ACCESS(offset+Subp+20, cnt*4, ncgsv);
		174	if (!pfont->data.mort_ncgsv_off) {
		175	pfont->data.mort_ncgsv_off = offset+Subp+20;
		176	pfont->data.mort_ncgsv_len = cnt*4;
		177	} else
		178	dlprintf("multiple ncgsv ignored.\n");
		179	}
		180	}
		181	Subp += U16(mort+Subp);
		182	}
		183	Chainp += (int)u32(mort+Chainp+4);
		184	}
		185	}
		186	}
		187	#endif
149	}	188	}
150	loca_size >>= pfont->data.indexToLocFormat + 1;	189	loca_size >>= pfont->data.indexToLocFormat + 1;
151	pfont->data.numGlyphs = (loca_size == 0 ? 0 : loca_size - 1);	190	pfont->data.numGlyphs = (loca_size == 0 ? 0 : loca_size - 1);
Lines 167-172 gs_type42_font_init(gs_font_type42 * pfo Link Here
167	pfont->FontBBox.q.x = S16(head_box + 4) / upem;	206	pfont->FontBBox.q.x = S16(head_box + 4) / upem;
168	pfont->FontBBox.q.y = S16(head_box + 6) / upem;	207	pfont->FontBBox.q.y = S16(head_box + 6) / upem;
169	}	208	}
		209	#if 1 /* XXX */
		210	if (! pfont->data.metrics[1].offset) {
		211	/* no vhea/vmtx
		212	* shrink/expand the height to 1.0
		213	*/
		214	float v;
		215	v = - pfont->FontBBox.p.y + pfont->FontBBox.q.y;
		216	pfont->FontBBox.p.y /= v;
		217	pfont->FontBBox.q.y /= v;
		218
		219	pfont->FontBBox.p.x /= v;
		220	pfont->FontBBox.q.x /= v;
		221	}
		222	#endif
170	#if NEW_TT_INTERPRETER	223	#if NEW_TT_INTERPRETER
171	pfont->data.warning_patented = false;	224	pfont->data.warning_patented = false;
172	pfont->data.warning_bad_instruction = false;	225	pfont->data.warning_bad_instruction = false;