DenysMedvid/pdf2htmlEX
1
0
Fork 0
mirror of https://github.com/pdf2htmlEX/pdf2htmlEX.git synced 2024-07-05 17:48:38 +00:00
Code

fix cid flatten

Browse Source
This commit is contained in:
Lu Wang 2012-09-03 23:19:06 +08:00
parent 491162e1b5
commit 35809470af
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/ff/ff.c
View File

@ -17,7 +17,7 @@
#include "ff.h" #include "ff.h"
SplineFont * cur_font = NULL; FontViewBase * cur_fv = NULL;
static void err(const char * format, ...) static void err(const char * format, ...)
{ {
@ -63,14 +63,16 @@ void ff_init(void)
void ff_load_font(const char * filename) void ff_load_font(const char * filename)
{ {
char * _filename = strcopy(filename); char * _filename = strcopy(filename);
cur_font = LoadSplineFont(_filename, 1); SplineFont * font = LoadSplineFont(_filename, 1);
free(_filename); free(_filename);
if(!cur_font) if(!font)
err("Cannot load font %s\n", filename); err("Cannot load font %s\n", filename);
if(!cur_font->fv) if(!font->fv)
FVAppend(_FontViewCreate(cur_font)); FVAppend(_FontViewCreate(font));
cur_fv = font->fv;
} }
/* /*
@ -88,15 +90,15 @@ static void ff_do_reencode(Encoding * encoding, int force)
{ {
if(force) if(force)
{ {
SFForceEncoding(cur_font, cur_font->fv->map, encoding); SFForceEncoding(cur_fv->sf, cur_fv->map, encoding);
} }
else else
{ {
EncMapFree(cur_font->fv->map); EncMapFree(cur_fv->map);
cur_font->fv->map= EncMapFromEncoding(cur_font, encoding); cur_fv->map= EncMapFromEncoding(cur_fv->sf, encoding);
} }
SFReplaceEncodingBDFProps(cur_font, cur_font->fv->map); SFReplaceEncodingBDFProps(cur_fv->sf, cur_fv->map);
} }
@ -147,11 +149,9 @@ void ff_reencode_raw2(char ** mapping, int mapping_len, int force)
void ff_cidflatten(void) void ff_cidflatten(void)
{ {
printf("cid flatten\n"); if(!cur_fv->sf->cidmaster)
if(!cur_font->cidmaster)
err("Cannot flatten a non-CID font"); err("Cannot flatten a non-CID font");
SFFlatten(cur_font->cidmaster); SFFlatten(cur_fv->sf->cidmaster);
} }
void ff_save(const char * filename) void ff_save(const char * filename)
@ -159,8 +159,8 @@ void ff_save(const char * filename)
char * _filename = strcopy(filename); char * _filename = strcopy(filename);
char * _ = strcopy(""); char * _ = strcopy("");
int r = GenerateScript(cur_font, _filename int r = GenerateScript(cur_fv->sf, _filename
, _, -1, -1, NULL, NULL, cur_font->fv->map, NULL, ly_fore); , _, -1, -1, NULL, NULL, cur_fv->map, NULL, ly_fore);
free(_); free(_);
free(_filename); free(_filename);
@ -171,40 +171,40 @@ void ff_save(const char * filename)
void ff_close(void) void ff_close(void)
{ {
FontViewClose(cur_font->fv); FontViewClose(cur_fv);
cur_font = NULL; cur_fv = NULL;
} }
int ff_get_em_size(void) int ff_get_em_size(void)
{ {
return (cur_font->pfminfo.os2_typoascent - cur_font->pfminfo.os2_typodescent); return (cur_fv->sf->pfminfo.os2_typoascent - cur_fv->sf->pfminfo.os2_typodescent);
} }
int ff_get_max_ascent(void) int ff_get_max_ascent(void)
{ {
return max(cur_font->pfminfo.os2_winascent, return max(cur_fv->sf->pfminfo.os2_winascent,
max(cur_font->pfminfo.os2_typoascent, max(cur_fv->sf->pfminfo.os2_typoascent,
cur_font->pfminfo.hhead_ascent)); cur_fv->sf->pfminfo.hhead_ascent));
} }
int ff_get_max_descent(void) int ff_get_max_descent(void)
{ {
return max(cur_font->pfminfo.os2_windescent, return max(cur_fv->sf->pfminfo.os2_windescent,
max(-cur_font->pfminfo.os2_typodescent, max(-cur_fv->sf->pfminfo.os2_typodescent,
-cur_font->pfminfo.hhead_descent)); -cur_fv->sf->pfminfo.hhead_descent));
} }
void ff_set_ascent(int a) void ff_set_ascent(int a)
{ {
cur_font->pfminfo.os2_winascent = a; cur_fv->sf->pfminfo.os2_winascent = a;
cur_font->pfminfo.os2_typoascent = a; cur_fv->sf->pfminfo.os2_typoascent = a;
cur_font->pfminfo.hhead_ascent = a; cur_fv->sf->pfminfo.hhead_ascent = a;
} }
void ff_set_descent(int d) void ff_set_descent(int d)
{ {
cur_font->pfminfo.os2_windescent = d; cur_fv->sf->pfminfo.os2_windescent = d;
cur_font->pfminfo.os2_typodescent = -d; cur_fv->sf->pfminfo.os2_typodescent = -d;
cur_font->pfminfo.hhead_descent = -d; cur_fv->sf->pfminfo.hhead_descent = -d;
} }