char*pfb;
int pfblen;
char*fullfilename;
+ DisplayFontParam *dfp;
} pdf2t1map[] ={
{"Times-Roman", "n021003l", n021003l_afm, n021003l_afm_len, n021003l_pfb, n021003l_pfb_len},
{"Times-Italic", "n021023l", n021023l_afm, n021023l_afm_len, n021023l_pfb, n021023l_pfb_len},
}
#endif
+static inline char islowercase(char c)
+{
+ return (c>='a' && c<='z');
+}
+
char* fontconfig_searchForFont(char*name)
{
#ifdef HAVE_FONTCONFIG
}
char*family = strdup(name);
- char*style = 0;
- char*dash = strchr(family, '-');
- if(!dash) dash = strchr(family, ',');
+ int len = strlen(family);
+ char*styles[] = {"Medium", "Regular", "Bold", "Italic", "Black", "Narrow"};
+ char*style = 0;
+ int t;
+ for(t=0;t<sizeof(styles)/sizeof(styles[0]);t++) {
+ int l = strlen(styles[t]);
+ if(len>l+1 && !strcmp(family+len-l, styles[t]) && islowercase(family[len-l-1])) {
+ style = styles[t];
+ family[len-l]=0;
+ break;
+ }
+ }
+ if(!style) {
+ char*dash = strchr(family, '-');
+ if(!dash) dash = strchr(family, ',');
+ if(dash) {
+ *dash = 0;
+ style = dash+1;
+ }
+ }
FcPattern*pattern = 0;
- if(dash) {
- *dash = 0;
- style = dash+1;
+ if(style) {
msg("<debug> FontConfig: Looking for font %s (family=%s style=%s)", name, family, style);
pattern = FcPatternBuild(NULL, FC_OUTLINE, FcTypeBool, FcTrue, FC_SCALABLE, FcTypeBool, FcTrue, FC_FAMILY, FcTypeString, family, FC_STYLE, FcTypeString, style, NULL);
} else {
msg("<debug> FontConfig: Looking for font %s (family=%s)", name, family);
pattern = FcPatternBuild(NULL, FC_OUTLINE, FcTypeBool, FcTrue, FC_SCALABLE, FcTypeBool, FcTrue, FC_FAMILY, FcTypeString, family, NULL);
}
+ pattern = FcPatternBuild(NULL, FC_OUTLINE, FcTypeBool, FcTrue, FC_SCALABLE, FcTypeBool, FcTrue, FC_FAMILY, FcTypeString, family, NULL);
FcResult result;
FcConfigSubstitute(0, pattern, FcMatchPattern);
} else {
msg("<verbose> Storing standard PDF font %s at %s", name, pdf2t1map[t].fullfilename);
}
+ DisplayFontParam *dfp = new DisplayFontParam(new GString(fontName), displayFontT1);
+ dfp->t1.fileName = new GString(pdf2t1map[t].fullfilename);
+ pdf2t1map[t].dfp = dfp;
}
- DisplayFontParam *dfp = new DisplayFontParam(new GString(fontName), displayFontT1);
- dfp->t1.fileName = new GString(pdf2t1map[t].fullfilename);
- return dfp;
+ return pdf2t1map[t].dfp;
}
}
this->config_drawonlyshapes = 0;
this->config_disable_polygon_conversion = 0;
this->config_multiply = 1;
+ this->config_detectspaces = 1;
this->config_linkdatafile = 0;
this->page2page = 0;
this->num_pages = 0;
this->config_transparent = atoi(value);
} else if(!strcmp(key,"drawonlyshapes")) {
this->config_drawonlyshapes = atoi(value);
+ } else if(!strcmp(key,"detectspaces")) {
+ this->config_detectspaces = atoi(value);
} else if(!strcmp(key,"extrafontdata")) {
this->config_extrafontdata = atoi(value);
} else if(!strcmp(key,"linkdatafile")) {
colToByte(color2.c[0]), colToByte(color2.c[1]), colToByte(color2.c[2]));
infofeature("radial shaded fills");
- gfxgradient_t*g = (gfxgradient_t*)malloc(sizeof(gfxgradient_t)*3);
+ gfxgradient_t gr[3];
+ gfxgradient_t*g = &gr[0];
g[0].next = &g[1];
g[1].next = &g[2];
g[2].next = 0;
(render == RENDER_INVISIBLE)) {
int space = this->current_fontinfo->space_char;
- if(config_extrafontdata && space>=0 && m.m00 && !m.m01) {
+ if(config_extrafontdata && config_detectspaces && space>=0 && m.m00 && !m.m01) {
/* space char detection */
if(last_char_gfxfont == current_gfxfont &&
last_char_y == m.ty &&
gfxdevice_t ops;
dbg("this->device=%p, this->device->name=%s\n", this->device, this->device->name);
gfxdevice_ops_init(&ops, this->device, alpha);
- gfxresult_record_replay(grouprecording, &ops);
+ gfxresult_record_replay(grouprecording, &ops, 0);
ops.finish(&ops);
}
grouprecording->destroy(grouprecording);
/* get outline of all objects below the soft mask */
gfxdevice_t uniondev;
gfxdevice_union_init(&uniondev, 0);
- gfxresult_record_replay(below, &uniondev);
+ gfxresult_record_replay(below, &uniondev, 0);
gfxline_t*belowoutline = gfxdevice_union_getunion(&uniondev);
uniondev.finish(&uniondev);
gfxbbox_t bbox = gfxline_getbbox(belowoutline);
gfxline_free(belowoutline);belowoutline=0;
#if 0
this->device->startclip(this->device, belowoutline);
- gfxresult_record_replay(below, this->device);
- gfxresult_record_replay(mask, this->device);
+ gfxresult_record_replay(below, this->device, 0);
+ gfxresult_record_replay(mask, this->device, 0);
this->device->endclip(this->device);
#endif
}
belowrender.setparameter(&belowrender, "antialize", "2");
belowrender.startpage(&belowrender, width, height);
- gfxresult_record_replay(below, &belowrender);
+ gfxresult_record_replay(below, &belowrender, 0);
belowrender.endpage(&belowrender);
gfxresult_t* belowresult = belowrender.finish(&belowrender);
gfximage_t* belowimg = (gfximage_t*)belowresult->get(belowresult,"page0");
gfxdevice_t maskrender;
gfxdevice_render_init(&maskrender);
maskrender.startpage(&maskrender, width, height);
- gfxresult_record_replay(mask, &maskrender);
+ gfxresult_record_replay(mask, &maskrender, 0);
maskrender.endpage(&maskrender);
gfxresult_t* maskresult = maskrender.finish(&maskrender);
gfximage_t* maskimg = (gfximage_t*)maskresult->get(maskresult,"page0");