#endif
}
#ifdef HAVE_FONTCONFIG
+static char stralphacmp(const char*s1, const char*s2)
+{
+ while(*s1 && *s2) {
+ /* skip over space, minus, comma etc. */
+ while(*s1>=32 && *s1<=63) s1++;
+ while(*s2>=32 && *s2<=63) s2++;
+ if(*s1!=*s2)
+ break;
+ s1++;s2++;
+ }
+ return *s1 - *s2;
+}
+
static char fc_ismatch(FcPattern*match, char*family, char*style)
{
char*fcfamily=0,*fcstyle=0,*fcfullname=0,*filename=0;
if(scalable!=FcTrue || outline!=FcTrue)
return 0;
- if (!strcasecmp(fcfamily, family)) {
+ if (!stralphacmp(fcfamily, family)) {
msg("<debug> Font %s-%s (%s) is a match for %s%s%s", fcfamily, fcstyle, filename, family, style?"-":"", style?style:"");
return 1;
} else {
fontfile_t*fd = global_fonts;
while(fd) {
FcConfigAppFontAddFile(config, (FcChar8*)fd->filename);
+ msg("<debug> Adding font %s to fontconfig", fd->filename);
fd = fd->next;
}
if(getLogLevel() >= LOGLEVEL_TRACE) {
int t;
- 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);
+ 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);
+ }
}
+ set = FcConfigGetFonts(config, FcSetApplication);
}
}
}
char*family = strdup(name);
char*style = 0;
char*dash = strchr(family, '-');
+ if(!dash) dash = strchr(family, ',');
+
FcPattern*pattern = 0;
if(dash) {
*dash = 0;
DisplayFontParam *GFXGlobalParams::getDisplayFont(GString *fontName)
{
- msg("<verbose> looking for font %s in global params", fontName->getCString());
+ msg("<verbose> looking for font %s", fontName->getCString());
char*name = fontName->getCString();
}
free(filename);
return dfp;
+ } else {
+ msg("<verbose> Font %s not found\n", name);
+ return GlobalParams::getDisplayFont(fontName);
}
- return GlobalParams::getDisplayFont(fontName);
}
GFXOutputDev::GFXOutputDev(InfoOutputDev*info, PDFDoc*doc)
this->user_clipy1 = 0;
this->user_clipx2 = 0;
this->user_clipy2 = 0;
+ this->current_gfxfont = 0;
this->current_fontinfo = 0;
this->current_text_stroke = 0;
this->current_text_clip = 0;
this->config_drawonlyshapes = 0;
this->config_disable_polygon_conversion = 0;
this->config_multiply = 1;
+ this->config_linkdatafile = 0;
this->page2page = 0;
this->num_pages = 0;
this->config_drawonlyshapes = atoi(value);
} else if(!strcmp(key,"extrafontdata")) {
this->config_extrafontdata = atoi(value);
+ } else if(!strcmp(key,"linkdatafile")) {
+ this->config_linkdatafile = strdup(value);
} else if(!strcmp(key,"convertgradients")) {
this->config_convertgradients = atoi(value);
} else if(!strcmp(key,"multiply")) {
gfxcolor_t col = getFillColor(state);
if(getLogLevel() >= LOGLEVEL_TRACE) {
- msg("<trace> %sfill %02x%02x%02x%02x%s", evenodd?"eo":"", col.r, col.g, col.b, col.a);
+ msg("<trace> %sfill %02x%02x%02x%02x", evenodd?"eo":"", col.r, col.g, col.b, col.a);
dump_outline(line);
}
device->fill(device, line, &col);
gfxmatrix_t m = this->current_font_matrix;
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);
- if((render == RENDER_FILL && !config_drawonlyshapes) || render == RENDER_INVISIBLE) {
+ 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);
+
+ 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) {
/* space char detection */
msg("<notice> Some texts will be rendered as shape");
gfxglobals->textmodeinfo = 1;
}
+
gfxline_t*glyph = current_gfxfont->glyphs[glyphid].line;
gfxline_t*tglyph = gfxline_clone(glyph);
gfxline_transform(tglyph, &m);
gfxmatrix_t m = this->current_font_matrix;
this->transformXY(state, 0, 0, &m.tx, &m.ty);
- m.m00*=INTERNAL_FONT_SIZE;
+
+ /*m.m00*=INTERNAL_FONT_SIZE;
m.m01*=INTERNAL_FONT_SIZE;
m.m10*=INTERNAL_FONT_SIZE;
- m.m11*=INTERNAL_FONT_SIZE;
+ m.m11*=INTERNAL_FONT_SIZE;*/
if(!current_fontinfo || (unsigned)charid >= current_fontinfo->num_glyphs || !current_fontinfo->glyphs[charid]) {
msg("<error> Invalid charid %d for font", charid);
else if(s)
{
device->drawlink(device, points, s);
+ if(this->config_linkdatafile) {
+ FILE*fi = fopen(config_linkdatafile, "ab+");
+ fprintf(fi, "%s\n", s);
+ fclose(fi);
+ }
}
-
+
msg("<verbose> \"%s\" link to \"%s\" (%d)", type, FIXNULL(s), page);
free(s);s=0;
}
}
if(states[statepos].state!=state) {
msg("<fatal> bad state nesting");
+ if(verbose) {
+ int t;
+ for(t=0;t<=statepos;t++) {
+ printf("%08x ", states[t].state);
+ }
+ printf("\n");
+ }
exit(1);
}
states[statepos].state=0;
current_gfxfont = this->current_fontinfo->getGfxFont();
device->addfont(device, current_gfxfont);
free(id);
+
+ device->addfont(device, current_gfxfont);
updateFontMatrix(state);
}
this->device = states[statepos].olddevice;
if(!this->device) {
- msg("<fatal> Bad state nesting in transparency group");
- msg("<fatal> Notice: this is a known problem, which will be fixed in 0.9.1");
- msg("<fatal> In the meantime, please convert the file with -s poly2bitmap");
- restoreState(state);
- this->device = states[statepos].olddevice;
+ msg("<error> Invalid state nesting");
}
states[statepos].olddevice = 0;
git.asbjorn.biz / swftools.git / blobdiff