Merge pull request coolwanglu#2 from coolwanglu/master

update to 0.14.6

.travis.yml

@@ -18,7 +18,7 @@ before_script:
   - cmake -DENABLE_SVG=ON .
 script:
   - make
-  - P2H_TEST_REMOTE=1 ctest --output-on-failure
+  - P2H_TEST_REMOTE=1 ctest --output-on-failure --verbose
   - sudo make install
   - /usr/local/bin/pdf2htmlEX -v
 branches:

3rdparty/poppler/git/CairoFontEngine.cc

@@ -59,7 +59,7 @@
 #endif
 
 /*
- * multi thread disabled by WangLu
+ * pdf2htmlEX: disabled multi thread 
 #if MULTITHREADED
 #  define fontEngineLocker()   MutexLocker locker(&mutex)
 #else
@@ -421,7 +421,8 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref,
   ref = *gfxFont->getID();
   fontType = gfxFont->getType();
 
-  if (!(fontLoc = gfxFont->locateFont(xref, gFalse))) {
+  // pdf2htmlEX: changed gFlase to nullptr
+  if (!(fontLoc = gfxFont->locateFont(xref, nullptr))) {
     error(errSyntaxError, -1, "Couldn't find a font for '{0:s}'",
     	gfxFont->getName() ? gfxFont->getName()->getCString()
 	                       : "(unnamed)");
@@ -768,7 +769,7 @@ CairoFontEngine::CairoFontEngine(FT_Library libA) {
   useCIDs = major > 2 ||
             (major == 2 && (minor > 1 || (minor == 1 && patch > 7)));
 /*
- * multi thread disabled by WangLu
+ * pdf2htmlEX: disabled multi thread 
 #if MULTITHREADED
   gInitMutex(&mutex);
 #endif
@@ -783,7 +784,7 @@ CairoFontEngine::~CairoFontEngine() {
       delete fontCache[i];
   }
 /*
- * multi thread disabled by WangLu
+ * pdf2htmlEX: disabled multi thread 
 #if MULTITHREADED
   gDestroyMutex(&mutex);
 #endif

3rdparty/poppler/git/CairoFontEngine.h

@@ -122,7 +122,7 @@ class CairoFontEngine {
   FT_Library lib;
   GBool useCIDs;
 /*
- * multi thread disabled by WangLu
+ * pdf2htmlEX: disabled multi thread 
 #if MULTITHREADED
   GooMutex mutex;
 #endif

3rdparty/poppler/git/CairoOutputDev.h

@@ -272,7 +272,9 @@ class CairoOutputDev: public OutputDev {
   cairo_filter_t getFilterForSurface(cairo_surface_t *image,
 				     GBool interpolate);
   GBool getStreamData (Stream *str, char **buffer, int *length);
-  virtual void setMimeData(Stream *str, Object *ref, cairo_surface_t *image);
+  // pdf2htmlEX: make setMimeData virtual, we need to override it
+  virtual 
+  void setMimeData(Stream *str, Object *ref, cairo_surface_t *image);
   void fillToStrokePathClip(GfxState *state);
   void alignStrokeCoords(GfxSubpath *subpath, int i, double *x, double *y);
 

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.13.6")
+set(PDF2HTMLEX_VERSION "0.14.6")
 set(ARCHIVE_NAME pdf2htmlex-${PDF2HTMLEX_VERSION})
 add_custom_target(dist
     COMMAND git archive --prefix=${ARCHIVE_NAME}/ HEAD
@@ -183,6 +183,7 @@ add_custom_target(pdf2htmlEX_resources ALL DEPENDS
 add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/share/pdf2htmlEX.min.js
     COMMAND ${CMAKE_SOURCE_DIR}/share/build_js.sh
     DEPENDS
+        ${CMAKE_SOURCE_DIR}/share/build_js.sh
         ${CMAKE_SOURCE_DIR}/share/pdf2htmlEX.js
     )
 
@@ -191,6 +192,7 @@ add_custom_command(OUTPUT
         ${CMAKE_SOURCE_DIR}/share/fancy.min.css
     COMMAND ${CMAKE_SOURCE_DIR}/share/build_css.sh
     DEPENDS
+        ${CMAKE_SOURCE_DIR}/share/build_css.sh
         ${CMAKE_SOURCE_DIR}/share/base.css
         ${CMAKE_SOURCE_DIR}/share/fancy.css
     )

ChangeLog

@@ -1,4 +1,11 @@
-Developing
+v0.14.6
+2015.07.22
+
+* Fixed Windows build
+* Fixed crash when flattening non-CID fonts
+* Handle OpenType subtype for FontFile3
+* New option for the JS viewer: `view_history_handler`
+
 
 v0.13.6
 2015.04.29

share/build_js.sh

@@ -15,7 +15,7 @@ OUTPUT="$BASEDIR/$OUTPUT_FN"
 
 (echo "Building $OUTPUT_FN with closure-compiler..." && \
     java -jar "$CLOSURE_COMPILER_JAR" \
-         --compilation_level ADVANCED_OPTIMIZATIONS \
+         --compilation_level SIMPLE_OPTIMIZATIONS \
          --warning_level VERBOSE \
          --output_wrapper "(function(){%output%})();" \
          --js "$INPUT" \

share/pdf2htmlEX.js.in

@@ -38,6 +38,7 @@ var CSS_CLASS_NAMES = {
   page_data        : '@CSS_PAGE_DATA_CN@',
   background_image : '@CSS_BACKGROUND_IMAGE_CN@',
   link             : '@CSS_LINK_CN@',
+  input_radio      : '@CSS_INPUT_RADIO_CN@',
   __dummy__        : 'no comma'
 };
 
@@ -61,10 +62,12 @@ var DEFAULT_CONFIG = {
   'render_timeout' : 100,
   // zoom ratio step for each zoom in/out event
   'scale_step' : 0.9,
-  // register global key handler
+  // register global key handler, allowing navigation by keyboard
   'key_handler' : true,
-  // register hashchange handler
+  // register hashchange handler, navigate to the location specified by the hash
   'hashchange_handler' : true,
+  // register view history handler, allowing going back to the previous location
+  'view_history_handler' : true,
 
   '__dummy__'        : 'no comma'
 };
@@ -261,7 +264,7 @@ Viewer.prototype = {
   },
 
   initialize_radio_button : function() {
-    var elements = document.getElementsByClassName('ir');
+    var elements = document.getElementsByClassName(CSS_CLASS_NAMES.input_radio);
 
     for(var i = 0; i < elements.length; i++) {
       var r = elements[i];
@@ -312,6 +315,12 @@ Viewer.prototype = {
       }, false);
     }
 
+    if (this.config['view_history_handler']) {
+      window.addEventListener('popstate', function(e) {
+        if(e.state) self.navigate_to_dest(e.state);
+      }, false);
+    }
+
     // register schedule rendering
     // renew old schedules since scroll() may be called frequently
     this.container.addEventListener('scroll', function() {
@@ -759,13 +768,13 @@ Viewer.prototype = {
 
   fit_width : function () {
     var page_idx = this.cur_page_idx;
-    this.rescale(this.container.clientWidth / this.pages[page_idx].width(), false);
+    this.rescale(this.container.clientWidth / this.pages[page_idx].width(), true);
     this.scroll_to(page_idx);
   },
 
   fit_height : function () {
     var page_idx = this.cur_page_idx;
-    this.rescale(this.container.clientHeight / this.pages[page_idx].height(), false);
+    this.rescale(this.container.clientHeight / this.pages[page_idx].height(), true);
     this.scroll_to(page_idx);
   },
   /**
@@ -797,6 +806,13 @@ Viewer.prototype = {
     var detail_str = /** @type{string} */ (target.getAttribute('data-dest-detail'));
     if (!detail_str) return;
 
