for(t=0;t<font->num_glyphs;t++) {
gfxglyph_t*g = &font->glyphs[t];
if(GLYPH_IS_SPACE(g)) {
- if(g->unicode == 32) return t;
- if(first_space<0)
- first_space = t;
+ if(g->unicode == 32) {
+ /* now that we have found a space char, make sure it's unique */
+ int s;
+ for(s=0;s<font->num_glyphs;s++) {
+ if(s!=t && font->glyphs[s].unicode==32)
+ font->glyphs[s].unicode=0;
+ }
+ return t;
+ }
}
}
- if(font->num_glyphs>32 && GLYPH_IS_SPACE(&font->glyphs[32])) {
- return 32;
- }
- return first_space;
+ return -1;
}
static int addSpace(gfxfont_t*font)
{
+ /* first, make sure the new space char is the only char that'll use unicode 32 */
+ int t;
+ for(t=0;t<font->num_glyphs;t++) {
+ if(font->glyphs[t].unicode==32)
+ font->glyphs[t].unicode=0;
+ }
font->num_glyphs++;
font->glyphs = (gfxglyph_t*)realloc(font->glyphs, sizeof(gfxglyph_t)*font->num_glyphs);
gfxglyph_t*g = &font->glyphs[font->num_glyphs-1];
static gfxfont_t* createGfxFont(FontInfo*src)
{
- gfxfont_t*font = (gfxfont_t*)malloc(sizeof(gfxfont_t));
- memset(font, 0, sizeof(gfxfont_t));
+ gfxfont_t*font = (gfxfont_t*)rfx_calloc(sizeof(gfxfont_t));
font->glyphs = (gfxglyph_t*)malloc(sizeof(gfxglyph_t)*src->num_glyphs);
memset(font->glyphs, 0, sizeof(gfxglyph_t)*src->num_glyphs);
gfxglyph_t*glyph = &font->glyphs[font->num_glyphs];
src->glyphs[t]->glyphid = font->num_glyphs;
glyph->unicode = src->glyphs[t]->unicode;
- if(glyph->unicode >= font->max_unicode)
- font->max_unicode = glyph->unicode+1;
gfxdrawer_t drawer;
gfxdrawer_target_gfxline(&drawer);
int s;
}
}
- gfxfont_fix_unicode(font);
-
int kerning_size = 0;
for(t=0;t<src->num_glyphs;t++) {
dict_t* d = src->kerning[t];
this->space_char = addSpace(this->gfxfont);
msg("<debug> Appending space char to font %s, position %d, width %f", this->gfxfont->id, this->space_char, this->gfxfont->glyphs[this->space_char].advance);
}
+ gfxfont_fix_unicode(this->gfxfont);
}
return this->gfxfont;
}
GBool InfoOutputDev::interpretType3Chars() {return gTrue;}
GBool InfoOutputDev::useTilingPatternFill() {return gTrue;}
-void InfoOutputDev::startPage(int pageNum, GfxState *state, double crop_x1, double crop_y1, double crop_x2, double crop_y2)
+GBool InfoOutputDev::checkPageSlice(Page *page, double hDPI, double vDPI,
+ int rotate, GBool useMediaBox, GBool crop,
+ int sliceX, int sliceY, int sliceW, int sliceH,
+ GBool printing, Catalog *catalog,
+ GBool (*abortCheckCbk)(void *data),
+ void *abortCheckCbkData)
+{
+ this->page = page;
+ return gTrue;
+}
+
+void InfoOutputDev::startPage(int pageNum, GfxState *state)
{
+ PDFRectangle *r = this->page->getCropBox();
double x1,y1,x2,y2;
- state->transform(crop_x1,crop_y1,&x1,&y1);
- state->transform(crop_x2,crop_y2,&x2,&y2);
+ state->transform(r->x1,r->y1,&x1,&y1);
+ state->transform(r->x2,r->y2,&x2,&y2);
if(x2<x1) {double x3=x1;x1=x2;x2=x3;}
if(y2<y1) {double y3=y1;y1=y2;y2=y3;}
this->x1 = (int)x1;
currentglyph->path->lineTo(x1,y2);
currentglyph->path->close();
}
+
+void InfoOutputDev::saveState(GfxState *state)
+{
+ updateAll(state);
+}
+
+void InfoOutputDev::restoreState(GfxState *state)
+{
+ updateAll(state);
+}
void InfoOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
int width, int height, GBool invert,