#include "../devices/ops.h"
#include "../devices/arts.h"
#include "../devices/render.h"
+
+#include "../art/libart.h"
+#include "../devices/artsutils.c"
+
#include "../png.h"
#include "fonts.h"
typedef struct _fontfile
{
- char*filename;
+ const char*filename;
int used;
} fontfile_t;
static char* lastfontdir = 0;
struct fontentry {
- char*pdffont;
- char*filename;
+ const char*pdffont;
+ const char*filename;
char*afm;
int afmlen;
char*pfb;
static int verbose = 0;
static int dbgindent = 0;
-static void dbg(char*format, ...)
+static void dbg(const char*format, ...)
{
char buf[1024];
int l;
} feature_t;
feature_t*featurewarnings = 0;
-void GFXOutputDev::showfeature(char*feature,char fully, char warn)
+void GFXOutputDev::showfeature(const char*feature,char fully, char warn)
{
feature_t*f = featurewarnings;
while(f) {
msg("<notice> File contains %s",feature);
}
}
-void GFXOutputDev::warnfeature(char*feature,char fully)
+void GFXOutputDev::warnfeature(const char*feature,char fully)
{
showfeature(feature,fully,1);
}
-void GFXOutputDev::infofeature(char*feature)
+void GFXOutputDev::infofeature(const char*feature)
{
showfeature(feature,0,0);
}
return mybuf;
}
-static void dumpFontInfo(char*loglevel, GfxFont*font);
+static void dumpFontInfo(const char*loglevel, GfxFont*font);
static int lastdumps[1024];
static int lastdumppos = 0;
/* nr = 0 unknown
else if(nr == 1)
msg("<warning> The following font caused problems (substituting):");
else if(nr == 2)
- msg("<warning> The following Type 3 Font will be rendered as bitmap:");
+ msg("<warning> The following Type 3 Font will be rendered as graphics:");
dumpFontInfo("<warning>", font);
}
-static void dumpFontInfo(char*loglevel, GfxFont*font)
+static void dumpFontInfo(const char*loglevel, GfxFont*font)
{
char* id = getFontID(font);
char* name = getFontName(font);
return gFalse;
}
-void GFXOutputDev::strokeGfxline(GfxState *state, gfxline_t*line)
+#define STROKE_FILL 1
+#define STROKE_CLIP 2
+void GFXOutputDev::strokeGfxline(GfxState *state, gfxline_t*line, int flags)
{
int lineCap = state->getLineCap(); // 0=butt, 1=round 2=square
int lineJoin = state->getLineJoin(); // 0=miter, 1=round 2=bevel
);
dump_outline(line);
}
-
- //swfoutput_drawgfxline(output, line, width, &col, capType, joinType, miterLimit);
- device->stroke(device, line, width, &col, capType, joinType, miterLimit);
+
+ if(flags&STROKE_FILL) {
+ ArtSVP* svp = gfxstrokeToSVP(line, width, capType, joinType, miterLimit);
+ gfxline_t*gfxline = SVPtogfxline(svp);
+ if(flags&STROKE_CLIP) {
+ device->startclip(device, gfxline);
+ states[statepos].clipping++;
+ } else {
+ device->fill(device, gfxline, &col);
+ }
+ free(gfxline);
+ art_svp_free(svp);
+ } else {
+ if(flags&STROKE_CLIP)
+ msg("<error> Stroke&clip not supported at the same time");
+ device->stroke(device, line, width, &col, capType, joinType, miterLimit);
+ }
if(line2)
gfxline_free(line2);
states[statepos].clipping++;
gfxline_free(line);
}
+void GFXOutputDev::clipToStrokePath(GfxState *state)
+{
+ GfxPath * path = state->getPath();
+ gfxline_t*line= gfxPath_to_gfxline(state, path, 0, user_movex + clipmovex, user_movey + clipmovey);
+ strokeGfxline(state, line, STROKE_FILL|STROKE_CLIP);
+ gfxline_free(line);
+}
void GFXOutputDev::endframe()
{
return gTrue;
}
-char*renderModeDesc[]= {"fill", "stroke", "fill+stroke", "invisible",
+const char*renderModeDesc[]= {"fill", "stroke", "fill+stroke", "invisible",
"clip+fill", "stroke+clip", "fill+stroke+clip", "clip"};
#define RENDER_FILL 0
int getGfxCharID(gfxfont_t*font, int charnr, char *charname, int u)
{
- char*uniname = 0;
+ const char*uniname = 0;
if(!font)
return charnr;
if(u>0) {
msg("<debug> Char [%d,%s,>%d<] maps to %d\n", charnr, charname, u, font->unicode2glyph[u]);
return font->unicode2glyph[u];
}
+ /* try to use the unicode|0xe000 (needed for some WingDings fonts)
+ FIXME: do this only if we know the font is wingdings?
+ */
+ u |= 0xe000;
+ if(u>=0 && u<font->max_unicode && font->unicode2glyph[u]>=0) {
+ msg("<debug> Char [%d,%s,>%d<] maps to %d\n", charnr, charname, u, font->unicode2glyph[u]);
+ return font->unicode2glyph[u];
+ }
if(charnr>=0 && charnr<font->num_glyphs) {
msg("<debug> Char [>%d<,%s,%d] maps to %d\n", charnr, charname, u, charnr);
if(uLen)
u = _u[0];
+/* char*fontname = getFontName(font);
+ if(u<256 && strstr(fontname, "ingdings")) {
+ // symbols are at 0xe000 in the unicode table
+ u |= 0xe000;
+ }
+ free(fontname);*/
+
if(font->isCIDFont()) {
GfxCIDFont*cfont = (GfxCIDFont*)font;
m.tx += user_movex + clipmovex;
m.ty += user_movey + clipmovey;
+ if((!name || strcmp(name, "space")) && charid!=32 && u!=32)
+ {
+ gfxline_t*l = current_gfxfont->glyphs[charid].line;
+ double x,y;
+ char ok = 0;
+ while(l) {
+ if((l->type == gfx_lineTo || l->type == gfx_splineTo) && l->x!=x && l->y!=y) {
+ ok = 1;
+ }
+ l = l->next;
+ }
+ if(!ok) {
+ msg("<warning> Drawing empty character charid=%d", charid);
+ }
+ }
+
if(render == RENDER_FILL) {
device->drawchar(device, current_gfxfont, charid, &col, &m);
} else {
current_text_stroke = 0;
} else if((render&3) == RENDER_FILLSTROKE) {
fillGfxLine(state, current_text_stroke);
- strokeGfxline(state, current_text_stroke);
+ strokeGfxline(state, current_text_stroke,0);
gfxline_free(current_text_stroke);
current_text_stroke = 0;
} else if((render&3) == RENDER_STROKE) {
- strokeGfxline(state, current_text_stroke);
+ strokeGfxline(state, current_text_stroke,0);
gfxline_free(current_text_stroke);
current_text_stroke = 0;
}
LinkAction*action=link->getAction();
char buf[128];
char*s = 0;
- char*type = "-?-";
+ const char*type = "-?-";
char*named = 0;
int page = -1;
msg("<trace> drawlink action=%d\n", action->getKind());
return strdup(namebuf2);
}
-char* GFXOutputDev::searchFont(char*name)
+char* GFXOutputDev::searchFont(const char*name)
{
int i;
char*filename=0;
char* GFXOutputDev::substituteFont(GfxFont*gfxFont, char* oldname)
{
- char*fontname = 0, *filename = 0;
+ const char*fontname = 0, *filename = 0;
msg("<notice> substituteFont(%s)", oldname);
if(!(fontname = searchForSuitableFont(gfxFont))) {
GfxPath * path = state->getPath();
gfxline_t*line= gfxPath_to_gfxline(state, path, 0, user_movex + clipmovex, user_movey + clipmovey);
- strokeGfxline(state, line);
+ strokeGfxline(state, line, 0);
gfxline_free(line);
}
}
-static char* dirseparator()
+static const char* dirseparator()
{
#ifdef WIN32
return "\\";
#endif
}
-void addGlobalFont(char*filename)
+void addGlobalFont(const char*filename)
{
fontfile_t f;
memset(&f, 0, sizeof(fontfile_t));
}
}
-void addGlobalLanguageDir(char*dir)
+void addGlobalLanguageDir(const char*dir)
{
if(!globalParams)
- globalParams = new GlobalParams("");
+ globalParams = new GlobalParams((char*)"");
msg("<notice> Adding %s to language pack directories", dir);
fclose(fi);
}
-void addGlobalFontDir(char*dirname)
+void addGlobalFontDir(const char*dirname)
{
#ifdef HAVE_DIRENT_H
msg("<notice> Adding %s to font directories", dirname);
GBool isolated, GBool knockout,
GBool forSoftMask)
{
- char*colormodename = "";
+ const char*colormodename = "";
BBox rect = mkBBox(state, bbox, this->width, this->height);
if(blendingColorSpace) {
void GFXOutputDev::paintTransparencyGroup(GfxState *state, double *bbox)
{
- char*blendmodes[] = {"normal","multiply","screen","overlay","darken", "lighten",
- "colordodge","colorburn","hardlight","softlight","difference",
- "exclusion","hue","saturation","color","luminosity"};
+ const char*blendmodes[] = {"normal","multiply","screen","overlay","darken", "lighten",
+ "colordodge","colorburn","hardlight","softlight","difference",
+ "exclusion","hue","saturation","color","luminosity"};
dbg("paintTransparencyGroup blend=%s softmaskon=%d", blendmodes[state->getBlendMode()], states[statepos].softmask);
msg("<verbose> paintTransparencyGroup blend=%s softmaskon=%d", blendmodes[state->getBlendMode()], states[statepos].softmask);