+    if (this.config['view_history_handler']) {
+      try {
+        var cur_hash = this.get_current_view_hash();
+        window.history.replaceState(cur_hash, '', '#' + cur_hash);
+        window.history.pushState(detail_str, '', '#' + detail_str);
+      } catch(ex) { }
+    }
     this.navigate_to_dest(detail_str, this.get_containing_page(target));
     e.preventDefault();
   },
@@ -883,7 +899,6 @@ Viewer.prototype = {
 
     this.rescale(zoom, false);
 
-
     var self = this;
     /**
      * page should of type Page 
@@ -926,6 +941,26 @@ Viewer.prototype = {
     var container = this.container;
     container.scrollLeft += pos[0] - cur_target_pos[0];
     container.scrollTop += pos[1] - cur_target_pos[1];
+  },
+
+  /**
+   * generate the hash for the current view
+   */
+  get_current_view_hash : function() {
+    var detail = [];
+    var cur_page = this.pages[this.cur_page_idx];
+
+    detail.push(cur_page.num);
+    detail.push('XYZ');
+
+    var cur_pos = cur_page.view_position();
+    cur_pos = transform(cur_page.ictm, [cur_pos[0], cur_page.height()-cur_pos[1]]);
+    detail.push(cur_pos[0] / this.scale);
+    detail.push(cur_pos[1] / this.scale);
+
+    detail.push(this.scale);
+
+    return JSON.stringify(detail);
   }
 };
 

src/BackgroundRenderer/CairoBackgroundRenderer.cc

