New master (#2)

* Show header in font map files

* fix a usage of unique_ptr with array

* Added '--quiet' argument to hide progress messages (resolves #503)

* Revert cout messages to cerr (see #622)

* bump version

* fix build; fix some coverity warnings

* Many bug fixes and improvements, including:

- Incorporated latest Cairo files from cairo-0.15.2
- Moved build to out-of-source
- Added clean script
- Rewritten correct_text_visibility option to improve accuracy
- Transparent characters drawn on background layer
- Improved bad unicode detection

* Many bug fixes and improvements, including:

- Incorporated latest Cairo files from cairo-0.15.2
- Moved build to out-of-source
- Added clean script
- Rewritten correct_text_visibility option to improve accuracy
- Transparent characters drawn on background layer
- Improved bad unicode detection

* Rationlise DPI to single number.
Implement actual_dpi - clamp maximum background image size in cases of huge PDF pages

* DPI fixes - increase DPI when partially covered text to covered-text-dpi
Add font-style italic for oblique fonts
Reduce char bbox for occlusion tests

* Don't shrink bbox - not required if zoom=25 used

* Ignore occlusion from stroke/fill with opacity < 0.5
Better compute char bbox for occlusion
Use 10% inset for char bbox for occlusion
Back out adding font-weight: bold to potentially bold fonts
Fix bug to ensure CID ascent/descent matches subfont values

* Removed zero char logging

* Remove forced italic - missing italic is due to fontforge bug which needs fixing

* Typos fixed, readme updated

* Typos

* Increase maximum background image width
Fix private use range to avoid stupid mobile safari switching to emoji font

* included -pthread switch to link included 3rdparty poppler files.

* Updated files from poppler 0.59.0 and adjusted includes.

* Support updated "Object" class from poppler 0.59.0

3rdparty/poppler/git/CairoFontEngine.cc

@@ -17,16 +17,16 @@
 // Copyright (C) 2005-2007 Jeff Muizelaar <jeff@infidigm.net>
 // Copyright (C) 2005, 2006 Kristian Høgsberg <krh@redhat.com>
 // Copyright (C) 2005 Martin Kretzschmar <martink@gnome.org>
-// Copyright (C) 2005, 2009, 2012, 2013 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2006, 2007, 2010, 2011 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright (C) 2007 Koji Otani <sho@bbr.jp>
 // Copyright (C) 2008, 2009 Chris Wilson <chris@chris-wilson.co.uk>
-// Copyright (C) 2008, 2012 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2008, 2012, 2014, 2016 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2009 Darren Kenny <darren.kenny@sun.com>
 // Copyright (C) 2010 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
 // Copyright (C) 2010 Jan Kümmel <jan+freedesktop@snorc.org>
 // Copyright (C) 2012 Hib Eris <hib@hiberis.nl>
 // Copyright (C) 2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2015, 2016 Jason Crain <jason@aquaticape.us>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -58,16 +58,11 @@
 #pragma implementation
 #endif
 
-/*
- * pdf2htmlEX: disabled multi thread 
 #if MULTITHREADED
 #  define fontEngineLocker()   MutexLocker locker(&mutex)
 #else
-*/
 #  define fontEngineLocker()
-/*
 #endif
-*/
 
 //------------------------------------------------------------------------
 // CairoFont
@@ -116,7 +111,7 @@ CairoFont::getGlyph(CharCode code,
 double
 CairoFont::getSubstitutionCorrection(GfxFont *gfxFont)
 {
-  double w1, w2;
+  double w1, w2, w3;
   CharCode code;
   char *name;
 
@@ -146,7 +141,8 @@ CairoFont::getSubstitutionCorrection(GfxFont *gfxFont)
 	cairo_font_options_destroy(options);
 	w2 = extents.x_advance;
       }
-      if (!gfxFont->isSymbolic()) {
+      w3 = ((Gfx8BitFont *)gfxFont)->getWidth(0);
+      if (!gfxFont->isSymbolic() && w2 > 0 && w1 > w3) {
 	// if real font is substantially narrower than substituted
 	// font, reduce the font size accordingly
 	if (w1 > 0.01 && w1 < 0.9 * w2) {
@@ -260,12 +256,16 @@ _ft_done_face (void *closure)
   else
     _ft_open_faces = data->next;
 
+  if (data->fd != -1) {
 #if defined(__SUNPRO_CC) && defined(__sun) && defined(__SVR4)
-  munmap ((char*)data->bytes, data->size);
+    munmap ((char*)data->bytes, data->size);
 #else
-  munmap (data->bytes, data->size);
+    munmap (data->bytes, data->size);
 #endif
-  close (data->fd);
+    close (data->fd);
+  } else {
+    gfree (data->bytes);
+  }
 
   FT_Done_Face (data->face);
   gfree (data);
@@ -322,6 +322,8 @@ _ft_new_face (FT_Library lib,
         munmap (tmpl.bytes, tmpl.size);
 #endif
         close (tmpl.fd);
+      } else {
+	gfree (tmpl.bytes);
       }
       *face_out = l->face;
       *font_face_out = cairo_font_face_reference (l->font_face);
@@ -399,7 +401,7 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref,
   GfxFontType fontType;
   GfxFontLoc *fontLoc;
   char **enc;
-  char *name;
+  const char *name;
   FoFiTrueType *ff;
   FoFiType1C *ff1c;
   Ref ref;
@@ -421,8 +423,7 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref,
   ref = *gfxFont->getID();
   fontType = gfxFont->getType();
 
-  // pdf2htmlEX: changed gFlase to nullptr
+  if (!(fontLoc = gfxFont->locateFont(xref, NULL))) {
-  if (!(fontLoc = gfxFont->locateFont(xref, nullptr))) {
     error(errSyntaxError, -1, "Couldn't find a font for '{0:s}'",
     	gfxFont->getName() ? gfxFont->getName()->getCString()
 	                       : "(unnamed)");
@@ -462,7 +463,18 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref,
     for (i = 0; i < 256; ++i) {
       codeToGID[i] = 0;
       if ((name = enc[i])) {
-	codeToGID[i] = FT_Get_Name_Index(face, name);
+	codeToGID[i] = FT_Get_Name_Index(face, (char*)name);
+	if (codeToGID[i] == 0) {
+	  Unicode u;
+	  u = globalParams->mapNameToUnicodeText (name);
+	  codeToGID[i] = FT_Get_Char_Index (face, u);
+	}
+	if (codeToGID[i] == 0) {
+	  name = GfxFont::getAlternateName(name);
+	  if (name) {
+	    codeToGID[i] = FT_Get_Name_Index(face, (char*)name);
+	  }
+	}
       }
     }
     break;
@@ -491,6 +503,7 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref,
     codeToGIDLen = n;
     /* Fall through */
   case fontTrueType:
+  case fontTrueTypeOT:
     if (font_data != NULL) {
       ff = FoFiTrueType::make(font_data, font_data_len);
     } else {
@@ -501,7 +514,7 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref,
       goto err2;
     }
     /* This might be set already for the CIDType2 case */
-    if (fontType == fontTrueType) {
+    if (fontType == fontTrueType || fontType == fontTrueTypeOT) {
       codeToGID = ((Gfx8BitFont *)gfxFont)->getCodeToGIDMap(ff);
       codeToGIDLen = 256;
     }
@@ -532,13 +545,45 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref,
     }
 
     if (! _ft_new_face (lib, fileNameC, font_data, font_data_len, &face, &font_face)) {
-      gfree(codeToGID);
-      codeToGID = NULL;
       error(errSyntaxError, -1, "could not create cid face\n");
       goto err2;
     }
     break;
 
+  case fontCIDType0COT:
+    codeToGID = NULL;
+    n = 0;
+    if (((GfxCIDFont *)gfxFont)->getCIDToGID()) {
+      n = ((GfxCIDFont *)gfxFont)->getCIDToGIDLen();
+      if (n) {
+	codeToGID = (int *)gmallocn(n, sizeof(int));
+	memcpy(codeToGID, ((GfxCIDFont *)gfxFont)->getCIDToGID(),
+	       n * sizeof(int));
+      }
+    }
+    codeToGIDLen = n;
+
+    if (!codeToGID) {
+      if (!useCIDs) {
+	if (font_data != NULL) {
+	  ff = FoFiTrueType::make(font_data, font_data_len);
+	} else {
+	  ff = FoFiTrueType::load(fileNameC);
+	}
+	if (ff) {
+	  if (ff->isOpenTypeCFF()) {
+	    codeToGID = ff->getCIDToGIDMap((int *)&codeToGIDLen);
+	  }
+	  delete ff;
+	}
+      }
+    }
+    if (! _ft_new_face (lib, fileNameC, font_data, font_data_len, &face, &font_face)) {
+      error(errSyntaxError, -1, "could not create cid (OT) face\n");
+      goto err2;
+    }
+    break;
+
   default:
     fprintf (stderr, "font type %d not handled\n", (int)fontType);
     goto err2;
@@ -554,6 +599,8 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref,
  err2:
   /* hmm? */
   delete fontLoc;
+  gfree (codeToGID);
+  gfree (font_data);
   fprintf (stderr, "some font thing failed\n");
   return NULL;
 }
@@ -659,7 +706,8 @@ _render_type3_glyph (cairo_scaled_font_t  *scaled_font,
   output_dev->startDoc(info->doc, info->fontEngine);
   output_dev->startPage (1, gfx->getState(), gfx->getXRef());
   output_dev->setInType3Char(gTrue);
-  gfx->display(charProcs->getVal(glyph, &charProc));
+  charProc = charProcs->getVal(glyph);
+  gfx->display(&charProc);
 
   output_dev->getType3GlyphWidth (&wx, &wy);
   cairo_matrix_transform_distance (&matrix, &wx, &wy);
@@ -678,7 +726,6 @@ _render_type3_glyph (cairo_scaled_font_t  *scaled_font,
 
   delete gfx;
   delete output_dev;
-  charProc.free();
 
   return CAIRO_STATUS_SUCCESS;
 }
@@ -768,12 +815,9 @@ CairoFontEngine::CairoFontEngine(FT_Library libA) {
   FT_Library_Version(lib, &major, &minor, &patch);
   useCIDs = major > 2 ||
             (major == 2 && (minor > 1 || (minor == 1 && patch > 7)));
-/*
- * pdf2htmlEX: disabled multi thread 
 #if MULTITHREADED
   gInitMutex(&mutex);
 #endif
-*/
 }
 
 CairoFontEngine::~CairoFontEngine() {
@@ -783,12 +827,9 @@ CairoFontEngine::~CairoFontEngine() {
     if (fontCache[i])
       delete fontCache[i];
   }
-/*
- * pdf2htmlEX: disabled multi thread 
 #if MULTITHREADED
   gDestroyMutex(&mutex);
 #endif
-*/
 }
 
 CairoFont *

3rdparty/poppler/git/CairoFontEngine.h

@@ -74,7 +74,7 @@ protected:
 class CairoFreeTypeFont : public CairoFont {
 public:
   static CairoFreeTypeFont *create(GfxFont *gfxFont, XRef *xref, FT_Library lib, GBool useCIDs);
-  virtual ~CairoFreeTypeFont();
+  ~CairoFreeTypeFont();
 
 private:
   CairoFreeTypeFont(Ref ref, cairo_font_face_t *cairo_font_face,
@@ -88,9 +88,9 @@ public:
   static CairoType3Font *create(GfxFont *gfxFont, PDFDoc *doc,
 				CairoFontEngine *fontEngine,
 				GBool printing, XRef *xref);
-  virtual ~CairoType3Font();
+  ~CairoType3Font();
 
-  virtual GBool matches(Ref &other, GBool printing);
+  GBool matches(Ref &other, GBool printing) override;
 
 private:
   CairoType3Font(Ref ref, PDFDoc *doc,
@@ -121,12 +121,9 @@ private:
   CairoFont *fontCache[cairoFontCacheSize];
   FT_Library lib;
   GBool useCIDs;
-/*
- * pdf2htmlEX: disabled multi thread 
 #if MULTITHREADED
   GooMutex mutex;
 #endif
-*/
 };
 
 #endif

3rdparty/poppler/git/CairoOutputDev.cc

@@ -16,18 +16,18 @@
 //
 // Copyright (C) 2005-2008 Jeff Muizelaar <jeff@infidigm.net>
 // Copyright (C) 2005, 2006 Kristian Høgsberg <krh@redhat.com>
-// Copyright (C) 2005, 2009, 2012 Albert Astals Cid <aacid@kde.org>
+// Copyright (C) 2005, 2009, 2012, 2017 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2005 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
-// Copyright (C) 2006-2011, 2013 Carlos Garcia Campos <carlosgc@gnome.org>
+// Copyright (C) 2006-2011, 2013, 2014 Carlos Garcia Campos <carlosgc@gnome.org>
 // Copyright (C) 2008 Carl Worth <cworth@cworth.org>
-// Copyright (C) 2008-2013 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2008 Michael Vrable <mvrable@cs.ucsd.edu>
 // Copyright (C) 2008, 2009 Chris Wilson <chris@chris-wilson.co.uk>
 // Copyright (C) 2008, 2012 Hib Eris <hib@hiberis.nl>
 // Copyright (C) 2009, 2010 David Benjamin <davidben@mit.edu>
-// Copyright (C) 2011-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2011-2014 Thomas Freitag <Thomas.Freitag@alfa.de>
 // Copyright (C) 2012 Patrick Pfeifer <p2000@mailinator.com>
-// Copyright (C) 2012 Jason Crain <jason@aquaticape.us>
+// Copyright (C) 2012, 2015, 2016 Jason Crain <jason@aquaticape.us>
+// Copyright (C) 2015 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -44,9 +44,9 @@
 #include <math.h>
 #include <assert.h>
 #include <cairo.h>
-#include <stdint.h>
 
 #include "goo/gfile.h"
+//#include "goo/gtypes_p.h"
 #include "GlobalParams.h"
 #include "Error.h"
 #include "Object.h"
@@ -63,6 +63,7 @@
 #include "CairoFontEngine.h"
 #include "CairoRescaleBox.h"
 #include "UnicodeMap.h"
+#include "JBIG2Stream.h"
 //------------------------------------------------------------------------
 
 // #define LOG_CAIRO
@@ -141,12 +142,18 @@ CairoOutputDev::CairoOutputDev() {
   strokePathClip = NULL;
   cairo = NULL;
   currentFont = NULL;
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 14, 0)
+  prescaleImages = gFalse;
+#else
   prescaleImages = gTrue;
+#endif
   printing = gTrue;
   use_show_text_glyphs = gFalse;
   inUncoloredPattern = gFalse;
   inType3Char = gFalse;
   t3_glyph_has_bbox = gFalse;
+  text_matrix_valid = gTrue;
+  antialias = CAIRO_ANTIALIAS_DEFAULT;
 
   groupColorSpaceStack = NULL;
   maskStack = NULL;
@@ -203,6 +210,7 @@ void CairoOutputDev::setCairo(cairo_t *cairo)
 	/* save the initial matrix so that we can use it for type3 fonts. */
 	//XXX: is this sufficient? could we miss changes to the matrix somehow?
 	cairo_get_matrix(cairo, &orig_matrix);
+	setContextAntialias(cairo, antialias);
   } else {
     this->cairo = NULL;
     this->cairo_shape = NULL;
@@ -225,6 +233,26 @@ void CairoOutputDev::setTextPage(TextPage *text)
   }
 }
 
+void CairoOutputDev::setAntialias(cairo_antialias_t antialias)
+{
+  this->antialias = antialias;
+  if (cairo)
+    setContextAntialias (cairo, antialias);
+  if (cairo_shape)
+    setContextAntialias (cairo_shape, antialias);
+}
+
+void CairoOutputDev::setContextAntialias(cairo_t *cr, cairo_antialias_t antialias)
+{
+  cairo_font_options_t *font_options;
+  cairo_set_antialias (cr, antialias);
+  font_options = cairo_font_options_create ();
+  cairo_get_font_options (cr, font_options);
+  cairo_font_options_set_antialias (font_options, antialias);
+  cairo_set_font_options (cr, font_options);
+  cairo_font_options_destroy (font_options);
+}
+
 void CairoOutputDev::startDoc(PDFDoc *docA,
 			      CairoFontEngine *parentFontEngine) {
   doc = docA;
@@ -275,6 +303,9 @@ void CairoOutputDev::saveState(GfxState *state) {
   ms->mask_matrix = mask_matrix;
   ms->next = maskStack;
   maskStack = ms;
+
+  if (strokePathClip)
+    strokePathClip->ref_count++;
 }
 
 void CairoOutputDev::restoreState(GfxState *state) {
@@ -283,6 +314,8 @@ void CairoOutputDev::restoreState(GfxState *state) {
   if (cairo_shape)
       cairo_restore (cairo_shape);
 
+  text_matrix_valid = gTrue;
+
   /* These aren't restored by cairo_restore() since we keep them in
    * the output device. */
   updateFillColor(state);
@@ -300,6 +333,14 @@ void CairoOutputDev::restoreState(GfxState *state) {
     maskStack = ms->next;
     delete ms;
   }
+
+  if (strokePathClip && --strokePathClip->ref_count == 0) {
+    delete strokePathClip->path;
+    if (strokePathClip->dashes)
+      gfree (strokePathClip->dashes);
+    gfree (strokePathClip);
+    strokePathClip = NULL;
+  }
 }
 
 void CairoOutputDev::updateAll(GfxState *state) {
@@ -657,11 +698,13 @@ void CairoOutputDev::updateFont(GfxState *state) {
   */
   invert_matrix = matrix;
   if (cairo_matrix_invert(&invert_matrix)) {
-    error(errSyntaxWarning, -1, "font matrix not invertible\n");
+    error(errSyntaxWarning, -1, "font matrix not invertible");
+    text_matrix_valid = gFalse;
     return;
   }
 
   cairo_set_font_matrix (cairo, &matrix);
+  text_matrix_valid = gTrue;
 }
 
 /* Tolerance in pixels for checking if strokes are horizontal or vertical
@@ -773,7 +816,14 @@ void CairoOutputDev::stroke(GfxState *state) {
   align_stroke_coords = gFalse;
   cairo_set_source (cairo, stroke_pattern);
   LOG(printf ("stroke\n"));
-  cairo_stroke (cairo);
+  if (strokePathClip) {
+    cairo_push_group (cairo);
+    cairo_stroke (cairo);
+    cairo_pop_group_to_source (cairo);
+    fillToStrokePathClip (state);
+  } else {
+    cairo_stroke (cairo);
+  }
   if (cairo_shape) {
     doPath (cairo_shape, state, state->getPath());
     cairo_stroke (cairo_shape);
@@ -796,6 +846,11 @@ void CairoOutputDev::fill(GfxState *state) {
   if (mask) {
     cairo_save (cairo);
     cairo_clip (cairo);
+    if (strokePathClip) {
+      cairo_push_group (cairo);
+      fillToStrokePathClip (state);
+      cairo_pop_group_to_source (cairo);
+    }
     cairo_set_matrix (cairo, &mask_matrix);
     cairo_mask (cairo, mask);
     cairo_restore (cairo);
@@ -816,8 +871,16 @@ void CairoOutputDev::eoFill(GfxState *state) {
   cairo_set_fill_rule (cairo, CAIRO_FILL_RULE_EVEN_ODD);
   cairo_set_source (cairo, fill_pattern);
   LOG(printf ("fill-eo\n"));
-  cairo_fill (cairo);
 
+  if (mask) {
+    cairo_save (cairo);
+    cairo_clip (cairo);
+    cairo_set_matrix (cairo, &mask_matrix);
+    cairo_mask (cairo, mask);
+    cairo_restore (cairo);
+  } else {
+    cairo_fill (cairo);
+  }
   if (cairo_shape) {
     cairo_set_fill_rule (cairo_shape, CAIRO_FILL_RULE_EVEN_ODD);
     doPath (cairo_shape, state, state->getPath());
@@ -837,11 +900,15 @@ GBool CairoOutputDev::tilingPatternFill(GfxState *state, Gfx *gfxA, Catalog *cat
   cairo_pattern_t *pattern;
   cairo_surface_t *surface;
   cairo_matrix_t matrix;
+  cairo_matrix_t pattern_matrix;
   cairo_t *old_cairo;
   double xMin, yMin, xMax, yMax;
   double width, height;
+  double scaleX, scaleY;
   int surface_width, surface_height;
   StrokePathClip *strokePathTmp;
+  GBool adjusted_stroke_width_tmp;
+  cairo_pattern_t *maskTmp;
 
   width = bbox[2] - bbox[0];
   height = bbox[3] - bbox[1];
@@ -850,8 +917,20 @@ GBool CairoOutputDev::tilingPatternFill(GfxState *state, Gfx *gfxA, Catalog *cat
     return gFalse;
   /* TODO: implement the other cases here too */
 
-  surface_width = (int) ceil (width);
+  // Find the width and height of the transformed pattern
-  surface_height = (int) ceil (height);
+  cairo_get_matrix (cairo, &matrix);
+  cairo_matrix_init (&pattern_matrix, mat[0], mat[1], mat[2], mat[3], mat[4], mat[5]);
+  cairo_matrix_multiply (&matrix, &matrix, &pattern_matrix);
+
+  double widthX = width, widthY = 0;
+  cairo_matrix_transform_distance (&matrix, &widthX, &widthY);
+  surface_width = ceil (sqrt (widthX * widthX + widthY * widthY));
+
+  double heightX = 0, heightY = height;
+  cairo_matrix_transform_distance (&matrix, &heightX, &heightY);
+  surface_height = ceil (sqrt (heightX * heightX + heightY * heightY));
+  scaleX = surface_width / width;
+  scaleY = surface_height / height;
 
   surface = cairo_surface_create_similar (cairo_get_target (cairo),
 					  CAIRO_CONTENT_COLOR_ALPHA,
@@ -862,11 +941,18 @@ GBool CairoOutputDev::tilingPatternFill(GfxState *state, Gfx *gfxA, Catalog *cat
   old_cairo = cairo;
   cairo = cairo_create (surface);
   cairo_surface_destroy (surface);
+  setContextAntialias(cairo, antialias);
 
   box.x1 = bbox[0]; box.y1 = bbox[1];
   box.x2 = bbox[2]; box.y2 = bbox[3];
+  cairo_scale (cairo, scaleX, scaleY);
+  cairo_translate (cairo, -box.x1, -box.y1);
+
   strokePathTmp = strokePathClip;
   strokePathClip = NULL;
+  adjusted_stroke_width_tmp = adjusted_stroke_width;
+  maskTmp = mask;
+  mask = NULL;
   gfx = new Gfx(doc, this, resDict, &box, NULL, NULL, NULL, gfxA->getXRef());
   if (paintType == 2)
     inUncoloredPattern = gTrue;
@@ -875,6 +961,8 @@ GBool CairoOutputDev::tilingPatternFill(GfxState *state, Gfx *gfxA, Catalog *cat
     inUncoloredPattern = gFalse;
   delete gfx;
   strokePathClip = strokePathTmp;
+  adjusted_stroke_width = adjusted_stroke_width_tmp;
+  mask = maskTmp;
 
   pattern = cairo_pattern_create_for_surface (cairo_get_target (cairo));
   cairo_destroy (cairo);
@@ -885,11 +973,11 @@ GBool CairoOutputDev::tilingPatternFill(GfxState *state, Gfx *gfxA, Catalog *cat
   state->getUserClipBBox(&xMin, &yMin, &xMax, &yMax);
   cairo_rectangle (cairo, xMin, yMin, xMax - xMin, yMax - yMin);
 
-  cairo_matrix_init_scale (&matrix, surface_width / width, surface_height / height);
+  cairo_matrix_init_scale (&matrix, scaleX, scaleY);
+  cairo_matrix_translate (&matrix, -box.x1, -box.y1);
   cairo_pattern_set_matrix (pattern, &matrix);
 
-  cairo_matrix_init (&matrix, mat[0], mat[1], mat[2], mat[3], mat[4], mat[5]);
+  cairo_transform (cairo, &pattern_matrix);
-  cairo_transform (cairo, &matrix);
   cairo_set_source (cairo, pattern);
   cairo_pattern_set_extend (pattern, CAIRO_EXTEND_REPEAT);
   if (strokePathClip) {
@@ -903,6 +991,107 @@ GBool CairoOutputDev::tilingPatternFill(GfxState *state, Gfx *gfxA, Catalog *cat
   return gTrue;
 }
 
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 12, 0)
+GBool CairoOutputDev::functionShadedFill(GfxState *state, GfxFunctionShading *shading)
+{
+  // Function shaded fills are subdivided to rectangles that are the
+  // following size in device space.  Note when printing this size is
+  // in points.
+  const int subdivide_pixels = 10;
+
+  double x_begin, x_end, x1, x2;
+  double y_begin, y_end, y1, y2;
+  double x_step;
+  double y_step;
+  GfxColor color;
+  GfxRGB rgb;
+  double *matrix;
+  cairo_matrix_t mat;
+
+  matrix = shading->getMatrix();
+  mat.xx = matrix[0];
+  mat.yx = matrix[1];
+  mat.xy = matrix[2];
+  mat.yy = matrix[3];
+  mat.x0 = matrix[4];
+  mat.y0 = matrix[5];
+  if (cairo_matrix_invert(&mat)) {
+    error(errSyntaxWarning, -1, "matrix not invertible\n");
+    return gFalse;
+    }
+
+  // get cell size in pattern space
+  x_step = y_step = subdivide_pixels;
+  cairo_matrix_transform_distance (&mat, &x_step, &y_step);
+
+  cairo_pattern_destroy(fill_pattern);
+  fill_pattern = cairo_pattern_create_mesh ();
+  cairo_pattern_set_matrix(fill_pattern, &mat);
+  shading->getDomain(&x_begin, &y_begin, &x_end, &y_end);
+
+  for (x1 = x_begin; x1 < x_end; x1 += x_step) {
+    x2 = x1 + x_step;
+    if (x2 > x_end)
+      x2 = x_end;
+
+    for (y1 = y_begin; y1 < y_end; y1 += y_step) {
+      y2 = y1 + y_step;
+      if (y2 > y_end)
+	y2 = y_end;
+
+      cairo_mesh_pattern_begin_patch (fill_pattern);
+      cairo_mesh_pattern_move_to (fill_pattern, x1, y1);
+      cairo_mesh_pattern_line_to (fill_pattern, x2, y1);
+      cairo_mesh_pattern_line_to (fill_pattern, x2, y2);
+      cairo_mesh_pattern_line_to (fill_pattern, x1, y2);
+
+      shading->getColor(x1, y1, &color);
+      shading->getColorSpace()->getRGB(&color, &rgb);
+      cairo_mesh_pattern_set_corner_color_rgb (fill_pattern, 0,
+					       colToDbl(rgb.r),
+					       colToDbl(rgb.g),
+					       colToDbl(rgb.b));
+
+      shading->getColor(x2, y1, &color);
+      shading->getColorSpace()->getRGB(&color, &rgb);
+      cairo_mesh_pattern_set_corner_color_rgb (fill_pattern, 1,
+					       colToDbl(rgb.r),
+					       colToDbl(rgb.g),
+					       colToDbl(rgb.b));
+
+      shading->getColor(x2, y2, &color);
+      shading->getColorSpace()->getRGB(&color, &rgb);
+      cairo_mesh_pattern_set_corner_color_rgb (fill_pattern, 2,
+					       colToDbl(rgb.r),
+					       colToDbl(rgb.g),
+					       colToDbl(rgb.b));
+
+      shading->getColor(x1, y2, &color);
+      shading->getColorSpace()->getRGB(&color, &rgb);
+      cairo_mesh_pattern_set_corner_color_rgb (fill_pattern, 3,
+					       colToDbl(rgb.r),
+					       colToDbl(rgb.g),
+					       colToDbl(rgb.b));
+
+      cairo_mesh_pattern_end_patch (fill_pattern);
+    }
+  }
+
+  double xMin, yMin, xMax, yMax;
+  // get the clip region bbox
+  state->getUserClipBBox(&xMin, &yMin, &xMax, &yMax);
+  state->moveTo(xMin, yMin);
+  state->lineTo(xMin, yMax);
+  state->lineTo(xMax, yMax);
+  state->lineTo(xMax, yMin);
+  state->closePath();
+  fill(state);
+  state->clearPath();
+
+  return gTrue;
+}
+#endif /* CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 12, 0) */
+
 GBool CairoOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax) {
   double x0, y0, x1, y1;
   double dx, dy;
@@ -934,18 +1123,32 @@ GBool CairoOutputDev::axialShadedSupportExtend(GfxState *state, GfxAxialShading
 GBool CairoOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading, double sMin, double sMax) {
   double x0, y0, r0, x1, y1, r1;
   double dx, dy, dr;
+  cairo_matrix_t matrix;
+  double scale;
 
   shading->getCoords(&x0, &y0, &r0, &x1, &y1, &r1);
   dx = x1 - x0;
   dy = y1 - y0;
   dr = r1 - r0;
+
+  // Cairo/pixman do not work well with a very large or small scaled
+  // matrix.  See cairo bug #81657.
+  //
+  // As a workaround, scale the pattern by the average of the vertical
+  // and horizontal scaling of the current transformation matrix.
+  cairo_get_matrix(cairo, &matrix);
+  scale = (sqrt(matrix.xx * matrix.xx + matrix.yx * matrix.yx)
+	   + sqrt(matrix.xy * matrix.xy + matrix.yy * matrix.yy)) / 2;
+  cairo_matrix_init_scale(&matrix, scale, scale);
+
   cairo_pattern_destroy(fill_pattern);
-  fill_pattern = cairo_pattern_create_radial (x0 + sMin * dx,
+  fill_pattern = cairo_pattern_create_radial ((x0 + sMin * dx) * scale,
-					      y0 + sMin * dy,
+					      (y0 + sMin * dy) * scale,
-					      r0 + sMin * dr,
+					      (r0 + sMin * dr) * scale,
-					      x0 + sMax * dx,
+					      (x0 + sMax * dx) * scale,
-					      y0 + sMax * dy,
+					      (y0 + sMax * dy) * scale,
-					      r0 + sMax * dr);
+					      (r0 + sMax * dr) * scale);
+  cairo_pattern_set_matrix(fill_pattern, &matrix);
   if (shading->getExtend0() && shading->getExtend1())
     cairo_pattern_set_extend (fill_pattern, CAIRO_EXTEND_PAD);
   else
@@ -1152,6 +1355,7 @@ void CairoOutputDev::clipToStrokePath(GfxState *state) {
   strokePathClip->cap = cairo_get_line_cap (cairo);
   strokePathClip->join = cairo_get_line_join (cairo);
   strokePathClip->miter = cairo_get_miter_limit (cairo);
+  strokePathClip->ref_count = 1;
 }
 
 void CairoOutputDev::fillToStrokePathClip(GfxState *state) {
@@ -1159,7 +1363,6 @@ void CairoOutputDev::fillToStrokePathClip(GfxState *state) {
 
   cairo_set_matrix (cairo, &strokePathClip->ctm);
   cairo_set_line_width (cairo, strokePathClip->line_width);
-  strokePathClip->dash_count = cairo_get_dash_count (cairo);
   cairo_set_dash (cairo, strokePathClip->dashes, strokePathClip->dash_count, strokePathClip->dash_offset);
   cairo_set_line_cap (cairo, strokePathClip->cap);
   cairo_set_line_join (cairo, strokePathClip->join);
@@ -1168,12 +1371,6 @@ void CairoOutputDev::fillToStrokePathClip(GfxState *state) {
   cairo_stroke (cairo);
 
   cairo_restore (cairo);
-
-  delete strokePathClip->path;
-  if (strokePathClip->dashes)
-    gfree (strokePathClip->dashes);
-  gfree (strokePathClip);
-  strokePathClip = NULL;
 }
 
 void CairoOutputDev::beginString(GfxState *state, GooString *s)
@@ -1250,10 +1447,8 @@ void CairoOutputDev::endString(GfxState *state)
   // ignore empty strings and invisible text -- this is used by
   // Acrobat Capture
   render = state->getRender();
-  if (render == 3 || glyphCount == 0) {
+  if (render == 3 || glyphCount == 0 || !text_matrix_valid) {
-    gfree(glyphs);
+    goto finish;
-    glyphs = NULL;
-    return;
   }
 
   if (!(render & 1)) {
@@ -1305,6 +1500,7 @@ void CairoOutputDev::endString(GfxState *state)
     }
   }
 
+finish:
   gfree (glyphs);
   glyphs = NULL;
   if (use_show_text_glyphs) {
@@ -1319,6 +1515,7 @@ void CairoOutputDev::endString(GfxState *state)
 GBool CairoOutputDev::beginType3Char(GfxState *state, double x, double y,
 				      double dx, double dy,
 				      CharCode code, Unicode *u, int uLen) {
+
   cairo_save (cairo);
   double *ctm;
   cairo_matrix_t matrix;
@@ -1412,29 +1609,15 @@ static inline int splashFloor(SplashCoord x) {
 static
 cairo_surface_t *cairo_surface_create_similar_clip (cairo_t *cairo, cairo_content_t content)
 {
-  double x1, y1, x2, y2;
+  cairo_pattern_t *pattern;
-  int width, height;
+  cairo_surface_t *surface = NULL;
-  cairo_clip_extents (cairo, &x1, &y1, &x2, &y2);
-  cairo_matrix_t matrix;
-  cairo_get_matrix (cairo, &matrix);
-  //cairo_matrix_transform_point(&matrix, &x1, &y1);
-  //cairo_matrix_transform_point(&matrix, &x2, &y2);*/
-  cairo_user_to_device(cairo, &x1, &y1);
-  cairo_user_to_device(cairo, &x2, &y2);
-  width = splashCeil(x2) - splashFloor(x1);
-  //XXX: negative matrix
-  ////height = splashCeil(y2) - splashFloor(y1);
-  height = splashFloor(y1) - splashCeil(y2);
-  cairo_surface_t *target = cairo_get_target (cairo);
-  cairo_surface_t *result;
 
-  result = cairo_surface_create_similar (target, content, width, height);
+  cairo_push_group_with_content (cairo, content);
-  double x_offset, y_offset;
+  pattern = cairo_pop_group (cairo);
-    cairo_surface_get_device_offset(target, &x_offset, &y_offset);
+  cairo_pattern_get_surface (pattern, &surface);
-    cairo_surface_set_device_offset(result, x_offset, y_offset);
+  cairo_surface_reference (surface);
-
+  cairo_pattern_destroy (pattern);
- 
+  return surface;
-  return result;
 }
 
 
@@ -1460,6 +1643,7 @@ void CairoOutputDev::beginTransparencyGroup(GfxState * /*state*/, double * /*bbo
       cairo_surface_t *cairo_shape_surface = cairo_surface_create_similar_clip (cairo, CAIRO_CONTENT_ALPHA);
       cairo_shape = cairo_create (cairo_shape_surface);
       cairo_surface_destroy (cairo_shape_surface);
+      setContextAntialias(cairo_shape, antialias);
 
       /* the color doesn't matter as long as it is opaque */
       cairo_set_source_rgb (cairo_shape, 0, 0, 0);
@@ -1467,8 +1651,6 @@ void CairoOutputDev::beginTransparencyGroup(GfxState * /*state*/, double * /*bbo
       cairo_get_matrix (cairo, &matrix);
       //printMatrix(&matrix);
       cairo_set_matrix (cairo_shape, &matrix);
-    } else {
-      cairo_reference (cairo_shape);
     }
   }
   if (groupColorSpaceStack->next && groupColorSpaceStack->next->knockout) {
@@ -1508,33 +1690,22 @@ void CairoOutputDev::paintTransparencyGroup(GfxState * /*state*/, double * /*bbo
 
   cairo_save (cairo);
   cairo_set_matrix (cairo, &groupColorSpaceStack->group_matrix);
+
+  if (shape) {
+    /* OPERATOR_SOURCE w/ a mask is defined as (src IN mask) ADD (dest OUT mask)
+     * however our source has already been clipped to mask so we only need to
+     * do ADD and OUT */
+
+    /* clear the shape mask */
+    cairo_set_source (cairo, shape);
+    cairo_set_operator (cairo, CAIRO_OPERATOR_DEST_OUT);
+    cairo_paint (cairo);
+    cairo_set_operator (cairo, CAIRO_OPERATOR_ADD);
+  }
   cairo_set_source (cairo, group);
 
   if (!mask) {
-    //XXX: deal with mask && shape case
+    cairo_paint_with_alpha (cairo, fill_opacity);
-    if (shape) {
-      cairo_save (cairo);
-
-      /* OPERATOR_SOURCE w/ a mask is defined as (src IN mask) ADD (dest OUT mask)
-       * however our source has already been clipped to mask so we only need to
-       * do ADD and OUT */
-
-      /* clear the shape mask */
-      cairo_set_source (cairo, shape);
-      cairo_set_operator (cairo, CAIRO_OPERATOR_DEST_OUT);
-      cairo_paint (cairo);
-
-      cairo_set_operator (cairo, CAIRO_OPERATOR_ADD);
-      cairo_set_source (cairo, group);
-      cairo_paint (cairo);
-
-      cairo_restore (cairo);
-
-      cairo_pattern_destroy (shape);
-      shape = NULL;
-    } else {
-      cairo_paint_with_alpha (cairo, fill_opacity);
-    }
     cairo_status_t status = cairo_status(cairo);
     if (status)
       printf("BAD status: %s\n", cairo_status_to_string(status));
@@ -1554,6 +1725,16 @@ void CairoOutputDev::paintTransparencyGroup(GfxState * /*state*/, double * /*bbo
     mask = NULL;
   }
 
+  if (shape) {
+    if (cairo_shape) {
+      cairo_set_source (cairo_shape, shape);
+      cairo_paint (cairo_shape);
+      cairo_set_source_rgb (cairo_shape, 0, 0, 0);
+    }
+    cairo_pattern_destroy (shape);
+    shape = NULL;
+  }
+
   popTransparencyGroup();
   cairo_restore(cairo);
 }
@@ -1617,9 +1798,10 @@ void CairoOutputDev::setSoftMask(GfxState * state, double * bbox, GBool alpha,
 
     cairo_surface_t *source = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
     cairo_t *maskCtx = cairo_create(source);
+    setContextAntialias(maskCtx, antialias);
 
     //XXX: hopefully this uses the correct color space */
-    if (!alpha) {
+    if (!alpha && groupColorSpaceStack->cs) {
       GfxRGB backdropColorRGB;
       groupColorSpaceStack->cs->getRGB(backdropColor, &backdropColorRGB);
       /* paint the backdrop */
@@ -1782,7 +1964,7 @@ CairoOutputDev::getFilterForSurface(cairo_surface_t *image,
 				    GBool interpolate)
 {
   if (interpolate)
-    return CAIRO_FILTER_BILINEAR;
+    return CAIRO_FILTER_BEST;
 
   int orig_width = cairo_image_surface_get_width (image);
   int orig_height = cairo_image_surface_get_height (image);
@@ -1802,7 +1984,7 @@ CairoOutputDev::getFilterForSurface(cairo_surface_t *image,
   if (scaled_width / orig_width >= 4 || scaled_height / orig_height >= 4)
 	  return CAIRO_FILTER_NEAREST;
 
-  return CAIRO_FILTER_BILINEAR;
+  return CAIRO_FILTER_BEST;
 }
 
 void CairoOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str,
@@ -1879,45 +2061,43 @@ void CairoOutputDev::setSoftMaskFromImageMask(GfxState *state, Object *ref, Stre
     delete imgStr;
 
     invert_bit = invert ? 1 : 0;
-    if (pix ^ invert_bit)
+    if (!(pix ^ invert_bit)) {
-      return;
+      cairo_save (cairo);
-
+      cairo_rectangle (cairo, 0., 0., width, height);
-    cairo_save (cairo);
+      cairo_fill (cairo);
-    cairo_rectangle (cairo, 0., 0., width, height);
+      cairo_restore (cairo);
-    cairo_fill (cairo);
+      if (cairo_shape) {
-    cairo_restore (cairo);
+        cairo_save (cairo_shape);
-    if (cairo_shape) {
+        cairo_rectangle (cairo_shape, 0., 0., width, height);
-      cairo_save (cairo_shape);
+        cairo_fill (cairo_shape);
-      cairo_rectangle (cairo_shape, 0., 0., width, height);
+        cairo_restore (cairo_shape);
-      cairo_fill (cairo_shape);
+      }
-      cairo_restore (cairo_shape);
     }
-    return;
-  }
-
-  cairo_push_group_with_content (cairo, CAIRO_CONTENT_ALPHA);
-
-  /* shape is 1.0 for painted areas, 0.0 for unpainted ones */
-
-  cairo_matrix_t matrix;
-  cairo_get_matrix (cairo, &matrix);
-  //XXX: it is possible that we should only do sub pixel positioning if 
-  // we are rendering fonts */
-  if (!printing && prescaleImages && matrix.xy == 0.0 && matrix.yx == 0.0) {
-    drawImageMaskPrescaled(state, ref, str, width, height, invert, gFalse, inlineImg);
   } else {
-    drawImageMaskRegular(state, ref, str, width, height, invert, gFalse, inlineImg);
+    cairo_push_group_with_content (cairo, CAIRO_CONTENT_ALPHA);
-  }
 
-  if (state->getFillColorSpace()->getMode() == csPattern) {
+    /* shape is 1.0 for painted areas, 0.0 for unpainted ones */
-    cairo_set_source_rgb (cairo, 1, 1, 1);
-    cairo_set_matrix (cairo, &mask_matrix);
-    cairo_mask (cairo, mask);
-  }
 
-  if (mask)
+    cairo_matrix_t matrix;
-    cairo_pattern_destroy (mask);
+    cairo_get_matrix (cairo, &matrix);
-  mask = cairo_pop_group (cairo);
+    //XXX: it is possible that we should only do sub pixel positioning if
+    // we are rendering fonts */
+    if (!printing && prescaleImages && matrix.xy == 0.0 && matrix.yx == 0.0) {
+      drawImageMaskPrescaled(state, ref, str, width, height, invert, gFalse, inlineImg);
+    } else {
+      drawImageMaskRegular(state, ref, str, width, height, invert, gFalse, inlineImg);
+    }
+
+    if (state->getFillColorSpace()->getMode() == csPattern) {
+      cairo_set_source_rgb (cairo, 1, 1, 1);
+      cairo_set_matrix (cairo, &mask_matrix);
+      cairo_mask (cairo, mask);
+    }
+
+    if (mask)
+      cairo_pattern_destroy (mask);
+    mask = cairo_pop_group (cairo);
+  }
 
   saveState(state);
   double bbox[4] = {0,0,1,1}; // dummy
@@ -2271,7 +2451,6 @@ void CairoOutputDev::drawImageMaskPrescaled(GfxState *state, Object *ref, Stream
    * images with CAIRO_FILTER_NEAREST to look really bad */
   cairo_pattern_set_filter (pattern,
 			    interpolate ? CAIRO_FILTER_BEST : CAIRO_FILTER_FAST);
-  cairo_pattern_set_extend (pattern, CAIRO_EXTEND_PAD);
 
   if (state->getFillColorSpace()->getMode() == csPattern) {
     cairo_matrix_init_translate (&matrix, 0, scaledHeight);
@@ -2300,6 +2479,11 @@ void CairoOutputDev::drawImageMaskPrescaled(GfxState *state, Object *ref, Stream
 
     cairo_rectangle (cairo, 0., 0., scaledWidth, scaledHeight);
     cairo_clip (cairo);
+    if (strokePathClip) {
+      cairo_push_group (cairo);
+      fillToStrokePathClip (state);
+      cairo_pop_group_to_source (cairo);
+    }
     cairo_mask (cairo, pattern);
 
     //cairo_get_matrix(cairo, &matrix);
@@ -2572,7 +2756,7 @@ void CairoOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *s
 
   cairo_surface_mark_dirty (image);
 
-  setMimeData(str, ref, image);
+  setMimeData(state, str, ref, colorMap, image);
 
   pattern = cairo_pattern_create_for_surface (image);
   cairo_surface_destroy (image);
@@ -2675,49 +2859,161 @@ GBool CairoOutputDev::getStreamData (Stream *str, char **buffer, int *length)
   return gTrue;
 }
 
-void CairoOutputDev::setMimeData(Stream *str, Object *ref, cairo_surface_t *image)
+static GBool colorMapHasIdentityDecodeMap(GfxImageColorMap *colorMap)
+{
+  for (int i = 0; i < colorMap->getNumPixelComps(); i++) {
+    if (colorMap->getDecodeLow(i) != 0.0 || colorMap->getDecodeHigh(i) != 1.0)
+      return gFalse;
+  }
+  return gTrue;
+}
+
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 11, 2)
+static cairo_status_t setMimeIdFromRef(cairo_surface_t *surface,
+				       const char *mime_type,
+				       const char *mime_id_prefix,
+				       Ref ref)
+{
+  GooString *mime_id;
+  char *idBuffer;
+  cairo_status_t status;
+
+  mime_id = new GooString;
+
+  if (mime_id_prefix)
+    mime_id->append(mime_id_prefix);
+
+  mime_id->appendf("{0:d}-{1:d}", ref.gen, ref.num);
+
+  idBuffer = copyString(mime_id->getCString());
+  status = cairo_surface_set_mime_data (surface, mime_type,
+                                        (const unsigned char *)idBuffer,
+                                        mime_id->getLength(),
+                                        gfree, idBuffer);
+  delete mime_id;
+  if (status)
+    gfree (idBuffer);
+  return status;
+}
+#endif
+
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 14, 0)
+GBool CairoOutputDev::setMimeDataForJBIG2Globals(Stream  *str,
+                                                 cairo_surface_t *image)
+{
+  JBIG2Stream *jb2Str = static_cast<JBIG2Stream *>(str);
+  Object* globalsStr = jb2Str->getGlobalsStream();
+  char *globalsBuffer;
+  int globalsLength;
+
+  // nothing to do for JBIG2 stream without Globals
+  if (!globalsStr->isStream())
+    return gTrue;
+
+  if (setMimeIdFromRef(image, CAIRO_MIME_TYPE_JBIG2_GLOBAL_ID, NULL,
+                       jb2Str->getGlobalsStreamRef()))
+    return gFalse;
+
+  if (!getStreamData(globalsStr->getStream(), &globalsBuffer, &globalsLength))
+    return gFalse;
+
+  if (cairo_surface_set_mime_data (image, CAIRO_MIME_TYPE_JBIG2_GLOBAL,
+                                   (const unsigned char*)globalsBuffer,
+                                   globalsLength,
+                                   gfree, (void*)globalsBuffer))
+  {
+    gfree (globalsBuffer);
+    return gFalse;
+  }
+
+  return gTrue;
+}
+#endif
+
+void CairoOutputDev::setMimeData(GfxState *state, Stream *str, Object *ref,
+				 GfxImageColorMap *colorMap, cairo_surface_t *image)
 {
   char *strBuffer;
   int len;
   Object obj;
+  GfxColorSpace *colorSpace;
+  StreamKind  strKind = str->getKind();
+  const char *mime_type;
 
-  if (!printing || !(str->getKind() == strDCT || str->getKind() == strJPX))
+  if (!printing)
     return;
 
-  // colorspace in stream dict may be different from colorspace in jpx
+  switch (strKind) {
-  // data
+    case strDCT:
-  if (str->getKind() == strJPX) {
+      mime_type = CAIRO_MIME_TYPE_JPEG;
-    GBool hasColorSpace = !str->getDict()->lookup("ColorSpace", &obj)->isNull();
+      break;
-    obj.free();
+    case strJPX:
-    if (hasColorSpace)
+      mime_type = CAIRO_MIME_TYPE_JP2;
+      break;
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 14, 0)
+    case strJBIG2:
+      mime_type = CAIRO_MIME_TYPE_JBIG2;
+      break;
+#endif
+    default:
       return;
   }
 
+  obj = str->getDict()->lookup("ColorSpace");
+  colorSpace = GfxColorSpace::parse(NULL, &obj, this, state);
+  obj.free();
+
+  // colorspace in stream dict may be different from colorspace in jpx
+  // data
+  if (strKind == strJPX && colorSpace)
+    return;
+
+  // only embed mime data for gray, rgb, and cmyk colorspaces.
+  if (colorSpace) {
+    GfxColorSpaceMode mode = colorSpace->getMode();
+    delete colorSpace;
+    switch (mode) {
+      case csDeviceGray:
+      case csCalGray:
+      case csDeviceRGB:
+      case csCalRGB:
+      case csDeviceCMYK:
+      case csICCBased:
+	break;
+
+      case csLab:
+      case csIndexed:
+      case csSeparation:
+      case csDeviceN:
+      case csPattern:
+	return;
+    }
+  }
+
+  if (!colorMapHasIdentityDecodeMap(colorMap))
+    return;
+
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 14, 0)
+  if (strKind == strJBIG2 && !setMimeDataForJBIG2Globals(str, image))
+    return;
+#endif
+
   if (getStreamData (str->getNextStream(), &strBuffer, &len)) {
-    cairo_status_t st;
+    cairo_status_t status = CAIRO_STATUS_SUCCESS;
 
 #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 11, 2)
     if (ref && ref->isRef()) {
-      Ref imgRef = ref->getRef();
+      status = setMimeIdFromRef(image, CAIRO_MIME_TYPE_UNIQUE_ID,
-      GooString *surfaceId = new GooString("poppler-surface-");
+                                "poppler-surface-", ref->getRef());
-      surfaceId->appendf("{0:d}-{1:d}", imgRef.gen, imgRef.num);
-      char *idBuffer = copyString(surfaceId->getCString());
-      st = cairo_surface_set_mime_data (image, CAIRO_MIME_TYPE_UNIQUE_ID,
-                                        (const unsigned char *)idBuffer,
-                                        surfaceId->getLength(),
-                                        gfree, idBuffer);
-      if (st)
-        gfree(idBuffer);
-      delete surfaceId;
     }
 #endif
+    if (!status) {
+      status = cairo_surface_set_mime_data (image, mime_type,
+					    (const unsigned char *)strBuffer, len,
+					    gfree, strBuffer);
+    }
 
-    st = cairo_surface_set_mime_data (image,
+    if (status)
-				      str->getKind() == strDCT ?
-				      CAIRO_MIME_TYPE_JPEG : CAIRO_MIME_TYPE_JP2,
-				      (const unsigned char *)strBuffer, len,
-				      gfree, strBuffer);
-    if (st)
       gfree (strBuffer);
   }
 }
@@ -2730,6 +3026,7 @@ private:
   GfxImageColorMap *colorMap;
   int *maskColors;
   int current_row;
+  GBool imageError;
 
 public:
   cairo_surface_t *getSourceImage(Stream *str,
@@ -2746,6 +3043,7 @@ public:
     maskColors = maskColorsA;
     width = widthA;
     current_row = -1;
+    imageError = gFalse;
 
     /* TODO: Do we want to cache these? */
     imgStr = new ImageStream(str, width,
@@ -2824,7 +3122,7 @@ public:
     return image;
   }
 
-  void getRow(int row_num, uint32_t *row_data) {
+  void getRow(int row_num, uint32_t *row_data) override {
     int i;
     Guchar *pix;
 
@@ -2836,7 +3134,13 @@ public:
       current_row++;
     }
 
-    if (lookup) {
+    if (unlikely(pix == NULL)) {
+      memset(row_data, 0, width*4);
+      if (!imageError) {
+	error(errInternal, -1, "Bad image stream");
+	imageError = gTrue;
+      }
+    } else if (lookup) {
       Guchar *p = pix;
       GfxRGB rgb;
 
@@ -2902,7 +3206,7 @@ void CairoOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
     filter = getFilterForSurface (image, interpolate);
 
   if (!inlineImg) /* don't read stream twice if it is an inline image */
-    setMimeData(str, ref, image);
+    setMimeData(state, str, ref, colorMap, image);
 
   pattern = cairo_pattern_create_for_surface (image);
   cairo_surface_destroy (image);
@@ -2937,7 +3241,8 @@ void CairoOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
   if (maskPattern) {
     if (!printing)
       cairo_clip (cairo);
-    cairo_set_matrix (cairo, &mask_matrix);
+    if (mask)
+      cairo_set_matrix (cairo, &mask_matrix);
     cairo_mask (cairo, maskPattern);
   } else {
     if (printing)

3rdparty/poppler/git/CairoOutputDev.h

@@ -18,9 +18,11 @@
 // Copyright (C) 2005, 2006 Kristian Høgsberg <krh@redhat.com>
 // Copyright (C) 2005 Nickolay V. Shmyrev <nshmyrev@yandex.ru>
 // Copyright (C) 2006-2011, 2013 Carlos Garcia Campos <carlosgc@gnome.org>
-// Copyright (C) 2008, 2009, 2011-2013 Adrian Johnson <ajohnson@redneon.com>
+// Copyright (C) 2008, 2009, 2011-2016 Adrian Johnson <ajohnson@redneon.com>
 // Copyright (C) 2008 Michael Vrable <mvrable@cs.ucsd.edu>
 // Copyright (C) 2010-2013 Thomas Freitag <Thomas.Freitag@alfa.de>
+// Copyright (C) 2015 Suzuki Toshiya <mpsuzuki@hiroshima-u.ac.jp>
+// Copyright (C) 2016 Jason Crain <jason@aquaticape.us>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -95,114 +97,125 @@ public:
 
   // Does this device use upside-down coordinates?
   // (Upside-down means (0,0) is the top left corner of the page.)
-  virtual GBool upsideDown() { return gTrue; }
+  GBool upsideDown() override { return gTrue; }
 
   // Does this device use drawChar() or drawString()?
-  virtual GBool useDrawChar() { return gTrue; }
+  GBool useDrawChar() override { return gTrue; }
 
   // Does this device use tilingPatternFill()?  If this returns false,
   // tiling pattern fills will be reduced to a series of other drawing
   // operations.
-  virtual GBool useTilingPatternFill() { return gTrue; }
+  GBool useTilingPatternFill() override { return gTrue; }
 
   // Does this device use functionShadedFill(), axialShadedFill(), and
   // radialShadedFill()?  If this returns false, these shaded fills
   // will be reduced to a series of other drawing operations.
 #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 12, 0)
-  virtual GBool useShadedFills(int type) { return type <= 7; }
+  GBool useShadedFills(int type) override { return type <= 7; }
 #else
-  virtual GBool useShadedFills(int type) { return type < 4; }
+  GBool useShadedFills(int type) override { return type > 1 && type < 4; }
 #endif
 
   // Does this device use FillColorStop()?
-  virtual GBool useFillColorStop() { return gTrue; }
+  GBool useFillColorStop() override { return gTrue; }
 
   // Does this device use beginType3Char/endType3Char?  Otherwise,
   // text in Type 3 fonts will be drawn with drawChar/drawString.
-  virtual GBool interpretType3Chars() { return gFalse; }
+  GBool interpretType3Chars() override { return gFalse; }
+
+  // Does this device need to clip pages to the crop box even when the
+  // box is the crop box?
+  GBool needClipToCropBox() override { return gTrue; }
+
+  // Does this device need to clip pages to the crop box even when the
+  // box is the crop box?
+  virtual GBool needClipToCropBox() { return gTrue; }
 
   //----- initialization and control
 
   // Start a page.
-  virtual void startPage(int pageNum, GfxState *state, XRef *xref);
+  void startPage(int pageNum, GfxState *state, XRef *xref) override;
 
   // End a page.
-  virtual void endPage();
+  void endPage() override;
 
   //----- save/restore graphics state
-  virtual void saveState(GfxState *state);
+  void saveState(GfxState *state) override;
-  virtual void restoreState(GfxState *state);
+  void restoreState(GfxState *state) override;
 
   //----- update graphics state
-  virtual void updateAll(GfxState *state);
+  void updateAll(GfxState *state) override;
-  virtual void setDefaultCTM(double *ctm);
+  void setDefaultCTM(double *ctm) override;
-  virtual void updateCTM(GfxState *state, double m11, double m12,
+  void updateCTM(GfxState *state, double m11, double m12,
-			 double m21, double m22, double m31, double m32);
+		 double m21, double m22, double m31, double m32) override;
-  virtual void updateLineDash(GfxState *state);
+  void updateLineDash(GfxState *state) override;
-  virtual void updateFlatness(GfxState *state);
+  void updateFlatness(GfxState *state) override;
-  virtual void updateLineJoin(GfxState *state);
+  void updateLineJoin(GfxState *state) override;
-  virtual void updateLineCap(GfxState *state);
+  void updateLineCap(GfxState *state) override;
-  virtual void updateMiterLimit(GfxState *state);
+  void updateMiterLimit(GfxState *state) override;
-  virtual void updateLineWidth(GfxState *state);
+  void updateLineWidth(GfxState *state) override;
-  virtual void updateFillColor(GfxState *state);
+  void updateFillColor(GfxState *state) override;
-  virtual void updateStrokeColor(GfxState *state);
+  void updateStrokeColor(GfxState *state) override;
-  virtual void updateFillOpacity(GfxState *state);
+  void updateFillOpacity(GfxState *state) override;
-  virtual void updateStrokeOpacity(GfxState *state);
+  void updateStrokeOpacity(GfxState *state) override;
-  virtual void updateFillColorStop(GfxState *state, double offset);
+  void updateFillColorStop(GfxState *state, double offset) override;
-  virtual void updateBlendMode(GfxState *state);
+  void updateBlendMode(GfxState *state) override;
 
   //----- update text state
-  virtual void updateFont(GfxState *state);
+  void updateFont(GfxState *state) override;
 
   //----- path painting
-  virtual void stroke(GfxState *state);
+  void stroke(GfxState *state) override;
-  virtual void fill(GfxState *state);
+  void fill(GfxState *state) override;
-  virtual void eoFill(GfxState *state);
+  void eoFill(GfxState *state) override;
-  virtual void clipToStrokePath(GfxState *state);
+  void clipToStrokePath(GfxState *state) override;
-  virtual GBool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, Object *str,
+  GBool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, Object *str,
-				  double *pmat, int paintType, int tilingType, Dict *resDict,
+			  double *pmat, int paintType, int tilingType, Dict *resDict,
-				  double *mat, double *bbox,
+			  double *mat, double *bbox,
-				  int x0, int y0, int x1, int y1,
+			  int x0, int y0, int x1, int y1,
-				  double xStep, double yStep);
+			  double xStep, double yStep) override;
-  virtual GBool axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax);
-  virtual GBool axialShadedSupportExtend(GfxState *state, GfxAxialShading *shading);
-  virtual GBool radialShadedFill(GfxState *state, GfxRadialShading *shading, double sMin, double sMax);
-  virtual GBool radialShadedSupportExtend(GfxState *state, GfxRadialShading *shading);
 #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 12, 0)
-  virtual GBool gouraudTriangleShadedFill(GfxState *state, GfxGouraudTriangleShading *shading);
+  GBool functionShadedFill(GfxState *state, GfxFunctionShading *shading) override;
-  virtual GBool patchMeshShadedFill(GfxState *state, GfxPatchMeshShading *shading);
+#endif
+  GBool axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax) override;
+  GBool axialShadedSupportExtend(GfxState *state, GfxAxialShading *shading) override;
+  GBool radialShadedFill(GfxState *state, GfxRadialShading *shading, double sMin, double sMax) override;
+  GBool radialShadedSupportExtend(GfxState *state, GfxRadialShading *shading) override;
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 12, 0)
+  GBool gouraudTriangleShadedFill(GfxState *state, GfxGouraudTriangleShading *shading) override;
+  GBool patchMeshShadedFill(GfxState *state, GfxPatchMeshShading *shading) override;
 #endif
 
   //----- path clipping
-  virtual void clip(GfxState *state);
+  void clip(GfxState *state) override;
-  virtual void eoClip(GfxState *state);
+  void eoClip(GfxState *state) override;
 
   //----- text drawing
-  void beginString(GfxState *state, GooString *s);
+  void beginString(GfxState *state, GooString *s) override;
-  void endString(GfxState *state);
+  void endString(GfxState *state) override;
   void drawChar(GfxState *state, double x, double y,
 		double dx, double dy,
 		double originX, double originY,
-		CharCode code, int nBytes, Unicode *u, int uLen);
+		CharCode code, int nBytes, Unicode *u, int uLen) override;
-  void beginActualText(GfxState *state, GooString *text);
+  void beginActualText(GfxState *state, GooString *text) override;
-  void endActualText(GfxState *state);
+  void endActualText(GfxState *state) override;
 
-  virtual GBool beginType3Char(GfxState *state, double x, double y,
+  GBool beginType3Char(GfxState *state, double x, double y,
-			       double dx, double dy,
+		       double dx, double dy,
-			       CharCode code, Unicode *u, int uLen);
+		       CharCode code, Unicode *u, int uLen) override;
-  virtual void endType3Char(GfxState *state);
+  void endType3Char(GfxState *state) override;
-  virtual void beginTextObject(GfxState *state);
+  void beginTextObject(GfxState *state) override;
-  virtual void endTextObject(GfxState *state);
+  void endTextObject(GfxState *state) override;
 
   //----- image drawing
-  virtual void drawImageMask(GfxState *state, Object *ref, Stream *str,
+  void drawImageMask(GfxState *state, Object *ref, Stream *str,
-			     int width, int height, GBool invert, GBool interpolate,
+		     int width, int height, GBool invert, GBool interpolate,
-			     GBool inlineImg);
+		     GBool inlineImg) override;
-  virtual void setSoftMaskFromImageMask(GfxState *state,
+  void setSoftMaskFromImageMask(GfxState *state,
-					Object *ref, Stream *str,
+				Object *ref, Stream *str,
-					int width, int height, GBool invert,
+				int width, int height, GBool invert,
-					GBool inlineImg, double *baseMatrix);
+				GBool inlineImg, double *baseMatrix) override;
-  virtual void unsetSoftMaskFromImageMask(GfxState *state, double *baseMatrix);
+  void unsetSoftMaskFromImageMask(GfxState *state, double *baseMatrix) override;
   void drawImageMaskPrescaled(GfxState *state, Object *ref, Stream *str,
 			      int width, int height, GBool invert, GBool interpolate,
 			      GBool inlineImg);
@@ -210,42 +223,42 @@ public:
 			    int width, int height, GBool invert, GBool interpolate,
 			    GBool inlineImg);
 
-  virtual void drawImage(GfxState *state, Object *ref, Stream *str,
+  void drawImage(GfxState *state, Object *ref, Stream *str,
-			 int width, int height, GfxImageColorMap *colorMap,
+		 int width, int height, GfxImageColorMap *colorMap,
-			 GBool interpolate, int *maskColors, GBool inlineImg);
+		 GBool interpolate, int *maskColors, GBool inlineImg) override;
-  virtual void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
+  void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
-				   int width, int height,
+			   int width, int height,
-				   GfxImageColorMap *colorMap,
+			   GfxImageColorMap *colorMap,
-				   GBool interpolate,
+			   GBool interpolate,
-				   Stream *maskStr,
+			   Stream *maskStr,
-				   int maskWidth, int maskHeight,
+			   int maskWidth, int maskHeight,
-				   GfxImageColorMap *maskColorMap,
+			   GfxImageColorMap *maskColorMap,
-				   GBool maskInterpolate);
+			   GBool maskInterpolate) override;
 
-  virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str,
+  void drawMaskedImage(GfxState *state, Object *ref, Stream *str,
-			       int width, int height,
+		       int width, int height,
-			       GfxImageColorMap *colorMap,
+		       GfxImageColorMap *colorMap,
-			       GBool interpolate,
+		       GBool interpolate,
-			       Stream *maskStr,
+		       Stream *maskStr,
-			       int maskWidth, int maskHeight,
+		       int maskWidth, int maskHeight,
-			       GBool maskInvert, GBool maskInterpolate);
+		       GBool maskInvert, GBool maskInterpolate) override;
 
   //----- transparency groups and soft masks
-  virtual void beginTransparencyGroup(GfxState * /*state*/, double * /*bbox*/,
+  void beginTransparencyGroup(GfxState * /*state*/, double * /*bbox*/,
                                       GfxColorSpace * /*blendingColorSpace*/,
                                       GBool /*isolated*/, GBool /*knockout*/,
-                                      GBool /*forSoftMask*/);
+                                      GBool /*forSoftMask*/) override;
-  virtual void endTransparencyGroup(GfxState * /*state*/);
+  void endTransparencyGroup(GfxState * /*state*/) override;
   void popTransparencyGroup();
-  virtual void paintTransparencyGroup(GfxState * /*state*/, double * /*bbox*/);
+  void paintTransparencyGroup(GfxState * /*state*/, double * /*bbox*/) override;
-  virtual void setSoftMask(GfxState * /*state*/, double * /*bbox*/, GBool /*alpha*/,
+  void setSoftMask(GfxState * /*state*/, double * /*bbox*/, GBool /*alpha*/,
-                           Function * /*transferFunc*/, GfxColor * /*backdropColor*/);
+		   Function * /*transferFunc*/, GfxColor * /*backdropColor*/) override;
-  virtual void clearSoftMask(GfxState * /*state*/);
+  void clearSoftMask(GfxState * /*state*/) override;
 
   //----- Type 3 font operators
-  virtual void type3D0(GfxState *state, double wx, double wy);
+  void type3D0(GfxState *state, double wx, double wy) override;
-  virtual void type3D1(GfxState *state, double wx, double wy,
+  void type3D1(GfxState *state, double wx, double wy,
-      double llx, double lly, double urx, double ury);
+	       double llx, double lly, double urx, double ury) override;
 
   //----- special access
 
@@ -257,6 +270,7 @@ public:
   void setCairo (cairo_t *cr);
   void setTextPage (TextPage *text);
   void setPrinting (GBool printing) { this->printing = printing; needFontUpdate = gTrue; }
+  void setAntialias(cairo_antialias_t antialias);
 
   void setInType3Char(GBool inType3Char) { this->inType3Char = inType3Char; }
   void getType3GlyphWidth (double *wx, double *wy) { *wx = t3_glyph_wx; *wy = t3_glyph_wy; }
@@ -272,11 +286,14 @@ protected:
   cairo_filter_t getFilterForSurface(cairo_surface_t *image,
 				     GBool interpolate);
   GBool getStreamData (Stream *str, char **buffer, int *length);
-  // pdf2htmlEX: make setMimeData virtual, we need to override it
+  void setMimeData(GfxState *state, Stream *str, Object *ref,
-  virtual 
+		   GfxImageColorMap *colorMap, cairo_surface_t *image);
-  void setMimeData(Stream *str, Object *ref, cairo_surface_t *image);
   void fillToStrokePathClip(GfxState *state);
   void alignStrokeCoords(GfxSubpath *subpath, int i, double *x, double *y);
+#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 14, 0)
+  GBool setMimeDataForJBIG2Globals (Stream *str, cairo_surface_t *image);
+#endif
+  static void setContextAntialias(cairo_t *cr, cairo_antialias_t antialias);
 
   GfxRGB fill_color, stroke_color;
   cairo_pattern_t *fill_pattern, *stroke_pattern;
@@ -298,6 +315,7 @@ protected:
     cairo_line_cap_t cap;
     cairo_line_join_t join;
     double miter;
+    int ref_count;
   } *strokePathClip;
 
   PDFDoc *doc;			// the current document
@@ -313,6 +331,7 @@ protected:
   GBool needFontUpdate;                // set when the font needs to be updated
   GBool printing;
   GBool use_show_text_glyphs;
+  GBool text_matrix_valid;
   cairo_surface_t *surface;
   cairo_glyph_t *glyphs;
   int glyphCount;
@@ -327,7 +346,7 @@ protected:
   double t3_glyph_wx, t3_glyph_wy;
   GBool t3_glyph_has_bbox;
   double t3_glyph_bbox[4];
-
+  cairo_antialias_t antialias;
   GBool prescaleImages;
 
   TextPage *text;		// text for the current page
@@ -373,118 +392,118 @@ public:
 
   // Does this device use upside-down coordinates?
   // (Upside-down means (0,0) is the top left corner of the page.)
-  virtual GBool upsideDown() { return gTrue; }
+  GBool upsideDown() override { return gTrue; }
 
   // Does this device use drawChar() or drawString()?
-  virtual GBool useDrawChar() { return gFalse; }
+  GBool useDrawChar() override { return gFalse; }
 
   // Does this device use tilingPatternFill()?  If this returns false,
   // tiling pattern fills will be reduced to a series of other drawing
   // operations.
-  virtual GBool useTilingPatternFill() { return gTrue; }
+  GBool useTilingPatternFill() override { return gTrue; }
 
   // Does this device use functionShadedFill(), axialShadedFill(), and
   // radialShadedFill()?  If this returns false, these shaded fills
   // will be reduced to a series of other drawing operations.
 #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 11, 2)
-  virtual GBool useShadedFills(int type) { return type <= 7; }
+  GBool useShadedFills(int type) override { return type <= 7; }
 #else
-  virtual GBool useShadedFills(int type) { return type < 4; }
+  GBool useShadedFills(int type) override { return type < 4; }
 #endif
 
   // Does this device use FillColorStop()?
-  virtual GBool useFillColorStop() { return gFalse; }
+  GBool useFillColorStop() override { return gFalse; }
 
   // Does this device use beginType3Char/endType3Char?  Otherwise,
   // text in Type 3 fonts will be drawn with drawChar/drawString.
-  virtual GBool interpretType3Chars() { return gFalse; }
+  GBool interpretType3Chars() override { return gFalse; }
 
   // Does this device need non-text content?
-  virtual GBool needNonText() { return gTrue; }
+  GBool needNonText() override { return gTrue; }
 
   //----- save/restore graphics state
-  virtual void saveState(GfxState *state) { }
+  void saveState(GfxState *state) override { }
-  virtual void restoreState(GfxState *state) { }
+  void restoreState(GfxState *state) override { }
 
   //----- update graphics state
-  virtual void updateAll(GfxState *state) { }
+  void updateAll(GfxState *state) override { }
-  virtual void setDefaultCTM(double *ctm) { }
+  void setDefaultCTM(double *ctm) override { }
-  virtual void updateCTM(GfxState *state, double m11, double m12,
+  void updateCTM(GfxState *state, double m11, double m12,
-				 double m21, double m22, double m31, double m32) { }
+		 double m21, double m22, double m31, double m32) override { }
-  virtual void updateLineDash(GfxState *state) { }
+  void updateLineDash(GfxState *state) override { }
-  virtual void updateFlatness(GfxState *state) { }
+  void updateFlatness(GfxState *state) override { }
-  virtual void updateLineJoin(GfxState *state) { }
+  void updateLineJoin(GfxState *state) override { }
-  virtual void updateLineCap(GfxState *state) { }
+  void updateLineCap(GfxState *state) override { }
-  virtual void updateMiterLimit(GfxState *state) { }
+  void updateMiterLimit(GfxState *state) override { }
-  virtual void updateLineWidth(GfxState *state) { }
+  void updateLineWidth(GfxState *state) override { }
-  virtual void updateFillColor(GfxState *state) { }
+  void updateFillColor(GfxState *state) override { }
-  virtual void updateStrokeColor(GfxState *state) { }
+  void updateStrokeColor(GfxState *state) override { }
-  virtual void updateFillOpacity(GfxState *state) { }
+  void updateFillOpacity(GfxState *state) override { }
-  virtual void updateStrokeOpacity(GfxState *state) { }
+  void updateStrokeOpacity(GfxState *state) override { }
-  virtual void updateBlendMode(GfxState *state) { }
+  void updateBlendMode(GfxState *state) override { }
 
   //----- update text state
-  virtual void updateFont(GfxState *state) { }
+  void updateFont(GfxState *state) override { }
 
   //----- path painting
-  virtual void stroke(GfxState *state) { }
+  void stroke(GfxState *state) override { }
-  virtual void fill(GfxState *state) { }
+  void fill(GfxState *state) override { }
-  virtual void eoFill(GfxState *state) { }
+  void eoFill(GfxState *state) override { }
-  virtual void clipToStrokePath(GfxState *state) { }
+  void clipToStrokePath(GfxState *state) override { }
-  virtual GBool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, Object *str,
+  GBool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, Object *str,
-				  double *pmat, int paintType, int tilingType, Dict *resDict,
+			  double *pmat, int paintType, int tilingType, Dict *resDict,
-				  double *mat, double *bbox,
+			  double *mat, double *bbox,
-				  int x0, int y0, int x1, int y1,
+			  int x0, int y0, int x1, int y1,
-				  double xStep, double yStep) { return gTrue; }
+			  double xStep, double yStep) override { return gTrue; }
-  virtual GBool axialShadedFill(GfxState *state,
+  GBool axialShadedFill(GfxState *state,
-				GfxAxialShading *shading,
+			GfxAxialShading *shading,
-				double tMin, double tMax) { return gTrue; }
+			double tMin, double tMax) override { return gTrue; }
-  virtual GBool radialShadedFill(GfxState *state,
+  GBool radialShadedFill(GfxState *state,
-				 GfxRadialShading *shading,
+			 GfxRadialShading *shading,
-				 double sMin, double sMax) { return gTrue; }
+			 double sMin, double sMax) override { return gTrue; }
 
   //----- path clipping
-  virtual void clip(GfxState *state) { }
+  void clip(GfxState *state) override { }
-  virtual void eoClip(GfxState *state) { }
+  void eoClip(GfxState *state) override { }
 
   //----- image drawing
-  virtual void drawImageMask(GfxState *state, Object *ref, Stream *str,
+  void drawImageMask(GfxState *state, Object *ref, Stream *str,
-			     int width, int height, GBool invert,
+		     int width, int height, GBool invert,
-			     GBool interpolate, GBool inlineImg);
+		     GBool interpolate, GBool inlineImg) override;
-  virtual void drawImage(GfxState *state, Object *ref, Stream *str,
+  void drawImage(GfxState *state, Object *ref, Stream *str,
-			 int width, int height, GfxImageColorMap *colorMap,
+		 int width, int height, GfxImageColorMap *colorMap,
-			 GBool interpolate, int *maskColors, GBool inlineImg);
+		 GBool interpolate, int *maskColors, GBool inlineImg) override;
-  virtual void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
+  void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
-				   int width, int height,
+			   int width, int height,
-				   GfxImageColorMap *colorMap,
+			   GfxImageColorMap *colorMap,
-				   GBool interpolate,
+			   GBool interpolate,
-				   Stream *maskStr,
+			   Stream *maskStr,
-				   int maskWidth, int maskHeight,
+			   int maskWidth, int maskHeight,
-				   GfxImageColorMap *maskColorMap,
+			   GfxImageColorMap *maskColorMap,
-				   GBool maskInterpolate);
+			   GBool maskInterpolate) override;
-  virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str,
+  void drawMaskedImage(GfxState *state, Object *ref, Stream *str,
-			       int width, int height,
+		       int width, int height,
-			       GfxImageColorMap *colorMap,
+		       GfxImageColorMap *colorMap,
-			       GBool interpolate,
+		       GBool interpolate,
-			       Stream *maskStr,
+		       Stream *maskStr,
-			       int maskWidth, int maskHeight,
+		       int maskWidth, int maskHeight,
-			       GBool maskInvert, GBool maskInterpolate);
+		       GBool maskInvert, GBool maskInterpolate) override;
-  virtual void setSoftMaskFromImageMask(GfxState *state, Object *ref, Stream *str,
+  void setSoftMaskFromImageMask(GfxState *state, Object *ref, Stream *str,
-                                        int width, int height, GBool invert,
+				int width, int height, GBool invert,
-                                        GBool inlineImg, double *baseMatrix);
+				GBool inlineImg, double *baseMatrix) override;
-  virtual void unsetSoftMaskFromImageMask(GfxState *state, double *baseMatrix) {}
+  void unsetSoftMaskFromImageMask(GfxState *state, double *baseMatrix) override {}
 
 
   //----- transparency groups and soft masks
-  virtual void beginTransparencyGroup(GfxState * /*state*/, double * /*bbox*/,
+  void beginTransparencyGroup(GfxState * /*state*/, double * /*bbox*/,
-				      GfxColorSpace * /*blendingColorSpace*/,
+			      GfxColorSpace * /*blendingColorSpace*/,
-				      GBool /*isolated*/, GBool /*knockout*/,
+			      GBool /*isolated*/, GBool /*knockout*/,
-				      GBool /*forSoftMask*/) {}
+			      GBool /*forSoftMask*/) override {}
-  virtual void endTransparencyGroup(GfxState * /*state*/) {}
+  void endTransparencyGroup(GfxState * /*state*/) override {}
-  virtual void paintTransparencyGroup(GfxState * /*state*/, double * /*bbox*/) {}
+  void paintTransparencyGroup(GfxState * /*state*/, double * /*bbox*/) override {}
-  virtual void setSoftMask(GfxState * /*state*/, double * /*bbox*/, GBool /*alpha*/,
+  void setSoftMask(GfxState * /*state*/, double * /*bbox*/, GBool /*alpha*/,
-			   Function * /*transferFunc*/, GfxColor * /*backdropColor*/) {}
+		   Function * /*transferFunc*/, GfxColor * /*backdropColor*/) override {}
-  virtual void clearSoftMask(GfxState * /*state*/) {}
+  void clearSoftMask(GfxState * /*state*/) override {}
 
   //----- Image list
   // By default images are not rendred

3rdparty/poppler/git/CairoRescaleBox.cc

@@ -51,6 +51,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include "goo/gmem.h"
+//#include "goo/gtypes_p.h"
 #include "CairoRescaleBox.h"
 
 

CMakeLists.txt

@@ -9,7 +9,7 @@ option(ENABLE_SVG "Enable SVG support, for generating SVG background images and
 
 include_directories(${CMAKE_SOURCE_DIR}/src)
 
-set(PDF2HTMLEX_VERSION "0.14.6")
+set(PDF2HTMLEX_VERSION "0.15.0")
 set(ARCHIVE_NAME pdf2htmlex-${PDF2HTMLEX_VERSION})
 add_custom_target(dist
     COMMAND git archive --prefix=${ARCHIVE_NAME}/ HEAD
@@ -81,7 +81,7 @@ endif()
 if(CYGWIN)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
 else()
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -pthread")
 endif()
 
 # check the C++11 features we need

README.md

@@ -2,6 +2,28 @@ pdf2htmlEX is no longer under active development. New maintainers are [wanted](h
 
 #![](http://coolwanglu.github.io/pdf2htmlEX/images/pdf2htmlEX-64x64.png) pdf2htmlEX 
 
+# My branch differences:
+
+This is my branch of pdf2htmlEX which I maintain for my own purposes. I have made a number of changes and improvements over the original code:
+
+* Lots of bugs fixes, mostly of edge cases
+* Integration of latest Cairo code
+* Out of source building
+* Rewritten handling of obscured/partially obscured text - now much more accurate
+* Some support for transparent text
+* Improvement of DPI settings - clamping of DPI to ensure output graphic isn't too big
+
+`--correct-text-visibility` tracks the visibility of 4 sample points for each character (currently the 4 corners of the character's bounding box, inset slightly) to determine visibility.
+It now has two modes. 1 = Fully occluded text handled (i.e. doesn't get put into the HTML layer). 2 = Partially occluded text handled.
+
+The default is now "1", so fully occluded text should no longer show through. If "2" is selected then if the character is partially occluded it will be drawn in the background layer. In this case, the rendered DPI of the page will be automatically increased to `--covered-text-dpi` (default: 300) to reduce the impact of rasterized text.
+
+For maximum accuracy I strongly recommend using the output options: `--font-size-multiplier 1 --zoom 25`. This will circumvent rounding errors inside web browsers. You will then have to scale down the resulting HTML page using an appropriate "scale" transform.
+
+If you are concerned about file size of the resulting HTML, then I recommend patching fontforge to prevent it writing the current time into the dumped fonts, and then post-process the pdf2htmlEX data to remove duplicate files - there will usually be many duplicate background images and fonts.
+
+# Original README.md follows...
+
 <!--
 [![Build Status](https://travis-ci.org/coolwanglu/pdf2htmlEX.png?branch=master)](https://travis-ci.org/coolwanglu/pdf2htmlEX)
 -->

dobuild

@@ -0,0 +1,4 @@
+mkdir build
+cd build
+cmake ..
+make install

doclean

@@ -0,0 +1 @@
+rm -rf build pdf2htmlEX.1 share/*.css share/*.js share/*.min.* src/pdf2htmlEX-config.h src/util/css_const.h

pdf2htmlEX.1.in

@@ -247,9 +247,10 @@ If set to 0, pdf2htmlEX would try its best to balance the two methods above.
 If set to 1, pdf2htmlEX will try to reduce the number of HTML elements used for text. Turn it off if anything goes wrong.
 
 .TP
-.B --correct-text-visibility <0|1> (Default: 0)
+.B --correct-text-visibility <0|1|2> (Default: 1)
-If set to 1, pdf2htmlEX will try to detect texts covered by other graphics and properly arrange them, 
+0 : Do not do visibility calculations for text
-i.e. covered texts are made transparent in text layer, and are drawn on background layer.
+1 : Text fully occluded will be drawn in the background layer
+2 : Text partially occluded will be drawn in the background layer (more false positives than option "1")
 
 .SS Background Image
 

src/BackgroundRenderer/CairoBackgroundRenderer.cc

@@ -134,9 +134,9 @@ bool CairoBackgroundRenderer::render_page(PDFDoc * doc, int pageno)
     if(param.embed_image)
         html_renderer->tmp_files.add(fn);
 
-    surface = cairo_svg_surface_create(fn.c_str(), page_width * param.h_dpi / DEFAULT_DPI, page_height * param.v_dpi / DEFAULT_DPI);
+    surface = cairo_svg_surface_create(fn.c_str(), page_width * param.actual_dpi / DEFAULT_DPI, page_height * param.actual_dpi / DEFAULT_DPI);
     cairo_svg_surface_restrict_to_version(surface, CAIRO_SVG_VERSION_1_2);
-    cairo_surface_set_fallback_resolution(surface, param.h_dpi, param.v_dpi);
+    cairo_surface_set_fallback_resolution(surface, param.actual_dpi, param.actual_dpi);
 
     cairo_t * cr = cairo_create(surface);
     setCairo(cr);
@@ -144,7 +144,7 @@ bool CairoBackgroundRenderer::render_page(PDFDoc * doc, int pageno)
     bitmaps_in_current_page.clear();
 
     bool process_annotation = param.process_annotation;
-    doc->displayPage(this, pageno, param.h_dpi, param.v_dpi,
+    doc->displayPage(this, pageno, param.actual_dpi, param.actual_dpi,
             0,
             (!(param.use_cropbox)),
             false,
@@ -235,11 +235,11 @@ string CairoBackgroundRenderer::build_bitmap_path(int id)
     return string(html_renderer->str_fmt("%s/o%d.jpg", param.dest_dir.c_str(), id));
 }
 // Override CairoOutputDev::setMimeData() and dump bitmaps in SVG to external files.
-void CairoBackgroundRenderer::setMimeData(Stream *str, Object *ref, cairo_surface_t *image)
+void CairoBackgroundRenderer::setMimeData(GfxState *state, Stream *str, Object *ref, GfxImageColorMap *colorMap, cairo_surface_t *image)
 {
     if (param.svg_embed_bitmap)
     {
-        CairoOutputDev::setMimeData(str, ref, image);
+        CairoOutputDev::setMimeData(state, str, ref, colorMap, image);
         return;
     }
 
@@ -263,21 +263,20 @@ void CairoBackgroundRenderer::setMimeData(Stream *str, Object *ref, cairo_surfac
     //
     // In PDF, jpeg stream objects can also specify other color spaces like DeviceN and Separation,
     // It is also not safe to dump them directly.
-    Object obj;
+    Object obj = str->getDict()->lookup("ColorSpace");
-    str->getDict()->lookup("ColorSpace", &obj);
     if (!obj.isName() || (strcmp(obj.getName(), "DeviceRGB") && strcmp(obj.getName(), "DeviceGray")) )
     {
-        obj.free();
+        //obj.free();
         return;
     }
-    obj.free();
+    //obj.free();
-    str->getDict()->lookup("Decode", &obj);
+    obj = str->getDict()->lookup("Decode");
     if (obj.isArray())
     {
-        obj.free();
+        //obj.free();
         return;
     }
-    obj.free();
+    //obj.free();
 
     int imgId = ref->getRef().num;
     auto uri = strdup((char*) html_renderer->str_fmt("o%d.jpg", imgId));

src/BackgroundRenderer/CairoBackgroundRenderer.h

@@ -51,7 +51,7 @@ public:
   void updateRender(GfxState *state);
 
 protected:
-  virtual void setMimeData(Stream *str, Object *ref, cairo_surface_t *image);
+  virtual void setMimeData(GfxState *state, Stream *str, Object *ref, GfxImageColorMap *colorMap, cairo_surface_t *image);
 
 protected:
   HTMLRenderer * html_renderer;

src/BackgroundRenderer/SplashBackgroundRenderer.cc

@@ -29,7 +29,7 @@ using std::unique_ptr;
 const SplashColor SplashBackgroundRenderer::white = {255,255,255};
 
 SplashBackgroundRenderer::SplashBackgroundRenderer(const string & imgFormat, HTMLRenderer * html_renderer, const Param & param)
-    : SplashOutputDev(splashModeRGB8, 4, gFalse, (SplashColorPtr)(&white))
+    : SplashOutputDev(splashModeRGB8, 4, gFalse, (SplashColorPtr)(&white), gTrue, splashThinLineSolid) // DCRH: Make thin line mode = solid
     , html_renderer(html_renderer)
     , param(param)
     , format(imgFormat)
@@ -67,30 +67,10 @@ void SplashBackgroundRenderer::drawChar(GfxState *state, double x, double y,
   double originX, double originY,
   CharCode code, int nBytes, Unicode *u, int uLen)
 {
-    // draw characters as image when
+    if (param.proof || html_renderer->is_char_covered(drawn_char_count)) {
-    // - in fallback mode
-    // - OR there is special filling method
-    // - OR using a writing mode font
-    // - OR using a Type 3 font while param.process_type3 is not enabled
-    // - OR the text is used as path
-    if((param.fallback || param.proof)
-       || ( (state->getFont()) 
-            && ( (state->getFont()->getWMode())
-                 || ((state->getFont()->getType() == fontType3) && (!param.process_type3))
-                 || (state->getRender() >= 4)
-               )
-          )
-      )
-    {
         SplashOutputDev::drawChar(state,x,y,dx,dy,originX,originY,code,nBytes,u,uLen);
     }
-    // If a char is treated as image, it is not subject to cover test
+    drawn_char_count++;
-    // (see HTMLRenderer::drawString), so don't increase drawn_char_count.
-    else if (param.correct_text_visibility) {
-        if (html_renderer->is_char_covered(drawn_char_count))
-            SplashOutputDev::drawChar(state,x,y,dx,dy,originX,originY,code,nBytes,u,uLen);
-        drawn_char_count++;
-    }
 }
 
 void SplashBackgroundRenderer::beginTextObject(GfxState *state)
@@ -134,7 +114,8 @@ bool SplashBackgroundRenderer::render_page(PDFDoc * doc, int pageno)
 {
     drawn_char_count = 0;
     bool process_annotation = param.process_annotation;
-    doc->displayPage(this, pageno, param.h_dpi, param.v_dpi,
+
+    doc->displayPage(this, pageno, param.actual_dpi, param.actual_dpi,
             0, 
             (!(param.use_cropbox)),
             false, false,
@@ -159,8 +140,8 @@ void SplashBackgroundRenderer::embed_image(int pageno)
             dump_image((char*)fn, xmin, ymin, xmax, ymax);
         }
 
-        double h_scale = html_renderer->text_zoom_factor() * DEFAULT_DPI / param.h_dpi;
+        double h_scale = html_renderer->text_zoom_factor() * DEFAULT_DPI / param.actual_dpi;
-        double v_scale = html_renderer->text_zoom_factor() * DEFAULT_DPI / param.v_dpi;
+        double v_scale = html_renderer->text_zoom_factor() * DEFAULT_DPI / param.actual_dpi;
 
         auto & f_page = *(html_renderer->f_curpage);
         auto & all_manager = html_renderer->all_manager;
@@ -227,7 +208,7 @@ void SplashBackgroundRenderer::dump_image(const char * filename, int x1, int y1,
         throw string("Image format not supported: ") + format;
     }
 
-    if(!writer->init(f, width, height, param.h_dpi, param.v_dpi))
+    if(!writer->init(f, width, height, param.actual_dpi, param.actual_dpi))
         throw "Cannot initialize image writer";
         
     auto * bitmap = getBitmap();

src/CoveredTextDetector.cc

@@ -7,43 +7,110 @@
 
 #include "CoveredTextDetector.h"
 
+#include <algorithm>
 #include "util/math.h"
 
+//#define DEBUG
+
 namespace pdf2htmlEX {
 
+CoveredTextDetector::CoveredTextDetector(Param & param): param(param)
+{
+}
+
 void CoveredTextDetector::reset()
 {
     char_bboxes.clear();
     chars_covered.clear();
+    char_pts_visible.clear();
 }
 
-void CoveredTextDetector::add_char_bbox(double * bbox)
+void CoveredTextDetector::add_char_bbox(cairo_t *cairo, double * bbox)
 {
     char_bboxes.insert(char_bboxes.end(), bbox, bbox + 4);
     chars_covered.push_back(false);
+    char_pts_visible.push_back(1|2|4|8);
 }
 
-void CoveredTextDetector::add_char_bbox_clipped(double * bbox, bool patially)
+void CoveredTextDetector::add_char_bbox_clipped(cairo_t *cairo, double * bbox, int pts_visible)
 {
+#ifdef DEBUG
+    printf("add_char_bbox_clipped: pts_visible:%x: [%f,%f,%f,%f]\n", pts_visible, bbox[0], bbox[1], bbox[2], bbox[3]);
+#endif
     char_bboxes.insert(char_bboxes.end(), bbox, bbox + 4);
-    chars_covered.push_back(true);
+    char_pts_visible.push_back(pts_visible);
-    if (patially)
+
-        add_non_char_bbox(bbox, chars_covered.size() - 1);
+    // DCRH: Hide if no points are visible, or if some points are visible and correct_text_visibility == 2
+    if (pts_visible == 0 || param.correct_text_visibility == 2) {
+        chars_covered.push_back(true);
+        if (pts_visible > 0 && param.correct_text_visibility == 2) {
+            param.actual_dpi = std::min(param.text_dpi, param.max_dpi); // Char partially covered so increase background resolution
+        }
+    } else {
+        chars_covered.push_back(false);
+    }
 }
 
-void CoveredTextDetector::add_non_char_bbox(double * bbox, int index)
+// We now track the visibility of each corner of the char bbox. Potentially we could track
+// more sample points but this should be sufficient for most cases.
+// We check to see if each point is covered by any stroke or fill operation
+// and mark it as invisible if so
+void CoveredTextDetector::add_non_char_bbox(cairo_t *cairo, double * bbox, int what)
 {
-    if (index < 0)
+    int index = chars_covered.size();
-        index = chars_covered.size();
+    for (int i = 0; i < index; i++) {
-    for (int i = 0; i < index; i++)
-    {
         if (chars_covered[i])
             continue;
         double * cbbox = &char_bboxes[i * 4];
-        if (bbox_intersect(cbbox, bbox))
+#ifdef DEBUG
-        {
+printf("add_non_char_bbox: what=%d, cbbox:[%f,%f,%f,%f], bbox:[%f,%f,%f,%f]\n", what, cbbox[0], cbbox[1], cbbox[2], cbbox[3], bbox[0], bbox[1], bbox[2], bbox[3]);
-            chars_covered[i] = true;
+#endif
-            add_non_char_bbox(cbbox, i);
+        if (bbox_intersect(cbbox, bbox)) {
+            int pts_visible = char_pts_visible[i];
+#ifdef DEBUG
+printf("pts_visible=%x\n", pts_visible);
+#endif
+            if ((pts_visible & 1) && cairo_in_clip(cairo, cbbox[0], cbbox[1]) &&
+                    (what == 0 ||
+                    (what == 1 && cairo_in_fill(cairo, cbbox[0], cbbox[1])) ||
+                    (what == 2 && cairo_in_stroke(cairo, cbbox[0], cbbox[1])))) {
+                    pts_visible &= ~1;
+            }
+            if ((pts_visible & 2) && cairo_in_clip(cairo, cbbox[2], cbbox[1]) &&
+                    (what == 0 ||
+                    (what == 1 && cairo_in_fill(cairo, cbbox[2], cbbox[1])) ||
+                    (what == 2 && cairo_in_stroke(cairo, cbbox[2], cbbox[1])))) {
+                    pts_visible &= ~2;
+            }
+            if ((pts_visible & 4) && cairo_in_clip(cairo, cbbox[2], cbbox[3]) &&
+                    (what == 0 ||
+                    (what == 1 && cairo_in_fill(cairo, cbbox[2], cbbox[3])) ||
+                    (what == 2 && cairo_in_stroke(cairo, cbbox[2], cbbox[3])))) {
+                    pts_visible &= ~4;
+            }
+            if ((pts_visible & 8) && cairo_in_clip(cairo, cbbox[0], cbbox[3]) &&
+                    (what == 0 ||
+                    (what == 1 && cairo_in_fill(cairo, cbbox[0], cbbox[3])) ||
+                    (what == 2 && cairo_in_stroke(cairo, cbbox[0], cbbox[3])))) {
+                    pts_visible &= ~8;
+            }
+#ifdef DEBUG
+printf("pts_visible=%x\n", pts_visible);
+#endif
+            char_pts_visible[i] = pts_visible;
+            if (pts_visible == 0 || (pts_visible != (1|2|4|8) && param.correct_text_visibility == 2)) {
+#ifdef DEBUG
+printf("Char covered\n");
+#endif
+                chars_covered[i] = true;
+                if (pts_visible > 0 && param.correct_text_visibility == 2) { // Partially visible text => increase rendering DPI
+                    param.actual_dpi = std::min(param.text_dpi, param.max_dpi);
+                }
+            }
+        } else {
+#ifdef DEBUG
+printf("Not covered\n");
+#endif
         }
     }
 }

src/CoveredTextDetector.h

@@ -9,6 +9,9 @@
 #define COVEREDTEXTDETECTOR_H__
 
 #include <vector>
+#include "Param.h"
+
+#include <cairo.h>
 
 namespace pdf2htmlEX {
 
@@ -19,6 +22,8 @@ class CoveredTextDetector
 {
 public:
 
+    CoveredTextDetector(Param & param);
+
     /**
      * Reset to initial state. Should be called when start drawing a page.
      */
@@ -28,9 +33,9 @@ public:
      * Add a drawn character's bounding box.
      * @param bbox (x0, y0, x1, y1)
      */
-    void add_char_bbox(double * bbox);
+    void add_char_bbox(cairo_t *, double * bbox);
 
-    void add_char_bbox_clipped(double * bbox, bool patially);
+    void add_char_bbox_clipped(cairo_t *,double * bbox, int pts_covered);
 
     /**
      * Add a drawn non-char graphics' bounding box.
@@ -40,7 +45,7 @@ public:
      * @param index this graphics' drawing order: assume it is drawn after (index-1)th
      *   char. -1 means after the last char.
      */
-    void add_non_char_bbox(double * bbox, int index = -1);
+    void add_non_char_bbox(cairo_t *cairo, double * bbox, int what);
 
     /**
      * An array of flags indicating whether a char is covered by any non-char graphics.
@@ -54,6 +59,8 @@ private:
     std::vector<bool> chars_covered;
     // x00, y00, x01, y01; x10, y10, x11, y11;...
     std::vector<double> char_bboxes;
+    std::vector<int> char_pts_visible;
+    Param & param;
 };
 
 }

src/DrawingTracer.cc

@@ -11,18 +11,15 @@
 #include "DrawingTracer.h"
 
 #if !ENABLE_SVG
-#warning "Cairo is disabled because ENABLE_SVG is off, --correct-text-visibility has limited functionality."
+#error "ENABLE_SVG must be enabled"
 #endif
 
-static constexpr bool DT_DEBUG = false;
+//#define DEBUG
 
 namespace pdf2htmlEX
 {
 
-DrawingTracer::DrawingTracer(const Param & param): param(param)
+DrawingTracer::DrawingTracer(const Param & param): param(param), cairo(nullptr)
-#if ENABLE_SVG
-, cairo(nullptr)
-#endif
 {
 }
 
@@ -33,11 +30,8 @@ DrawingTracer::~DrawingTracer()
 
 void DrawingTracer::reset(GfxState *state)
 {
-    if (!param.correct_text_visibility)
-        return;
     finish();
 
-#if ENABLE_SVG
     // pbox is defined in device space, which is affected by zooming;
     // We want to trace in page space which is stable, so invert pbox by ctm.
     double pbox[] { 0, 0, state->getPageWidth(), state->getPageHeight() };
@@ -48,20 +42,24 @@ void DrawingTracer::reset(GfxState *state)
     cairo_rectangle_t page_box { pbox[0], pbox[1], pbox[2] - pbox[0], pbox[3] - pbox[1] };
     cairo_surface_t * surface = cairo_recording_surface_create(CAIRO_CONTENT_COLOR_ALPHA, &page_box);
     cairo = cairo_create(surface);
-    if (DT_DEBUG)
+
-        printf("DrawingTracer::reset:page bbox:[%f,%f,%f,%f]\n",pbox[0], pbox[1], pbox[2], pbox[3]);
+    ctm_stack.clear();
+    double *identity = new double[6];
+    tm_init(identity);
+    ctm_stack.push_back(identity);
+
+#ifdef DEBUG
+    printf("DrawingTracer::reset:page bbox:[%f,%f,%f,%f]\n",pbox[0], pbox[1], pbox[2], pbox[3]);
 #endif
 }
 
 void DrawingTracer::finish()
 {
-#if ENABLE_SVG
     if (cairo)
     {
         cairo_destroy(cairo);
         cairo = nullptr;
     }
-#endif
 }
 
 // Poppler won't inform us its initial CTM, and the initial CTM is affected by zoom level.
@@ -72,22 +70,17 @@ void DrawingTracer::update_ctm(GfxState *state, double m11, double m12, double m
     if (!param.correct_text_visibility)
         return;
 
-#if ENABLE_SVG
+    double *tmp = new double[6];
-    cairo_matrix_t matrix;
+    tmp[0] = m11;
-    matrix.xx = m11;
+    tmp[1] = m12;
-    matrix.yx = m12;
+    tmp[2] = m21;
-    matrix.xy = m21;
+    tmp[3] = m22;
-    matrix.yy = m22;
+    tmp[4] = m31;
-    matrix.x0 = m31;
+    tmp[5] = m32;
-    matrix.y0 = m32;
+    double *ctm = ctm_stack.back();
-    cairo_transform(cairo, &matrix);
+    tm_multiply(ctm, tmp);
-
+#ifdef DEBUG
-    if (DT_DEBUG)
+    printf("DrawingTracer::before update_ctm:ctm:[%f,%f,%f,%f,%f,%f] => [%f,%f,%f,%f,%f,%f]\n", m11, m12, m21, m22, m31, m32, ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
-    {
-        cairo_matrix_t mat;
-        cairo_get_matrix(cairo, &mat);
-        printf("DrawingTracer::update_ctm:ctm:[%f,%f,%f,%f,%f,%f]\n", mat.xx, mat.yx, mat.xy, mat.yy, mat.x0, mat.y0);
-    }
 #endif
 }
 
@@ -95,16 +88,15 @@ void DrawingTracer::clip(GfxState * state, bool even_odd)
 {
     if (!param.correct_text_visibility)
         return;
-#if ENABLE_SVG
     do_path(state, state->getPath());
     cairo_set_fill_rule(cairo, even_odd? CAIRO_FILL_RULE_EVEN_ODD : CAIRO_FILL_RULE_WINDING);
     cairo_clip (cairo);
 
-    if (DT_DEBUG)
+#ifdef DEBUG
     {
         double cbox[4];
         cairo_clip_extents(cairo, cbox, cbox + 1, cbox + 2, cbox + 3);
-        printf("DrawingTracer::clip:extents:[%f,%f,%f,%f]\n", cbox[0],cbox[1],cbox[2],cbox[3]);
+        printf("DrawingTracer::clip:extents:even_odd=%d,[%f,%f,%f,%f]\n", even_odd, cbox[0],cbox[1],cbox[2],cbox[3]);
     }
 #endif
 }
@@ -113,6 +105,8 @@ void DrawingTracer::clip_to_stroke_path(GfxState * state)
 {
     if (!param.correct_text_visibility)
         return;
+
+    printf("TODO:clip_to_stroke_path\n");
     // TODO cairo_stroke_to_path() ?
 }
 
@@ -120,92 +114,112 @@ void DrawingTracer::save()
 {
     if (!param.correct_text_visibility)
         return;
-#if ENABLE_SVG
     cairo_save(cairo);
-    if (DT_DEBUG)
+    double *e = new double[6];
-        printf("DrawingTracer::save\n");
+    memcpy(e, ctm_stack.back(), sizeof(double) * 6);
+    ctm_stack.push_back(e);
+
+#ifdef DEBUG
+    printf("DrawingTracer::saved: [%f,%f,%f,%f,%f,%f]\n", e[0], e[1], e[2], e[3], e[4], e[5]);
 #endif
 }
 void DrawingTracer::restore()
 {
     if (!param.correct_text_visibility)
         return;
-#if ENABLE_SVG
     cairo_restore(cairo);
-    if (DT_DEBUG)
+    ctm_stack.pop_back();
-        printf("DrawingTracer::restore\n");
+
+#ifdef DEBUG
+    double *ctm = ctm_stack.back();
+    printf("DrawingTracer::restored: [%f,%f,%f,%f,%f,%f]\n", ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
 #endif
 }
 
 void DrawingTracer::do_path(GfxState * state, GfxPath * path)
 {
-#if ENABLE_SVG
     //copy from CairoOutputDev::doPath
     GfxSubpath *subpath;
     int i, j;
     double x, y;
     cairo_new_path(cairo);
-    if (DT_DEBUG)
+#ifdef DEBUG
-        printf("DrawingTracer::do_path:new_path\n");
+    printf("DrawingTracer::do_path:new_path (%d subpaths)\n", path->getNumSubpaths());
+#endif
+
     for (i = 0; i < path->getNumSubpaths(); ++i) {
         subpath = path->getSubpath(i);
         if (subpath->getNumPoints() > 0) {
             x = subpath->getX(0);
             y = subpath->getY(0);
+            xform_pt(x, y);
             cairo_move_to(cairo, x, y);
-            if (DT_DEBUG)
-                printf("DrawingTracer::do_path:move_to[%f,%f]\n",x,y);
             j = 1;
             while (j < subpath->getNumPoints()) {
                 if (subpath->getCurve(j)) {
                     x = subpath->getX(j+2);
                     y = subpath->getY(j+2);
+                    double x1 = subpath->getX(j);
+                    double y1 = subpath->getY(j);
+                    double x2 = subpath->getX(j+1);
+                    double y2 = subpath->getY(j+1);
+                    xform_pt(x, y);
+                    xform_pt(x1, y1);
+                    xform_pt(x2, y2);
                     cairo_curve_to(cairo,
-                        subpath->getX(j), subpath->getY(j),
+                        x1, y1,
-                        subpath->getX(j+1), subpath->getY(j+1),
+                        x2, y2,
                         x, y);
-                    if (DT_DEBUG)
-                        printf("DrawingTracer::do_path:curve_to[%f,%f]\n",x,y);
                     j += 3;
                 } else {
                     x = subpath->getX(j);
                     y = subpath->getY(j);
+                    xform_pt(x, y);
                     cairo_line_to(cairo, x, y);
-                    if (DT_DEBUG)
-                        printf("DrawingTracer::do_path:line_to[%f,%f]\n",x,y);
                     ++j;
                 }
             }
             if (subpath->isClosed()) {
                 cairo_close_path (cairo);
-                if (DT_DEBUG)
-                    printf("DrawingTracer::do_path:close\n");
             }
         }
     }
-#endif
 }
 
 void DrawingTracer::stroke(GfxState * state)
 {
-#if ENABLE_SVG
     if (!param.correct_text_visibility)
         return;
 
-    if (DT_DEBUG)
+    if (state->getStrokeOpacity() < 0.5) {
-        printf("DrawingTracer::stroke\n");
+        // Ignore partially transparent fills for occlusion purposes
+        return;
+    }
 
-    cairo_set_line_width(cairo, state->getLineWidth());
+    // Transform the line width by the ctm. This isn't 100% - we should really do this path segment by path segment,
+    // this is a reasonable approximation providing the CTM has uniform scaling X/Y
+    double lwx, lwy;
+    lwx = lwy = sqrt(0.5);
+    tm_transform(ctm_stack.back(), lwx, lwy, true);
+    double lineWidthScale = sqrt(lwx * lwx + lwy * lwy);
+#ifdef DEBUG
+    printf("DrawingTracer::stroke. line width = %f*%f, line cap = %d\n", lineWidthScale, state->getLineWidth(), state->getLineCap());
+#endif
+    cairo_set_line_width(cairo, lineWidthScale * state->getLineWidth());
+
+        // Line cap is important - some PDF line widths are very large
+    switch (state->getLineCap()) {
+    case 0:
+        cairo_set_line_cap (cairo, CAIRO_LINE_CAP_BUTT);
+        break;
+    case 1:
+        cairo_set_line_cap (cairo, CAIRO_LINE_CAP_ROUND);
+        break;
+    case 2:
+        cairo_set_line_cap (cairo, CAIRO_LINE_CAP_SQUARE);
+        break;
+    }
 
-    // GfxPath is broken into steps, each step makes up a cairo path and its bbox is used for covering test.
-    // TODO
-    // 1. path steps that are not vertical or horizontal lines may still falsely "cover" many chars,
-    // can we slice those steps further?
-    // 2. if the line width is small, can we just ignore the path?
-    // 3. line join feature can't be retained. We use line-cap-square to minimize the problem that
-    //   some chars actually covered by a line join are missed. However chars covered by a acute angle
-    //   with line-join-miter may be still recognized as not covered.
-    cairo_set_line_cap(cairo, CAIRO_LINE_CAP_SQUARE);
     GfxPath * path = state->getPath();
     for (int i = 0; i < path->getNumSubpaths(); ++i) {
         GfxSubpath * subpath = path->getSubpath(i);
@@ -213,48 +227,54 @@ void DrawingTracer::stroke(GfxState * state)
             continue;
         double x = subpath->getX(0);
         double y = subpath->getY(0);
+        xform_pt(x, y);
         //p: loop cursor; j: next point index
-        int p =1, j = 1;
+        int p =1;
         int n = subpath->getNumPoints();
-        while (p <= n) {
+        while (p < n) {
             cairo_new_path(cairo);
+#ifdef DEBUG
+            printf("move_to: [%f,%f]\n", x, y);
+#endif
             cairo_move_to(cairo, x, y);
-            if (subpath->getCurve(j)) {
+            if (subpath->getCurve(p)) {
-                x = subpath->getX(j+2);
+                x = subpath->getX(p+2);
-                y = subpath->getY(j+2);
+                y = subpath->getY(p+2);
+                double x1 = subpath->getX(p);
+                double y1 = subpath->getY(p);
+                double x2 = subpath->getX(p+1);
+                double y2 = subpath->getY(p+1);
+                xform_pt(x, y);
+                xform_pt(x1, y1);
+                xform_pt(x2, y2);
+#ifdef DEBUG
+                printf("curve_to: [%f,%f], [%f,%f], [%f,%f]\n", x1, y1, x2, y2, x, y);
+#endif
                 cairo_curve_to(cairo,
-                    subpath->getX(j), subpath->getY(j),
+                    x1, y1,
-                    subpath->getX(j+1), subpath->getY(j+1),
+                    x2, y2,
                     x, y);
                 p += 3;
             } else {
-                x = subpath->getX(j);
+                x = subpath->getX(p);
-                y = subpath->getY(j);
+                y = subpath->getY(p);
+                xform_pt(x, y);
+#ifdef DEBUG
+                printf("line_to: [%f,%f]\n", x, y);
+#endif
                 cairo_line_to(cairo, x, y);
                 ++p;
             }
 
-            if (DT_DEBUG)
-                printf("DrawingTracer::stroke:new box:\n");
             double sbox[4];
             cairo_stroke_extents(cairo, sbox, sbox + 1, sbox + 2, sbox + 3);
+#ifdef DEBUG
+            printf("DrawingTracer::stroke:new box:[%f,%f,%f,%f]\n", sbox[0], sbox[1], sbox[2], sbox[3]);
+#endif
             if (sbox[0] != sbox[2] && sbox[1] != sbox[3])
-                draw_non_char_bbox(state, sbox);
+                draw_non_char_bbox(state, sbox, 2);
-            else if (DT_DEBUG)
-                printf("DrawingTracer::stroke:zero box!\n");
-
-            if (p == n)
-            {
-                if (subpath->isClosed())
-                    j = 0; // if sub path is closed, go back to starting point
-                else
-                    break;
-            }
-            else
-                j = p;
         }
     }
-#endif
 }
 
 void DrawingTracer::fill(GfxState * state, bool even_odd)
@@ -262,139 +282,166 @@ void DrawingTracer::fill(GfxState * state, bool even_odd)
     if (!param.correct_text_visibility)
         return;
 
-#if ENABLE_SVG
+    if (state->getFillOpacity() < 0.5) {
+        // Ignore partially transparent fills for occlusion purposes
+        return;
+    }
+
     do_path(state, state->getPath());
     //cairo_fill_extents don't take fill rule into account.
     //cairo_set_fill_rule (cairo, even_odd? CAIRO_FILL_RULE_EVEN_ODD : CAIRO_FILL_RULE_WINDING);
     double fbox[4];
     cairo_fill_extents(cairo, fbox, fbox + 1, fbox + 2, fbox + 3);
-    draw_non_char_bbox(state, fbox);
+
+#ifdef DEBUG
+    printf("DrawingTracer::fill:[%f,%f,%f,%f]\n", fbox[0],fbox[1],fbox[2],fbox[3]);
 #endif
+
+    draw_non_char_bbox(state, fbox, 1);
 }
 
-void DrawingTracer::draw_non_char_bbox(GfxState * state, double * bbox)
+void DrawingTracer::draw_non_char_bbox(GfxState * state, double * bbox, int what)
 {
-#if ENABLE_SVG
+// what == 0 => just do bbox text
+// what == 1 => stroke test
+// what == 2 => fill test
     double cbox[4];
     cairo_clip_extents(cairo, cbox, cbox + 1, cbox + 2, cbox + 3);
-    if(bbox_intersect(cbox, bbox, bbox))
+    if(bbox_intersect(cbox, bbox))
-#endif
     {
-        transform_bbox_by_ctm(bbox, state);
+#ifdef DEBUG
-        if (DT_DEBUG)
+        printf("DrawingTracer::draw_non_char_bbox:what=%d,[%f,%f,%f,%f]\n", what, bbox[0],bbox[1],bbox[2],bbox[3]);
-            printf("DrawingTracer::draw_non_char_bbox:[%f,%f,%f,%f]\n", bbox[0],bbox[1],bbox[2],bbox[3]);
+#endif
         if (on_non_char_drawn)
-            on_non_char_drawn(bbox);
+            on_non_char_drawn(cairo, bbox, what);
     }
 }
 
-void DrawingTracer::draw_char_bbox(GfxState * state, double * bbox)
+void DrawingTracer::draw_char_bbox(GfxState * state, double * bbox, int inTransparencyGroup)
 {
-#if ENABLE_SVG
+    if (inTransparencyGroup || state->getFillOpacity() < 1.0 || state->getStrokeOpacity() < 1.0) {
-    // Note: even if 4 corners of the char are all in or all out of the clip area,
+        on_char_clipped(cairo, bbox, 0);
-    // it could still be partially clipped.
+        return;
-    // TODO better solution?
+    }
-    int pt_in = 0;
+    if (!param.correct_text_visibility) {
-    if (cairo_in_clip(cairo, bbox[0], bbox[1]))
+        double bbox[4] = { 0, 0, 0, 0 }; // bbox not relevant if not correcting text visibility
-        ++pt_in;
+        on_char_drawn(cairo, bbox);
-    if (cairo_in_clip(cairo, bbox[2], bbox[3]))
+        return;
-        ++pt_in;
+    }
-    if (cairo_in_clip(cairo, bbox[2], bbox[1]))
-        ++pt_in;
-    if (cairo_in_clip(cairo, bbox[0], bbox[3]))
-        ++pt_in;
 
-    if (pt_in == 0)
+    double cbox[4];
-    {
+    cairo_clip_extents(cairo, cbox, cbox + 1, cbox + 2, cbox + 3);
-        transform_bbox_by_ctm(bbox);
+#ifdef DEBUG
-        if(on_char_clipped)
+    printf("DrawingTracer::draw_char_bbox::char bbox[%f,%f,%f,%f],clip extents:[%f,%f,%f,%f]\n", bbox[0], bbox[1], bbox[2], bbox[3], cbox[0],cbox[1],cbox[2],cbox[3]);
-            on_char_clipped(bbox, false);
-    }
-    else
-    {
-        if (pt_in < 4)
-        {
-            double cbox[4];
-            cairo_clip_extents(cairo, cbox, cbox + 1, cbox + 2, cbox + 3);
-            bbox_intersect(cbox, bbox, bbox);
-        }
-        transform_bbox_by_ctm(bbox);
-        if (pt_in < 4)
-        {
-            if(on_char_clipped)
-                on_char_clipped(bbox, true);
-        }
-        else
-        {
-            if (on_char_drawn)
-                on_char_drawn(bbox);
-        }
-    }
-#else
-    transform_bbox_by_ctm(bbox, state);
-    if (on_char_drawn)
-        on_char_drawn(bbox);
 #endif
-    if (DT_DEBUG)
+
-        printf("DrawingTracer::draw_char_bbox:[%f,%f,%f,%f]\n",bbox[0],bbox[1],bbox[2],bbox[3]);
+    if (bbox_intersect(bbox, cbox)) {
+#ifdef DEBUG
+        printf("char intersects clip\n");
+#endif
+        int pts_visible = 0;
+        // See which points are inside the current clip
+        if (cairo_in_clip(cairo, bbox[0], bbox[1]))
+            pts_visible |= 1;
+        if (cairo_in_clip(cairo, bbox[2], bbox[1]))
+            pts_visible |= 2;
+        if (cairo_in_clip(cairo, bbox[2], bbox[3]))
+            pts_visible |= 4;
+        if (cairo_in_clip(cairo, bbox[0], bbox[3]))
+            pts_visible |= 8;
+
+        if (pts_visible == (1|2|4|8)) {
+#ifdef DEBUG
+            printf("char inside clip\n");
+#endif
+            on_char_drawn(cairo, bbox);
+        } else {
+#ifdef DEBUG
+            printf("char partial clip (%x)\n", pts_visible);
+#endif
+            on_char_clipped(cairo, bbox, pts_visible);
+        }
+    } else {
+#ifdef DEBUG
+        printf("char outside clip\n");
+#endif
+        on_char_clipped(cairo, bbox, 0);
+    }
 }
 
 void DrawingTracer::draw_image(GfxState *state)
 {
     if (!param.correct_text_visibility)
         return;
+
+    double x1, y1, x2, y2, x3, y3, x4, y4;
+    x1 = x4 = y3 = y4 = 0;
+    x2 = y2 = x3 = y1 = 1;
+
+    xform_pt(x1, y1);
+    xform_pt(x2, y2);
+    xform_pt(x3, y3);
+    xform_pt(x4, y4);
+
+    cairo_new_path(cairo);
+    cairo_move_to(cairo, x1, y1);
+    cairo_line_to(cairo, x2, y2);
+    cairo_line_to(cairo, x3, y3);
+    cairo_line_to(cairo, x4, y4);
+    cairo_close_path (cairo);
+#ifdef DEBUG
+    printf("draw_image: [%f,%f], [%f,%f], [%f,%f], [%f,%f]\n", x1, y1, x2, y2, x3, y3, x4, y4);
+#endif
+
     double bbox[4] {0, 0, 1, 1};
-    draw_non_char_bbox(state, bbox);
+    tm_transform_bbox(ctm_stack.back(), bbox);
+
+    draw_non_char_bbox(state, bbox, 1);
 }
 
-void DrawingTracer::draw_char(GfxState *state, double x, double y, double ax, double ay)
+void DrawingTracer::draw_char(GfxState *state, double x, double y, double width, double height, int inTransparencyGroup)
 {
-    if (!param.correct_text_visibility)
+//printf("x=%f,y=%f,width=%f,height=%f\n", x, y, width, height);
-        return;
-
     Matrix tm, itm;
     memcpy(tm.m, state->getTextMat(), sizeof(tm.m));
 
+//printf("tm = %f,%f,%f,%f,%f,%f\n", tm.m[0], tm.m[1], tm.m[2], tm.m[3], tm.m[4], tm.m[5]);
     double cx = state->getCurX(), cy = state->getCurY(), fs = state->getFontSize(),
-            ry = state->getRise(), h = state->getHorizScaling();
+        ry = state->getRise(), h = state->getHorizScaling();
+
+//printf("cx=%f,cy=%f,fs=%f,ry=%f,h=%f\n", cx,cy,fs,ry,h);
 
     //cx and cy has been transformed by text matrix, we need to reverse them.
     tm.invertTo(&itm);
     double char_cx, char_cy;
     itm.transform(cx, cy, &char_cx, &char_cy);
 
+//printf("char_cx = %f, char_cy = %f\n", char_cx, char_cy); 
+
     //TODO Vertical? Currently vertical/type3 chars are treated as non-chars.
     double char_m[6] {fs * h, 0, 0, fs, char_cx + x, char_cy + y + ry};
 
+//printf("char_m = %f,%f,%f,%f,%f,%f\n", char_m[0], char_m[1], char_m[2], char_m[3], char_m[4], char_m[5]);
+
     double final_m[6];
     tm_multiply(final_m, tm.m, char_m);
 
-    auto font = state->getFont();
+//printf("final_m = %f,%f,%f,%f,%f,%f\n", final_m[0], final_m[1], final_m[2], final_m[3], final_m[4], final_m[5]);
-    double bbox[4] {0, 0, ax, ay};
+    double final_after_ctm[6];
-    double desc = font->getDescent(), asc = font->getAscent();
+    tm_multiply(final_after_ctm, ctm_stack.back(), final_m);
-    if (font->getWMode() == 0)
+//printf("final_after_ctm= %f,%f,%f,%f,%f,%f\n", final_after_ctm[0], final_after_ctm[1], final_after_ctm[2], final_after_ctm[3], final_after_ctm[4], final_after_ctm[5]);
-    {
+    double inset = 0.1;
-        bbox[1] += desc;
+    double bbox[4] {inset*width, inset*height, (1-inset)*width, (1-inset)*height};
-        bbox[3] += asc;
+
-    }
+//printf("bbox before: [%f,%f,%f,%f]\n", bbox[0],bbox[1],bbox[2],bbox[3]);
-    else
+//printf("bbox after: [%f,%f,%f,%f]\n", bbox[0],bbox[1],bbox[2],bbox[3]);
-    {//TODO Vertical?
+    tm_transform_bbox(final_after_ctm, bbox);
-    }
+//printf("bbox after: [%f,%f,%f,%f]\n", bbox[0],bbox[1],bbox[2],bbox[3]);
-    tm_transform_bbox(final_m, bbox);
+    draw_char_bbox(state, bbox, inTransparencyGroup);
-    draw_char_bbox(state, bbox);
 }
 
-
+void DrawingTracer::xform_pt(double & x, double & y) {
-void DrawingTracer::transform_bbox_by_ctm(double * bbox, GfxState * state)
+    tm_transform(ctm_stack.back(), x, y);
-{
-#if ENABLE_SVG
-    cairo_matrix_t mat;
-    cairo_get_matrix(cairo, &mat);
-    double mat_a[6] {mat.xx, mat.yx, mat.xy, mat.yy, mat.x0, mat.y0};
-    tm_transform_bbox(mat_a, bbox);
-#else
-    tm_transform_bbox(state->getCTM(), bbox);
-#endif
 }
 
 } /* namespace pdf2htmlEX */

src/DrawingTracer.h

@@ -12,6 +12,9 @@
 
 #include <GfxState.h>
 
+#include <vector>
+#include <array>
+
 #include "pdf2htmlEX-config.h"
 
 #if ENABLE_SVG
@@ -31,11 +34,11 @@ public:
      * bbox in device space.
      */
     // a non-char graphics is drawn
-    std::function<void(double * bbox)> on_non_char_drawn;
+    std::function<void(cairo_t *cairo, double * bbox, int what)> on_non_char_drawn;
     // a char is drawn in the clip area
-    std::function<void(double * bbox)> on_char_drawn;
+    std::function<void(cairo_t *cairo, double * bbox)> on_char_drawn;
     // a char is drawn out of/partially in the clip area
-    std::function<void(double * bbox, bool patially)> on_char_clipped;
+    std::function<void(cairo_t *cairo, double * bbox, int pts_visible)> on_char_clipped;
 
     DrawingTracer(const Param & param);
     virtual ~DrawingTracer();
@@ -44,9 +47,9 @@ public:
     /*
      * A character is drawing
      * x, y: glyph-drawing position, in PDF text object space.
-     * ax, ay: glyph advance, in glyph space.
+     * width, height: glyph width/height
      */
-    void draw_char(GfxState * state, double x, double y, double ax, double ay);
+    void draw_char(GfxState * state, double x, double y, double width, double height, int inTransparencyGroup);
     /*
      * An image is drawing
      */
@@ -63,13 +66,15 @@ private:
     void finish();
     // Following methods operate in user space (just before CTM is applied)
     void do_path(GfxState * state, GfxPath * path);
-    void draw_non_char_bbox(GfxState * state, double * bbox);
+    void draw_non_char_bbox(GfxState * state, double * bbox, int what);
-    void draw_char_bbox(GfxState * state, double * bbox);
+    void draw_char_bbox(GfxState * state, double * bbox, int inTransparencyGroup);
     // If cairo is available, parameter state is ignored
-    void transform_bbox_by_ctm(double * bbox, GfxState * state = nullptr);
+    void xform_pt(double & x, double & y);
 
     const Param & param;
 
+    std::vector<double*> ctm_stack;
+
 #if ENABLE_SVG
     cairo_t * cairo;
 #endif

src/HTMLRenderer/HTMLRenderer.h

@@ -47,7 +47,7 @@ namespace pdf2htmlEX {
 
 struct HTMLRenderer : OutputDev
 {
-    HTMLRenderer(const Param & param);
+    HTMLRenderer(Param & param);
     virtual ~HTMLRenderer();
 
     void process(PDFDoc * doc);
@@ -144,6 +144,13 @@ struct HTMLRenderer : OutputDev
     virtual void eoFill(GfxState *state);
     virtual GBool axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax);
 
+  virtual void beginTransparencyGroup(GfxState * /*state*/, double * /*bbox*/,
+                                      GfxColorSpace * /*blendingColorSpace*/,
+                                      GBool /*isolated*/, GBool /*knockout*/,
+                                      GBool /*forSoftMask*/);
+  virtual void endTransparencyGroup(GfxState * /*state*/);
+
+
     virtual void processLink(AnnotLink * al);
 
     /*
@@ -245,11 +252,12 @@ protected:
     double print_scale (void) const { return 96.0 / DEFAULT_DPI / text_zoom_factor(); }
 
 
-    const Param & param;
+    Param & param;
 
     ////////////////////////////////////////////////////
     // PDF states
     ////////////////////////////////////////////////////
+    int inTransparencyGroup;
     // track the original (unscaled) values to determine scaling and merge lines
     // current position
     double cur_tx, cur_ty; // real text position, in text coords

src/HTMLRenderer/draw.cc

@@ -62,4 +62,14 @@ GBool HTMLRenderer::axialShadedFill(GfxState *state, GfxAxialShading *shading, d
     return true;
 }
 
+void HTMLRenderer::beginTransparencyGroup(GfxState *state, double *bbox,
+                                      GfxColorSpace *blendingColorSpace,
+                                      GBool isolated, GBool knockout,
+                                      GBool forSoftMask) {
+	inTransparencyGroup++;
+}
+void HTMLRenderer::endTransparencyGroup(GfxState *state) {
+	inTransparencyGroup--;
+}
+
 } // namespace pdf2htmlEX

src/HTMLRenderer/font.cc

@@ -66,10 +66,10 @@ string HTMLRenderer::dump_embedded_font (GfxFont * font, FontInfo & info)
 
         auto * id = font->getID();
 
-        Object ref_obj;
+        Object ref_obj(id->num, id->gen);
-        ref_obj.initRef(id->num, id->gen);
+        //ref_obj.initRef(id->num, id->gen);
-        ref_obj.fetch(xref, &font_obj);
+        font_obj = ref_obj.fetch(xref);
-        ref_obj.free();
+        //ref_obj.free();
 
         if(!font_obj.isDict())
         {
@@ -78,7 +78,8 @@ string HTMLRenderer::dump_embedded_font (GfxFont * font, FontInfo & info)
         }
 
         Dict * dict = font_obj.getDict();
-        if(dict->lookup("DescendantFonts", &font_obj2)->isArray())
+        font_obj2 = dict->lookup("DescendantFonts");
+        if(font_obj2.isArray())
         {
             if(font_obj2.arrayGetLength() == 0)
             {
@@ -86,27 +87,31 @@ string HTMLRenderer::dump_embedded_font (GfxFont * font, FontInfo & info)
             }
             else
             {
-                if(font_obj2.arrayGetLength() > 1)
+                if(font_obj2.arrayGetLength() > 1) {
                     cerr << "TODO: multiple entries in DescendantFonts array" << endl;
+                }
                 
-                if(font_obj2.arrayGet(0, &obj2)->isDict())
+                obj2 = font_obj2.arrayGet(0);
+                if(obj2.isDict())
                 {
                     dict = obj2.getDict();
                 }
             }
         }
 
-        if(!dict->lookup("FontDescriptor", &fontdesc_obj)->isDict())
+        fontdesc_obj = dict->lookup("FontDescriptor");
+        if(!fontdesc_obj.isDict())
         {
             cerr << "Cannot find FontDescriptor " << endl;
             throw 0;
         }
 
         dict = fontdesc_obj.getDict();
-
+        obj = dict->lookup("FontFile3");
-        if(dict->lookup("FontFile3", &obj)->isStream())
+        if(obj.isStream())
         {
-            if(obj.streamGetDict()->lookup("Subtype", &obj1)->isName())
+            obj1 = obj.streamGetDict()->lookup("Subtype");
+            if(obj1.isName())
             {
                 subtype = obj1.getName();
                 if(subtype == "Type1C")
@@ -132,19 +137,19 @@ string HTMLRenderer::dump_embedded_font (GfxFont * font, FontInfo & info)
                 cerr << "Invalid subtype in font descriptor" << endl;
                 throw 0;
             }
-        }
+        } else {
-        else if (dict->lookup("FontFile2", &obj)->isStream())
+            obj = dict->lookup("FontFile2");
-        { 
+            if (obj.isStream()) {
-            suffix = ".ttf";
+                suffix = ".ttf";
-        }
+            } else {
-        else if (dict->lookup("FontFile", &obj)->isStream())
+                obj = dict->lookup("FontFile");
-        {
+                if (obj.isStream()) {
-            suffix = ".pfa";
+                    suffix = ".pfa";
-        }
+                } else {
-        else
+                    cerr << "Cannot find FontFile for dump" << endl;
-        {
+                    throw 0;
-            cerr << "Cannot find FontFile for dump" << endl;
+                }
-            throw 0;
+            }
         }
 
         if(suffix == "")
@@ -175,13 +180,13 @@ string HTMLRenderer::dump_embedded_font (GfxFont * font, FontInfo & info)
         cerr << "Something wrong when trying to dump font " << hex << fn_id << dec << endl;
     }
 
-    obj2.free();
+    //obj2.free();
-    obj1.free();
+    //obj1.free();
-    obj.free();
+    //obj.free();
 
-    fontdesc_obj.free();
+    //fontdesc_obj.free();
-    font_obj2.free();
+    //font_obj2.free();
-    font_obj.free();
+    //font_obj.free();
 
     return filepath;
 }
@@ -237,7 +242,7 @@ string HTMLRenderer::dump_type3_font (GfxFont * font, FontInfo & info)
         surface = cairo_svg_surface_create(glyph_filename.c_str(), transformed_bbox_width * scale, transformed_bbox_height * scale);
 
         cairo_svg_surface_restrict_to_version(surface, CAIRO_SVG_VERSION_1_2);
-        cairo_surface_set_fallback_resolution(surface, param.h_dpi, param.v_dpi);
+        cairo_surface_set_fallback_resolution(surface, param.actual_dpi, param.actual_dpi);
         cairo_t * cr = cairo_create(surface);
 
         // track the position of the origin
@@ -373,6 +378,14 @@ string HTMLRenderer::dump_type3_font (GfxFont * font, FontInfo & info)
 #endif
 }
 
+namespace {
+
+void output_map_file_header(std::ostream& out) {
+    out << "glyph_code mapped_code unicode" << std::endl;
+}
+
+} // namespace
+
 void HTMLRenderer::embed_font(const string & filepath, GfxFont * font, FontInfo & info, bool get_metric_only)
 {
     if(param.debug)
@@ -528,6 +541,7 @@ void HTMLRenderer::embed_font(const string & filepath, GfxFont * font, FontInfo
             ffw_reencode_glyph_order();
 
             GfxCIDFont * _font = dynamic_cast<GfxCIDFont*>(font);
+            assert(_font != nullptr);
 
             // To locate CID2GID for the font
             // as in CairoFontEngine.cc
@@ -574,6 +588,7 @@ void HTMLRenderer::embed_font(const string & filepath, GfxFont * font, FontInfo
             map_filename = (char*)str_fmt("%s/f%llx.map", param.tmp_dir.c_str(), info.id);
             tmp_files.add(map_filename);
             map_outf.open(map_filename);
+            output_map_file_header(map_outf);
         }
 
         unordered_set<int> codeset;
@@ -650,6 +665,7 @@ void HTMLRenderer::embed_font(const string & filepath, GfxFont * font, FontInfo
                         {
                             map_outf.close();
                             map_outf.open(map_filename);
+                            output_map_file_header(map_outf);
                         }
                         continue;
                     }

src/HTMLRenderer/general.cc

@@ -41,12 +41,13 @@ using std::abs;
 using std::cerr;
 using std::endl;
 
-HTMLRenderer::HTMLRenderer(const Param & param)
+HTMLRenderer::HTMLRenderer(Param & param)
     :OutputDev()
     ,param(param)
     ,html_text_page(param, all_manager)
     ,preprocessor(param)
     ,tmp_files(param)
+    ,covered_text_detector(param)
     ,tracer(param)
 {
     if(!(param.debug))
@@ -81,11 +82,11 @@ HTMLRenderer::HTMLRenderer(const Param & param)
     all_manager.bottom      .set_eps(EPS);
 
     tracer.on_char_drawn =
-            [this](double * box) { covered_text_detector.add_char_bbox(box); };
+            [this](cairo_t *cairo, double * box) { covered_text_detector.add_char_bbox(cairo, box); };
     tracer.on_char_clipped =
-            [this](double * box, bool partial) { covered_text_detector.add_char_bbox_clipped(box, partial); };
+            [this](cairo_t *cairo, double * box, int partial) { covered_text_detector.add_char_bbox_clipped(cairo, box, partial); };
     tracer.on_non_char_drawn =
-            [this](double * box) { covered_text_detector.add_non_char_bbox(box); };
+            [this](cairo_t *cairo, double * box, int what) { covered_text_detector.add_non_char_bbox(cairo, box, what); };
 }
 
 HTMLRenderer::~HTMLRenderer()
@@ -93,6 +94,8 @@ HTMLRenderer::~HTMLRenderer()
     ffw_finalize();
 }
 
+#define MAX_DIMEN 9000
+
 void HTMLRenderer::process(PDFDoc *doc)
 {
     cur_doc = doc;
@@ -119,12 +122,22 @@ void HTMLRenderer::process(PDFDoc *doc)
     int page_count = (param.last_page - param.first_page + 1);
     for(int i = param.first_page; i <= param.last_page ; ++i)
     {
+        param.actual_dpi = param.desired_dpi;
+        param.max_dpi = 72 * MAX_DIMEN / max(doc->getPageCropWidth(i), doc->getPageCropHeight(i));
+
+        if (param.actual_dpi > param.max_dpi) {
+            param.actual_dpi = param.max_dpi;
+            printf("Warning:Page %d clamped to %f DPI\n", i, param.actual_dpi);
+        }
+
         if (param.tmp_file_size_limit != -1 && tmp_files.get_total_size() > param.tmp_file_size_limit * 1024) {
-            cerr << "Stop processing, reach max size\n";
+            if(param.quiet == 0)
+                cerr << "Stop processing, reach max size\n";
             break;
         }
 
-        cerr << "Working: " << (i-param.first_page) << "/" << page_count << '\r' << flush;
+        if (param.quiet == 0)
+            cerr << "Working: " << (i-param.first_page) << "/" << page_count << '\r' << flush;
 
         if(param.split_pages)
         {
@@ -147,15 +160,21 @@ void HTMLRenderer::process(PDFDoc *doc)
                 false, // printing
                 nullptr, nullptr, nullptr, nullptr);
 
+        if (param.desired_dpi != param.actual_dpi) {
+            printf("Page %d DPI change %.1f => %.1f\n", i, param.desired_dpi, param.actual_dpi);
+        }
+
         if(param.split_pages)
         {
             delete f_curpage;
             f_curpage = nullptr;
         }
     }
-    if(page_count >= 0)
+    if(page_count >= 0 && param.quiet == 0)
         cerr << "Working: " << page_count << "/" << page_count;
-    cerr << endl;
+
+    if(param.quiet == 0)
+        cerr << endl;
 
     ////////////////////////
     // Process Outline
@@ -167,7 +186,8 @@ void HTMLRenderer::process(PDFDoc *doc)
     bg_renderer = nullptr;
     fallback_bg_renderer = nullptr;
 
-    cerr << endl;
+    if(param.quiet == 0)
+        cerr << endl;
 }
 
 void HTMLRenderer::setDefaultCTM(double *ctm)

src/HTMLRenderer/link.cc

@@ -56,73 +56,70 @@ static string get_linkdest_detail_str(LinkDest * dest, Catalog * catalog, int &
     // dec
     sout << "[" << pageno;
 
-    if(dest)
+    switch(dest->getKind())
     {
-        switch(dest->getKind())
+        case destXYZ:
-        {
+            {
-            case destXYZ:
+                sout << ",\"XYZ\",";
-                {
-                    sout << ",\"XYZ\",";
-                    if(dest->getChangeLeft())
-                        sout << (dest->getLeft());
-                    else
-                        sout << "null";
-                    sout << ",";
-                    if(dest->getChangeTop())
-                        sout << (dest->getTop());
-                    else
-                        sout << "null";
-                    sout << ",";
-                    if(dest->getChangeZoom())
-                        sout << (dest->getZoom());
-                    else
-                        sout << "null";
-                }
-                break;
-            case destFit:
-                sout << ",\"Fit\"";
-                break;
-            case destFitH:
-                sout << ",\"FitH\",";
-                if(dest->getChangeTop())
-                    sout << (dest->getTop());
-                else
-                    sout << "null";
-                break;
-            case destFitV:
-                sout << ",\"FitV\",";
                 if(dest->getChangeLeft())
                     sout << (dest->getLeft());
                 else
                     sout << "null";
-                break;
+                sout << ",";
-            case destFitR:
-                sout << ",\"FitR\","
-                    << (dest->getLeft()) << ","
-                    << (dest->getBottom()) << ","
-                    << (dest->getRight()) << ","
-                    << (dest->getTop());
-                break;
-            case destFitB:
-                sout << ",\"FitB\"";
-                break;
-            case destFitBH:
-                sout << ",\"FitBH\",";
                 if(dest->getChangeTop())
                     sout << (dest->getTop());
                 else
                     sout << "null";
-                break;
+                sout << ",";
-            case destFitBV:
+                if(dest->getChangeZoom())
-                sout << ",\"FitBV\",";
+                    sout << (dest->getZoom());
-                if(dest->getChangeLeft())
-                    sout << (dest->getLeft());
                 else
                     sout << "null";
-                break;
+            }
-            default:
+            break;
-                break;
+        case destFit:
-        }
+            sout << ",\"Fit\"";
+            break;
+        case destFitH:
+            sout << ",\"FitH\",";
+            if(dest->getChangeTop())
+                sout << (dest->getTop());
+            else
+                sout << "null";
+            break;
+        case destFitV:
+            sout << ",\"FitV\",";
+            if(dest->getChangeLeft())
+                sout << (dest->getLeft());
+            else
+                sout << "null";
+            break;
+        case destFitR:
+            sout << ",\"FitR\","
+                << (dest->getLeft()) << ","
+                << (dest->getBottom()) << ","
+                << (dest->getRight()) << ","
+                << (dest->getTop());
+            break;
+        case destFitB:
+            sout << ",\"FitB\"";
+            break;
+        case destFitBH:
+            sout << ",\"FitBH\",";
+            if(dest->getChangeTop())
+                sout << (dest->getTop());
+            else
+                sout << "null";
+            break;
+        case destFitBV:
+            sout << ",\"FitBV\",";
+            if(dest->getChangeLeft())
+                sout << (dest->getLeft());
+            else
+                sout << "null";
+            break;
+        default:
+            break;
     }
     sout << "]";
 
@@ -166,6 +163,7 @@ string HTMLRenderer::get_linkaction_str(LinkAction * action, string & detail)
             case actionURI:
                 {
                     auto * real_action = dynamic_cast<LinkURI*>(action);
+                    assert(real_action != nullptr);
                     dest_str = real_action->getURI()->getCString();
                 }
                 break;

src/HTMLRenderer/state.cc

@@ -104,6 +104,7 @@ void HTMLRenderer::clipToStrokePath(GfxState * state)
 }
 void HTMLRenderer::reset_state()
 {
+    inTransparencyGroup = 0;
     draw_text_scale = 1.0;
 
     cur_font_size = 0.0;

src/HTMLRenderer/text.cc

@@ -33,16 +33,23 @@ void HTMLRenderer::drawString(GfxState * state, GooString * s)
     double cur_word_space   = state->getWordSpace();
     double cur_horiz_scaling = state->getHorizScaling();
 
+        bool drawChars = true;
 
     // Writing mode fonts and Type 3 fonts are rendered as images
     // I don't find a way to display writing mode fonts in HTML except for one div for each character, which is too costly
     // For type 3 fonts, due to the font matrix, still it's hard to show it on HTML
-    if( (font == nullptr) 
+
-        || (font->getWMode())
+
-        || ((font->getType() == fontType3) && (!param.process_type3))
+    if(state->getFont()
+        && ( (state->getFont()->getWMode())
+            || ((state->getFont()->getType() == fontType3) && (!param.process_type3))
+            || (state->getRender() >= 4)
+           )
       )
     {
-        return;
+        // We still want to go through the loop to ensure characters are added to the covered_chars array
+        drawChars = false;
+//printf("%d / %d / %d\n", state->getFont()->getWMode(), (state->getFont()->getType() == fontType3), state->getRender());
     }
 
     // see if the line has to be closed due to state change
@@ -74,7 +81,7 @@ void HTMLRenderer::drawString(GfxState * state, GooString * s)
     while (len > 0) 
     {
         auto n = font->getNextChar(p, len, &code, &u, &uLen, &ax, &ay, &ox, &oy);
-        HR_DEBUG(printf("HTMLRenderer::drawString:unicode=%lc(%d)\n", (wchar_t)u[0], u[0]));
+        HR_DEBUG(printf("HTMLRenderer::drawString:unicode=%lc(%d)\n", u ? (wchar_t)u[0] : ' ', u ? u[0] : -1));
 
         if(!(equal(ox, 0) && equal(oy, 0)))
         {
@@ -82,7 +89,34 @@ void HTMLRenderer::drawString(GfxState * state, GooString * s)
         }
         ddx = ax * cur_font_size + cur_letter_space;
         ddy = ay * cur_font_size;
-        tracer.draw_char(state, dx, dy, ax, ay);
+
+        double width = 0, height = font->getAscent();
+        if (font->isCIDFont()) {
+            char buf[2];
+            buf[0] = (code >> 8) & 0xff;
+            buf[1] = (code & 0xff);
+            width = ((GfxCIDFont *)font)->getWidth(buf, 2);
+        } else {
+            width = ((Gfx8BitFont *)font)->getWidth(code);
+        }
+
+        if (width == 0 || height == 0) {
+            //cerr << "CID: " << font->isCIDFont() << ", char:" << code << ", width:" << width << ", ax:" << ax << ", height:" << height << ", ay:" << ay << endl;
+        }
+        if (width == 0) {
+            width = ax;
+            if (width == 0) {
+                width = 0.001;
+            }
+        }
+        if (height == 0) {
+            height = ay;
+            if (height == 0) {
+                height = 0.001;
+            }
+        }
+
+        tracer.draw_char(state, dx, dy, width, height, !drawChars || inTransparencyGroup);
 
         bool is_space = false;
         if (n == 1 && *p == ' ') 
@@ -99,6 +133,7 @@ void HTMLRenderer::drawString(GfxState * state, GooString * s)
             is_space = true;
         }
         
+
         if(is_space && (param.space_as_offset))
         {
             html_text_page.get_cur_line()->append_padding_char();
@@ -158,7 +193,7 @@ bool HTMLRenderer::is_char_covered(int index)
     {
         std::cerr << "Warning: HTMLRenderer::is_char_covered: index out of bound: "
                 << index << ", size: " << covered.size() <<endl;
-        return false;
+        return true;  // Something's gone wrong so assume covered so at least something is output
     }
     return covered[index];
 }

src/HTMLTextLine.cc

@@ -250,7 +250,10 @@ void HTMLTextLine::dump_text(ostream & out)
                         if(std::abs(target - space_off) <= param.h_eps)
                         {
                             Unicode u = ' ';
+				// Sometimes we guess wrong whether we have a valid space character, so ensure it is always hidden
+                            out << "<span class=\"" << CSS::WHITESPACE_CN << "\">";
                             writeUnicodes(out, &u, 1);
+                            out << "</span>";
                             actual_offset = space_off;
                             done = true;
                         }
@@ -378,13 +381,12 @@ void HTMLTextLine::optimize_normal(std::vector<HTMLTextLine*> & lines)
     new_offsets.reserve(offsets.size());
 
     auto offset_iter1 = offsets.begin();
-    for(auto state_iter2 = states.begin(), state_iter1 = state_iter2++; 
+    for(auto state_iter1 = states.begin(); state_iter1 != states.end(); ++state_iter1)
-            state_iter1 != states.end(); 
-            ++state_iter1, ++state_iter2)
     {
+        const auto state_iter2 = std::next(state_iter1);
         const size_t text_idx1 = state_iter1->start_idx;
         const size_t text_idx2 = (state_iter2 == states.end()) ? text.size() : state_iter2->start_idx;
-        size_t text_count = text_idx2 - text_idx1;
+        const size_t text_count = text_idx2 - text_idx1;
 
         // there might be some offsets before the first state
         while((offset_iter1 != offsets.end()) 

src/Param.h

@@ -22,7 +22,10 @@ struct Param
     double zoom;
     double fit_width, fit_height;
     int use_cropbox;
-    double h_dpi, v_dpi;
+    double desired_dpi;
+    double actual_dpi;
+    double max_dpi;
+    double text_dpi;
 
     // output
     int embed_css;
@@ -79,6 +82,7 @@ struct Param
     std::string tmp_dir;
     int debug;
     int proof;
+    int quiet;
 
     std::string input_filename, output_filename;
 };

src/Preprocessor.cc

@@ -45,7 +45,8 @@ void Preprocessor::process(PDFDoc * doc)
     int page_count = (param.last_page - param.first_page + 1);
     for(int i = param.first_page; i <= param.last_page ; ++i) 
     {
-        cerr << "Preprocessing: " << (i-param.first_page) << "/" << page_count << '\r' << flush;
+        if(param.quiet == 0)
+            cerr << "Preprocessing: " << (i - param.first_page) << "/" << page_count << '\r' << flush;
 
         doc->displayPage(this, i, DEFAULT_DPI, DEFAULT_DPI,
                 0, 
@@ -54,9 +55,11 @@ void Preprocessor::process(PDFDoc * doc)
                 false, // printing
                 nullptr, nullptr, nullptr, nullptr);
     }
-    if(page_count >= 0)
+    if(page_count >= 0 && param.quiet == 0)
         cerr << "Preprocessing: " << page_count << "/" << page_count;
-    cerr << endl;
+
+    if(param.quiet == 0)
+        cerr << endl;
 }
 
 void Preprocessor::drawChar(GfxState *state, double x, double y,

src/StateManager.h

@@ -43,7 +43,18 @@ public:
     // install new_value into the map
     // return the corresponding id
     long long install(double new_value, double * actual_value_ptr = nullptr) {
-        auto iter = value_map.lower_bound(new_value - eps);
+	// DCRH: Fix for when eps check fails and yet map thinks the keys are the same
+	// (DEV1-RYR-LETTER example)
+        auto iter = value_map.find(new_value);
+        if (iter != value_map.end()) {
+            if(actual_value_ptr != nullptr)
+                *actual_value_ptr = iter->first;
+
+            return iter->second;
+        }
+
+        iter = value_map.lower_bound(new_value - eps);
+
         if((iter != value_map.end()) && (std::abs(iter->first - new_value) <= eps))
         {
             if(actual_value_ptr != nullptr)
@@ -84,7 +95,7 @@ protected:
 
 // Be careful about the mixed usage of Matrix and const double *
 // the input is usually double *, which might be changed, so we have to copy the content out
-// in the map we use Matrix instead of double * such that the array may be automatically release when deconstructing
+// in the map we use Matrix instead of double * such that the array may be automatically release when destructing
 template <class Imp>
 class StateManager<Matrix, Imp>
 {
@@ -96,7 +107,7 @@ public:
     // return id
     long long install(const double * new_value) {
         Matrix m;
-        memcpy(m.m, new_value, sizeof(m.m));
+        memcpy(m.m, new_value, 4 * sizeof(double));
         auto iter = value_map.lower_bound(m);
         if((iter != value_map.end()) && (tm_equal(m.m, iter->first.m, 4)))
         {

src/pdf2htmlEX.cc

@@ -111,7 +111,7 @@ void prepare_directories()
 
     errno = 0;
 
-    unique_ptr<char> pBuf(new char[tmp_dir.size() + 1]);
+    unique_ptr<char[]> pBuf(new char[tmp_dir.size() + 1]);
     strcpy(pBuf.get(), tmp_dir.c_str());
     auto p = mkdtemp(pBuf.get());
     if(p == nullptr)
@@ -139,8 +139,7 @@ void parse_options (int argc, char **argv)
         .add("fit-width", &param.fit_width, 0, "fit width to <fp> pixels", true)
         .add("fit-height", &param.fit_height, 0, "fit height to <fp> pixels", true)
         .add("use-cropbox", &param.use_cropbox, 1, "use CropBox instead of MediaBox")
-        .add("hdpi", &param.h_dpi, 144.0, "horizontal resolution for graphics in DPI")
+        .add("dpi", &param.desired_dpi, 144.0, "Resolution for graphics in DPI")
-        .add("vdpi", &param.v_dpi, 144.0, "vertical resolution for graphics in DPI")
 
         // output files
         .add("embed", "specify which elements should be embedded into output", embed_parser, true)
@@ -160,7 +159,7 @@ void parse_options (int argc, char **argv)
         .add("process-form", &param.process_form, 0, "include text fields and radio buttons")
         .add("printing", &param.printing, 1, "enable printing support")
         .add("fallback", &param.fallback, 0, "output in fallback mode")
-        .add("tmp-file-size-limit", &param.tmp_file_size_limit, -1, "Maximum size (in KB) used by temporary files, -1 for no limit.")
+        .add("tmp-file-size-limit", &param.tmp_file_size_limit, -1, "Maximum size (in KB) used by temporary files, -1 for no limit")
 
         // fonts
         .add("embed-external-font", &param.embed_external_font, 1, "embed local match for external fonts")
@@ -181,13 +180,14 @@ void parse_options (int argc, char **argv)
         .add("space-as-offset", &param.space_as_offset, 0, "treat space characters as offsets")
         .add("tounicode", &param.tounicode, 0, "how to handle ToUnicode CMaps (0=auto, 1=force, -1=ignore)")
         .add("optimize-text", &param.optimize_text, 0, "try to reduce the number of HTML elements used for text")
-        .add("correct-text-visibility", &param.correct_text_visibility, 0, "try to detect texts covered by other graphics and properly arrange them")
+        .add("correct-text-visibility", &param.correct_text_visibility, 1, "0: Don't do text visibility checks. 1: Fully occluded text handled. 2: Partially occluded text handled")
+        .add("covered-text-dpi", &param.text_dpi, 300, "Rendering DPI to use if correct-text-visibility == 2 and there is partially covered text on the page")
 
         // background image
         .add("bg-format", &param.bg_format, "png", "specify background image format")
         .add("svg-node-count-limit", &param.svg_node_count_limit, -1, "if node count in a svg background image exceeds this limit,"
-                " fall back this page to bitmap background; negative value means no limit.")
+                " fall back this page to bitmap background; negative value means no limit")
-        .add("svg-embed-bitmap", &param.svg_embed_bitmap, 1, "1: embed bitmaps in svg background; 0: dump bitmaps to external files if possible.")
+        .add("svg-embed-bitmap", &param.svg_embed_bitmap, 1, "1: embed bitmaps in svg background; 0: dump bitmaps to external files if possible")
 
         // encryption
         .add("owner-password,o", &param.owner_password, "", "owner password (for encrypted files)", true)
@@ -196,11 +196,12 @@ void parse_options (int argc, char **argv)
 
         // misc.
         .add("clean-tmp", &param.clean_tmp, 1, "remove temporary files after conversion")
-        .add("tmp-dir", &param.tmp_dir, param.tmp_dir, "specify the location of temporary directory.")
+        .add("tmp-dir", &param.tmp_dir, param.tmp_dir, "specify the location of temporary directory")
         .add("data-dir", &param.data_dir, param.data_dir, "specify data directory")
         .add("poppler-data-dir", &param.poppler_data_dir, param.poppler_data_dir, "specify poppler data directory")
         .add("debug", &param.debug, 0, "print debugging information")
-        .add("proof", &param.proof, 0, "texts are drawn on both text layer and background for proof.")
+        .add("proof", &param.proof, 0, "texts are drawn on both text layer and background for proof")
+        .add("quiet", &param.quiet, 0, "perform operations quietly")
 
         // meta
         .add("version,v", "print copyright and version info", &show_version_and_exit)

src/util/ffw.c

@@ -126,6 +126,15 @@ void ffw_load_font(const char * filename)
     assert(font->fv);
 
     cur_fv = font->fv;
+
+    // If we are a composite font, then ensure the cidmaster has the same ascent/descent values as the first subfont.
+    // If there are more than one subfont then what do we do???
+    if (cur_fv->cidmaster && (cur_fv->cidmaster->ascent != cur_fv->sf->ascent || cur_fv->cidmaster->descent != cur_fv->sf->descent)) {
+        printf("ffw_load_font:Warning ascent/descent mismatch for CID font: %d/%d => %d/%d\n",
+                cur_fv->cidmaster->ascent, cur_fv->cidmaster->descent,  cur_fv->sf->ascent, cur_fv->sf->descent);
+        cur_fv->cidmaster->ascent = cur_fv->sf->ascent;
+        cur_fv->cidmaster->descent = cur_fv->sf->descent;
+    }
 }
 
 /*

src/util/unicode.cc

@@ -20,10 +20,10 @@ using std::ostream;
 
 Unicode map_to_private(CharCode code)
 {
-    Unicode private_mapping = (Unicode)(code + 0xE000);
+    Unicode private_mapping = (Unicode)(code + 0xE600); // DCRH: Stupid mobile safari uses code points in 0xe000 - 0xe5ff range to switch to emoji font
-    if(private_mapping > 0xF8FF)
+    if(private_mapping > 0xF65F) // DCRH: More emoji-avoiding for mobile safari (see http://www.fileformat.info/info/unicode/block/private_use_area/utf8test.htm)
     {
-        private_mapping = (Unicode)((private_mapping - 0xF8FF) + 0xF0000);
+        private_mapping = (Unicode)((private_mapping - 0xF65F) + 0xF0000);
         if(private_mapping > 0xFFFFD)
         {
             private_mapping = (Unicode)((private_mapping - 0xFFFFD) + 0x100000);
@@ -40,7 +40,9 @@ Unicode unicode_from_font (CharCode code, GfxFont * font)
 {
     if(!font->isCIDFont())
     {
-        char * cname = dynamic_cast<Gfx8BitFont*>(font)->getCharName(code);
+        auto * font2 = dynamic_cast<Gfx8BitFont*>(font);
+        assert(font2 != nullptr);
+        char * cname = font2->getCharName(code);
         // may be untranslated ligature
         if(cname)
         {

src/util/unicode.h

@@ -59,6 +59,13 @@ namespace pdf2htmlEX {
 inline bool is_illegal_unicode(Unicode c)
 {
     return (c < 0x20) || (c >= 0x7F && c <= 0xA0) || (c == 0xAD)
+            || (c >= 0x300 && c <= 0x36f) // DCRH Combining diacriticals
+            || (c >= 0x1ab0 && c <= 0x1aff) // DCRH Combining diacriticals
+            || (c >= 0x1dc0 && c <= 0x1dff) // DCRH Combining diacriticals
+            || (c >= 0x20d0 && c <= 0x20ff) // DCRH Combining diacriticals
+            || (c >= 0xfe20 && c <= 0xfe2f) // DCRH Combining diacriticals
+            || (c >= 0x900 && c <= 0x97f) // DCRH Devanagari - Webkit struggles with spacing for these code points
+            || (c >= 0xa00 && c <= 0xa7f) // DCRH Gurmukhi - Webkit struggles with spacing for these code points
             || (c == 0x061C) || (c == 0x1361)
             || (c >= 0x200B && c <= 0x200F) || (c == 0x2028) || (c == 0x2029)
             || (c >= 0x202A && c <= 0x202E) || (c >= 0x2066 && c <= 0x2069)