File ghostscript-8.64-freetype2.dif of Package ghostscript-library
--- lib/FAPIconfig
+++ lib/FAPIconfig 2007-09-06 11:01:26.000000000 +0000
@@ -1,14 +1,13 @@
%!
-% $Id: FAPIconfig 6870 2006-06-20 16:31:15Z leonardo $
% This is configuration file for FAPI client.
-/FontPath (/Fonts) % A default directory for FAPI-handled font files path in FAPIfontmap.
-/CIDFontPath (/CIDFonts) % A default directory for FAPI-handled CID font files path in FAPIcidfmap.
-/HookDiskFonts [1 2 9 11 42] % FontType values for disk PS fonts to be redirected to FAPI.
-/HookEmbeddedFonts [1 2 9 11 42] % FontType values for embedded PS fonts to be redirected to FAPI.
-
-% Values allowed for HookDiskFonts and HookEmbeddedFonts are 1, 2, 9, 11, 42.
-% "Disk fonts" are fonts being installed to Ghostscript with 'lib/Fontmap' or with GS_FONTPATH,
-% and CID font resource files.
-% "Embedded fonts" are fonts and CID fonts being embedded into a document.
+/FontPath (/usr/share/fonts/truetype) % A default directory for FAPI-handled font files path in FAPIfontmap.
+/CIDFontPath (/usr/share/fonts/CID) % A default directory for FAPI-handled CID font files path in FAPIcidfmap.
+/HookDiskFonts [1 9 11 42] % FontType values for disk PS fonts to be redirected to FAPI.
+/HookEmbeddedFonts [1 9 11 42] % FontType values for embedded PS fonts to be redirected to FAPI.
+% Only allowed values for HookDiskFonts and HookEmbeddedFonts are 1, 9, 11, 42.
+% Note that 9 and 11 correspond to CIDFontType 0 and 2. "Disk fonts" are fonts
+% being installed to Ghostscript with 'lib/Fontmap' or with GS_FONTPATH, and
+% CID font resource files. "Embedded fonts" are fonts and CID fonts being
+% embedded into a document.
--- Resource/Init/gs_fapi.ps
+++ Resource/Init/gs_fapi.ps 2007-09-06 12:40:56.000000000 +0000
@@ -16,7 +17,9 @@
% $Id: gs_fapi.ps 8022 2007-06-05 22:23:38Z giles $
% Redefine Font and CIDFont categories with FAPI-handeled fonts.
-systemdict /.FAPIavailable known { .FAPIavailable } { false } ifelse not {
+systemdict /.FAPIavailable known {
+ .FAPIavailable currentdict /FAPI known { FAPI } { false } ifelse and
+} { false } ifelse not {
(%END FAPI) .skipeof
} if
@@ -278,7 +281,9 @@ bind def
true //.FAPIrebuildfont //ChooseDecoding exec
} {
dup /PathLoad known dup {
+ pop
{ (PathLoad known for the font ) print //PrintFontRef exec (.) = } //FAPI_hook_debug exec
+ true
} {
pop //FAPI_is_hook_disabled exec dup
{ pop
--- Resource/Init/gs_init.ps
+++ Resource/Init/gs_init.ps 2008-04-02 12:58:02.371731792 +0000
@@ -140,6 +140,7 @@ currentdict /DISKFONTS known /DISKFONT
currentdict /DOINTERPOLATE .knownget { /INTERPOLATE exch def } if
currentdict /ESTACKPRINT known /ESTACKPRINT exch def
currentdict /FAKEFONTS known /FAKEFONTS exch def
+currentdict /FAPI known /FAPI exch def
currentdict /FIXEDMEDIA known /FIXEDMEDIA exch def
currentdict /FIXEDRESOLUTION known /FIXEDRESOLUTION exch def
currentdict /LOCALFONTS known /LOCALFONTS exch def
--- psi/int.mak
+++ psi/int.mak 2009-06-17 13:16:52.829901463 +0000
@@ -1801,12 +1801,12 @@ $(PSD)fapiu.dev : $(INT_MAK) $(ECHOGS_XE
# FreeType bridge :
-FT_LIB=$(FT_ROOT)$(D)objs$(D)freetype214MT_D
-FT_INC=$(I_)$(FT_ROOT)$(D)include$(_I)
+FT_LIB=$(libdir)$(D)libfreetype
+FT_INC=$(I_)$(FT_ROOT)$(D)include$(FT_SUB)$(_I)
-wrfont_h=$(stdpre_h) $(PSSRC)wrfont.h
-write_t1_h=$(ifapi_h) $(PSSRC)write_t1.h
-write_t2_h=$(ifapi_h) $(PSSRC)write_t2.h
+wrfont_h=$(stdpre_h) $(GLSRCDIR)$(D)wrfont.h
+write_t1_h=$(ifapi_h) $(GLSRCDIR)$(D)write_t1.h
+write_t2_h=$(ifapi_h) $(GLSRCDIR)$(D)write_t2.h
$(PSD)fapif1.dev : $(INT_MAK) $(ECHOGS_XE) \
$(FT_LIB)$(FT_LIB_EXT) \
@@ -1819,25 +1819,25 @@ $(PSD)fapif1.dev : $(INT_MAK) $(ECHOGS_X
$(PSOBJ)fapi_ft.$(OBJ) : $(PSSRC)fapi_ft.c $(AK)\
$(stdio__h) $(math__h) $(ifapi_h) $(gserror_h)\
- $(FT_ROOT)$(D)include$(D)freetype$(D)freetype.h\
- $(FT_ROOT)$(D)include$(D)freetype$(D)ftincrem.h\
- $(FT_ROOT)$(D)include$(D)freetype$(D)ftglyph.h\
- $(FT_ROOT)$(D)include$(D)freetype$(D)ftoutln.h\
- $(FT_ROOT)$(D)include$(D)freetype$(D)fttrigon.h\
+ $(FT_ROOT)$(D)include$(FT_SUB)$(D)freetype$(D)freetype.h\
+ $(FT_ROOT)$(D)include$(FT_SUB)$(D)freetype$(D)ftincrem.h\
+ $(FT_ROOT)$(D)include$(FT_SUB)$(D)freetype$(D)ftglyph.h\
+ $(FT_ROOT)$(D)include$(FT_SUB)$(D)freetype$(D)ftoutln.h\
+ $(FT_ROOT)$(D)include$(FT_SUB)$(D)freetype$(D)fttrigon.h\
$(write_t1_h) $(write_t2_h)
$(PSCC) $(FT_CFLAGS) $(FT_INC) $(PSO_)fapi_ft.$(OBJ) $(C_) $(PSSRC)fapi_ft.c
-$(PSOBJ)write_t1.$(OBJ) : $(PSSRC)write_t1.c $(AK)\
+$(PSOBJ)write_t1.$(OBJ) : $(GLSRCDIR)$(D)write_t1.c $(AK)\
$(wrfont_h) $(write_t1_h)
- $(PSCC) $(FT_CFLAGS) $(FT_INC) $(PSO_)write_t1.$(OBJ) $(C_) $(PSSRC)write_t1.c
+ $(PSCC) $(FT_CFLAGS) $(FT_INC) $(PSO_)write_t1.$(OBJ) $(C_) $(GLSRCDIR)$(D)write_t1.c
-$(PSOBJ)write_t2.$(OBJ) : $(PSSRC)write_t2.c $(AK)\
+$(PSOBJ)write_t2.$(OBJ) : $(GLSRCDIR)$(D)write_t2.c $(AK)\
$(wrfont_h) $(write_t2_h) $(stdio_h)
- $(PSCC) $(FT_CFLAGS) $(FT_INC) $(PSO_)write_t2.$(OBJ) $(C_) $(PSSRC)write_t2.c
+ $(PSCC) $(FT_CFLAGS) $(FT_INC) $(PSO_)write_t2.$(OBJ) $(C_) $(GLSRCDIR)$(D)write_t2.c
-$(PSOBJ)wrfont.$(OBJ) : $(PSSRC)wrfont.c $(AK)\
+$(PSOBJ)wrfont.$(OBJ) : $(GLSRCDIR)$(D)wrfont.c $(AK)\
$(wrfont_h) $(stdio_h)
- $(PSCC) $(FT_CFLAGS) $(FT_INC) $(PSO_)wrfont.$(OBJ) $(C_) $(PSSRC)wrfont.c
+ $(PSCC) $(FT_CFLAGS) $(FT_INC) $(PSO_)wrfont.$(OBJ) $(C_) $(GLSRCDIR)$(D)wrfont.c
# stub for FreeType bridge :
--- psi/zfapi.c
+++ psi/zfapi.c 2007-09-06 12:37:26.000000000 +0000
@@ -720,7 +720,9 @@ static int FAPI_get_xlatmap(i_ctx_t *i_
static int renderer_retcode(i_ctx_t *i_ctx_p, FAPI_server *I, FAPI_retcode rc)
{ if (rc == 0)
return 0;
+#if 0
eprintf2("Error: Font Renderer Plugin ( %s ) return code = %d\n", I->ig.d->subtype, rc);
+#endif
return rc < 0 ? rc : e_invalidfont;
}