@@ -127,6 +127,9 @@ bool CairoBackgroundRenderer::render_page(PDFDoc * doc, int pageno)
         page_height = doc->getPageMediaHeight(pageno);
     }
 
+    if (doc->getPageRotate(pageno) == 90 || doc->getPageRotate(pageno) == 270)
+        std::swap(page_height, page_width);
+
     string fn = (char*)html_renderer->str_fmt("%s/bg%x.svg", (param.embed_image ? param.tmp_dir : param.dest_dir).c_str(), pageno);
     if(param.embed_image)
         html_renderer->tmp_files.add(fn);

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), gTrue)
+    : SplashOutputDev(splashModeRGB8, 4, gFalse, (SplashColorPtr)(&white))
     , html_renderer(html_renderer)
     , param(param)
     , format(imgFormat)

src/HTMLRenderer/font.cc

@@ -117,6 +117,10 @@ string HTMLRenderer::dump_embedded_font (GfxFont * font, FontInfo & info)
                 {
                     suffix = ".cid";
                 }
+                else if (subtype == "OpenType")
+                {
+                    suffix = ".otf";
+                }
                 else
                 {
                     cerr << "Unknown subtype: " << subtype << endl;

src/pdf2htmlEX.cc

@@ -1,6 +1,6 @@
 // pdf2htmlEX.cc
 //
-// Copyright (C) 2012-2014 Lu Wang <[email protected]>
+// Copyright (C) 2012-2015 Lu Wang <[email protected]>
 
 #include <cstdio>
 #include <cstdlib>
@@ -56,7 +56,7 @@ void show_usage_and_exit(const char * dummy = nullptr)
 void show_version_and_exit(const char * dummy = nullptr)
 {
     cerr << "pdf2htmlEX version " << PDF2HTMLEX_VERSION << endl;
-    cerr << "Copyright 2012-2014 Lu Wang <[email protected]> and other contributors" << endl;
+    cerr << "Copyright 2012-2015 Lu Wang <[email protected]> and other contributors" << endl;
     cerr << "Libraries: " << endl;
     cerr << "  poppler " << POPPLER_VERSION << endl;
     cerr << "  libfontforge " << ffw_get_version() << endl;
@@ -76,13 +76,6 @@ void show_version_and_exit(const char * dummy = nullptr)
 #endif
     cerr << endl;
 
-    // TODO: define constants
-    if(ffw_get_version() < 20130101LL) 
-    {
-        cerr << endl 
-             << "Warning: pdf2htmlEX has been built with a too old version of Fontforge, which is not supported." << endl;
-    }
-
     cerr << endl;
     exit(EXIT_SUCCESS);
 }
@@ -255,7 +248,6 @@ void check_param()
         if(get_suffix(param.input_filename) == ".pdf")
         {
             param.output_filename = s.substr(0, s.size() - 4) + ".html";
-
         }
         else
         {
@@ -298,8 +290,7 @@ void check_param()
         }
         else
         {
-            if(!param.split_pages)
-                param.css_filename = s + ".css";
+            param.css_filename = s + ".css";
         }
     }
     if(param.outline_filename.empty())

src/util/ffw.c

@@ -157,6 +157,13 @@ void ffw_prepare_font(void)
             }
         }
     }
+
+    /*
+     * Wipe out font name
+     * browsers may rejects fonts with malformed font names
+     */
+    free(sf->fontname);
+    sf->fontname = strcopy("");
 }
 
 void ffw_save(const char * filename)
@@ -276,8 +283,11 @@ void ffw_reencode_raw2(char ** mapping, int mapping_len, int force)
 
 void ffw_cidflatten(void)
 {
-    if(!cur_fv->sf->cidmaster)
-        err("Cannot flatten a non-CID font");
+    if(!cur_fv->sf->cidmaster) 
+    {
+        fprintf(stderr, "Cannot flatten a non-CID font\n");
+        return;
+    }
     SFFlatten(cur_fv->sf->cidmaster);
 }
 

src/util/mingw.h

@@ -14,6 +14,7 @@
 
 char *mkdtemp(char *temp);
 
+#include <direct.h>
 #define mkdir(A, B) _mkdir(A)
 #define stat _stat
 

test/browser_tests.py

@@ -97,3 +97,11 @@ def test_text_visibility(self):
     def test_process_form(self):
         self.run_test_case('with_form.pdf', ['--process-form', 1])
 
+    def test_invalid_unicode_issue477(self):
+        self.run_test_case('invalid_unicode_issue477.pdf')
+
+    def test_svg_background_with_page_rotation_issue402(self):
+        self.run_test_case('svg_background_with_page_rotation_issue402.pdf', ['--bg-format', 'svg'])
+
+    def test_fontfile3_opentype(self):
+        self.run_test_case('fontfile3_opentype.pdf', ['-l', 1])