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
int t;
int p;
for(p=0;p<2;p++) {
- for(t=0;t<set->nfont;t++) {
- char*fcfamily=0,*fcstyle=0,*filename=0;
- FcBool scalable=FcFalse, outline=FcFalse;
- FcPatternGetString(set->fonts[t], "family", 0, (FcChar8**)&fcfamily);
- FcPatternGetString(set->fonts[t], "style", 0, (FcChar8**)&fcstyle);
- FcPatternGetString(set->fonts[t], "file", 0, (FcChar8**)&filename);
- FcPatternGetBool(set->fonts[t], "outline", 0, &outline);
- FcPatternGetBool(set->fonts[t], "scalable", 0, &scalable);
- if(scalable && outline) {
- msg("<trace> %s (%s) -> %s", fcfamily, fcstyle, filename);
+ if(set) {
+ for(t=0;t<set->nfont;t++) {
+ char*fcfamily=0,*fcstyle=0,*filename=0;
+ FcBool scalable=FcFalse, outline=FcFalse;
+ FcPatternGetString(set->fonts[t], "family", 0, (FcChar8**)&fcfamily);
+ FcPatternGetString(set->fonts[t], "style", 0, (FcChar8**)&fcstyle);
+ FcPatternGetString(set->fonts[t], "file", 0, (FcChar8**)&filename);
+ FcPatternGetBool(set->fonts[t], "outline", 0, &outline);
+ FcPatternGetBool(set->fonts[t], "scalable", 0, &scalable);
+ if(scalable && outline) {
+ msg("<trace> %s (%s) -> %s", fcfamily, fcstyle, filename);
+ }
}
}
set = FcConfigGetFonts(config, FcSetApplication);
}
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;
this->transformXY(state, x-originX, y-originY, &m.tx, &m.ty);
//m.tx += originX; m.ty += originY;
- msg("<debug> drawChar(%f,%f,c='%c' (%d), u=%d <%d>) CID=%d render=%d glyphid=%d font=%08x",m.tx,m.ty,(charid&127)>=32?charid:'?', charid, u, uLen, font->isCIDFont(), render, glyphid, current_gfxfont);
+ msg("<debug> drawChar(%f,%f,c='%c' (%d), u=%d <%d>) CID=%d render=%d glyphid=%d font=%p",m.tx,m.ty,(charid&127)>=32?charid:'?', charid, u, uLen, font->isCIDFont(), render, glyphid, current_gfxfont);
if((render == RENDER_FILL && !config_drawonlyshapes) ||
(render == RENDER_FILLSTROKE && state->getTransformedLineWidth()<1.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 &&
void GFXOutputDev::endString(GfxState *state)
{
int render = state->getRender();
- msg("<trace> endString() render=%d textstroke=%08x", render, current_text_stroke);
+ msg("<trace> endString() render=%d textstroke=%p", render, current_text_stroke);
if(current_text_stroke) {
/* fillstroke and stroke text rendering objects we can process right
void GFXOutputDev::endTextObject(GfxState *state)
{
int render = state->getRender();
- msg("<trace> endTextObject() render=%d textstroke=%08x clipstroke=%08x", render, current_text_stroke, current_text_clip);
+ msg("<trace> endTextObject() render=%d textstroke=%p clipstroke=%p", render, current_text_stroke, current_text_clip);
if(current_text_clip) {
device->setparameter(device, "mark","TXT");
}
void GFXOutputDev::saveState(GfxState *state) {
- dbg("saveState %08x", state); dbgindent+=2;
+ dbg("saveState %p", state); dbgindent+=2;
- msg("<trace> saveState %08x", state);
+ msg("<trace> saveState %p", state);
updateAll(state);
if(statepos>=64) {
msg("<fatal> Too many nested states in pdf.");
};
void GFXOutputDev::restoreState(GfxState *state) {
- dbgindent-=2; dbg("restoreState %08x", state);
+ dbgindent-=2; dbg("restoreState %p", state);
if(statepos==0) {
msg("<fatal> Invalid restoreState");
exit(1);
}
- msg("<trace> restoreState %08x%s%s", state,
+ msg("<trace> restoreState %p%s%s", state,
states[statepos].softmask?" (end softmask)":"",
states[statepos].clipping?" (end clipping)":"");
if(states[statepos].softmask) {
if(verbose) {
int t;
for(t=0;t<=statepos;t++) {
- printf("%08x ", (unsigned int)states[t].state);
+ printf("%p ", states[t].state);
}
printf("\n");
}
} else {
msg("<verbose> resampling %dx%d to mask size (%dx%d)", width, height, maskWidth, maskHeight);
gfxcolor_t*newpic=new gfxcolor_t[maskWidth*maskHeight];
- double dx = width / maskWidth;
- double dy = height / maskHeight;
+ double dx = width / (double)maskWidth;
+ double dy = height / (double)maskHeight;
double yy = 0;
for(y = 0; y < maskHeight; y++) {
double xx = 0;
if(blendingColorSpace) {
colormodename = GfxColorSpace::getColorSpaceModeName(blendingColorSpace->getMode());
}
- dbg("beginTransparencyGroup device=%08x %.1f/%.1f/%.1f/%.1f %s isolated=%d knockout=%d forsoftmask=%d", device, bbox[0],bbox[1],bbox[2],bbox[3], colormodename, isolated, knockout, forSoftMask);
+ dbg("beginTransparencyGroup device=%p %.1f/%.1f/%.1f/%.1f %s isolated=%d knockout=%d forsoftmask=%d", device, bbox[0],bbox[1],bbox[2],bbox[3], colormodename, isolated, knockout, forSoftMask);
msg("<verbose> beginTransparencyGroup %.1f/%.1f/%.1f/%.1f %s isolated=%d knockout=%d forsoftmask=%d", bbox[0],bbox[1],bbox[2],bbox[3], colormodename, isolated, knockout, forSoftMask);
//states[statepos].createsoftmask |= forSoftMask;
states[statepos].olddevice = this->device;
this->device = (gfxdevice_t*)rfx_calloc(sizeof(gfxdevice_t));
- dbg("this->device now %08x (old: %08x)", this->device, states[statepos].olddevice);
+ dbg("this->device now %p (old: %p)", this->device, states[statepos].olddevice);
- gfxdevice_record_init(this->device);
+ gfxdevice_record_init(this->device, 0);
/*if(!forSoftMask) { ////???
state->setFillOpacity(0.0);
dbgindent-=2;
gfxdevice_t*r = this->device;
- dbg("endTransparencyGroup this->device now back to %08x (destroying %08x)", states[statepos].olddevice, this->device);
+ dbg("endTransparencyGroup this->device now back to %p (destroying %p)", states[statepos].olddevice, this->device);
this->device = states[statepos].olddevice;
if(!this->device) {
gfxresult_t*recording = r->finish(r);
- dbg(" forsoftmask=%d recording=%08x/%08x", states[statepos].createsoftmask, r, recording);
- msg("<verbose> endTransparencyGroup forsoftmask=%d recording=%08x/%08x", states[statepos].createsoftmask, r, recording);
+ dbg(" forsoftmask=%d recording=%p/%p", states[statepos].createsoftmask, r, recording);
+ msg("<verbose> endTransparencyGroup forsoftmask=%d recording=%p/%p", states[statepos].createsoftmask, r, recording);
if(states[statepos].createsoftmask) {
states[statepos-1].softmaskrecording = recording;
"colordodge","colorburn","hardlight","softlight","difference",
"exclusion","hue","saturation","color","luminosity"};
- dbg("paintTransparencyGroup blend=%s softmaskon=%d recording=%08x", blendmodes[state->getBlendMode()], states[statepos].softmask, states[statepos].grouprecording);
+ dbg("paintTransparencyGroup blend=%s softmaskon=%d recording=%p", blendmodes[state->getBlendMode()], states[statepos].softmask, states[statepos].grouprecording);
msg("<verbose> paintTransparencyGroup blend=%s softmaskon=%d", blendmodes[state->getBlendMode()], states[statepos].softmask);
if(state->getBlendMode() == gfxBlendNormal)
if(blendmode == gfxBlendMultiply && alpha>200)
alpha = 128;
gfxdevice_t ops;
- dbg("this->device=%08x, this->device->name=%s\n", this->device, this->device->name);
+ 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);
}
states[statepos].olddevice = this->device;
this->device = (gfxdevice_t*)rfx_calloc(sizeof(gfxdevice_t));
- gfxdevice_record_init(this->device);
+ gfxdevice_record_init(this->device, 0);
- dbg("softmaskrecording is %08x (dev=%08x) at statepos %d\n", states[statepos].softmaskrecording, this->device, statepos);
+ dbg("softmaskrecording is %p (dev=%p) at statepos %d\n", states[statepos].softmaskrecording, this->device, statepos);
states[statepos].softmask = 1;
states[statepos].softmask_alpha = alpha;
/* 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");