#ifdef HAVE_FONTCONFIG
#include <fontconfig.h>
#endif
+
+#include "../../config.h"
+
//xpdf header files
-#include "config.h"
-#ifdef HAVE_POPPLER
-#include <goo/GooString.h>
-#include <goo/gfile.h>
+#include "popplercompat.h"
+ #ifdef HAVE_POPPLER
+ #include <goo/GooString.h>
+ #include <goo/gfile.h>
#else
-#include "gfile.h"
-#include "GString.h"
+ #include "xpdf/config.h"
+ #include "gfile.h"
+ #include "GString.h"
#endif
+
#include "Object.h"
#include "Stream.h"
#include "Array.h"
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")) {
this->config_linkdatafile = strdup(value);
} else if(!strcmp(key,"convertgradients")) {
this->config_convertgradients = atoi(value);
+ } else if(!strcmp(key,"textonly")) {
+ this->config_textonly = atoi(value);
} else if(!strcmp(key,"multiply")) {
this->config_multiply = atoi(value);
if(this->config_multiply<1)
*ny += user_movey + clipmovey;
}
-
-#if (xpdfMajorVersion*10000 + xpdfMinorVersion*100 + xpdfUpdateVersion) < 30207
-void GFXOutputDev::tilingPatternFill(GfxState *state, Object *str,
- int paintType, Dict *resDict,
- double *mat, double *bbox,
- int x0, int y0, int x1, int y1,
- double xStep, double yStep)
-#else
-void GFXOutputDev::tilingPatternFill(GfxState *state, Gfx *gfx, Object *str,
+POPPLER_TILING_PATERN_RETURN GFXOutputDev::tilingPatternFill(GfxState *state,
+ POPPLER_TILING_PATERN_GFX
+ Object *str,
int paintType, Dict *resDict,
double *mat, double *bbox,
int x0, int y0, int x1, int y1,
double xStep, double yStep)
-#endif
{
msg("<debug> tilingPatternFill");
infofeature("tiling pattern fills");
+#ifdef HAVE_POPPLER
+ // since we don't implement this method yet,
+ // reduce it to a series of other drawing operations.
+ return gFalse;
+#endif
}
GBool GFXOutputDev::functionShadedFill(GfxState *state, GfxFunctionShading *shading)
GBool GFXOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading)
{
+ if(config_textonly) {return gTrue;}
+
double x0,y0,r0,x1,y1,x2,y2,x9,y9,r1;
shading->getCoords(&x0,&y0,&r0,&x9,&y9,&r1);
x1=x0+r1;y1=y0;
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;
GBool GFXOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading)
{
+ if(config_textonly) {return gTrue;}
+
double x0,y0,x1,y1;
shading->getCoords(&x0,&y0,&x1,&y1);
this->transformXY(state, x0,y0,&x0,&y0);
(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 &&
msg("<debug> endType3Char");
}
-void GFXOutputDev::startPage(int pageNum, GfxState *state, double crop_x1, double crop_y1, double crop_x2, double crop_y2)
+void GFXOutputDev::startPage(int pageNum, GfxState *state)
{
this->currentpage = pageNum;
double x1,y1,x2,y2;
gfxcolor_t black = {255,0,0,0};
laststate = state;
gfxline_t clippath[5];
+ PDFRectangle *r = this->page->getCropBox();
/* state->transform(state->getX1(),state->getY1(),&x1,&y1);
state->transform(state->getX2(),state->getY2(),&x2,&y2);
y1 = crop_y1;
x2 = crop_x2;
y2 = crop_y2;*/
- state->transform(crop_x1,crop_y1,&x1,&y1); //x1 += user_movex; y1 += user_movey;
- state->transform(crop_x2,crop_y2,&x2,&y2); //x2 += user_movex; y2 += user_movey;
+ state->transform(r->x1,r->y1,&x1,&y1); //x1 += user_movex; y1 += user_movey;
+ state->transform(r->x2,r->y2,&x2,&y2); //x2 += user_movex; y2 += user_movey;
if(x2<x1) {double x3=x1;x1=x2;x2=x3;}
if(y2<y1) {double y3=y1;y1=y2;y2=y3;}
int width, int height, GBool invert,
GBool inlineImg)
{
+ if(config_textonly) {
+ OutputDev::drawImageMask(state,ref,str,width,height,invert,inlineImg);
+ return;
+ }
dbg("drawImageMask %dx%d, invert=%d inline=%d", width, height, invert, inlineImg);
msg("<verbose> drawImageMask %dx%d, invert=%d inline=%d", width, height, invert, inlineImg);
drawGeneralImage(state,ref,str,width,height,0,invert,inlineImg,1, 0, 0,0,0,0, 0);
int width, int height, GfxImageColorMap *colorMap,
int *maskColors, GBool inlineImg)
{
+ if(config_textonly) {
+ OutputDev::drawImage(state,ref,str,width,height,colorMap,maskColors,inlineImg);
+ return;
+ }
dbg("drawImage %dx%d, %s, %s, inline=%d", width, height,
colorMap?"colorMap":"no colorMap",
maskColors?"maskColors":"no maskColors",
Stream *maskStr, int maskWidth, int maskHeight,
GBool maskInvert)
{
+ if(config_textonly) {
+ OutputDev::drawMaskedImage(state,ref,str,width,height,colorMap,maskStr,maskWidth,maskHeight,maskInvert);
+ return;
+ }
dbg("drawMaskedImage %dx%d, %s, %dx%d mask", width, height,
colorMap?"colorMap":"no colorMap",
maskWidth, maskHeight);
int maskWidth, int maskHeight,
GfxImageColorMap *maskColorMap)
{
+ if(config_textonly) {
+ OutputDev::drawSoftMaskedImage(state,ref,str,width,height,colorMap,maskStr,maskWidth,maskHeight,maskColorMap);
+ return;
+ }
dbg("drawSoftMaskedImage %dx%d, %s, %dx%d mask", width, height,
colorMap?"colorMap":"no colorMap",
maskWidth, maskHeight);
if(colorMap)
msg("<verbose> colorMap pixcomps:%d bits:%d mode:%d", colorMap->getNumPixelComps(),
colorMap->getBits(),colorMap->getColorSpace()->getMode());
- drawGeneralImage(state,ref,str,width,height,colorMap,0,0,0,0, maskStr, maskWidth, maskHeight, 0, maskColorMap);
}
+
void GFXOutputDev::stroke(GfxState *state)
{
+ if(config_textonly) {return;}
+
dbg("stroke");
GfxPath * path = state->getPath();
void GFXOutputDev::fill(GfxState *state)
{
+ if(config_textonly) {return;}
+
gfxcolor_t col = getFillColor(state);
dbg("fill %02x%02x%02x%02x",col.r,col.g,col.b,col.a);
void GFXOutputDev::eoFill(GfxState *state)
{
+ if(config_textonly) {return;}
+
gfxcolor_t col = getFillColor(state);
dbg("eofill %02x%02x%02x%02x",col.r,col.g,col.b,col.a);
void addGlobalLanguageDir(const char*dir)
{
+#ifdef HAVE_POPPLER
+ msg("<notice> NOT adding %s to language pack directories (not implemented with poppler)", dir);
+#else
msg("<notice> Adding %s to language pack directories", dir);
FILE*fi = 0;
}
globalParams->parseFile(new GString(config_file), fi);
fclose(fi);
+#endif
}
void addGlobalFontDir(const char*dirname)
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");
- //writePNG("below.png", (unsigned char*)belowimg->data, belowimg->width, belowimg->height);
+ //png_write("below.png", (unsigned char*)belowimg->data, belowimg->width, belowimg->height);
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");
matrix.m00 = 1.0; matrix.m10 = 0.0; matrix.tx = 0.0;
matrix.m01 = 0.0; matrix.m11 = 1.0; matrix.ty = 0.0;
- this->device->fillbitmap(this->device, line, belowimg, &matrix, 0);
+ if(!config_textonly) {
+ this->device->fillbitmap(this->device, line, belowimg, &matrix, 0);
+ }
mask->destroy(mask);
below->destroy(below);
git.asbjorn.biz / swftools.git / blobdiff