From af60845550040f7641332f11a311ec21f7b78f8a Mon Sep 17 00:00:00 2001
From: Lu Wang <coolwanglu@gmail.com>
Date: Mon, 4 Nov 2013 23:53:38 +0800
Subject: [PATCH] remove page_decoration

---
 share/base.css.in                  | 16 +++-------------
 share/fancy.css.in                 |  2 +-
 share/pdf2htmlEX.js.in             |  9 +++------
 src/HTMLRenderer/general.cc        | 16 ++++++----------
 src/css_class_names.cmakelists.txt |  1 -
 5 files changed, 13 insertions(+), 31 deletions(-)

diff --git a/share/base.css.in b/share/base.css.in
index 48f3cf4..06e9408 100644
--- a/share/base.css.in
+++ b/share/base.css.in
@@ -72,17 +72,8 @@
  * The followings are base classes, some of which are meant to be override by PDF specific classes
  * So do not increase the specificity (e.g. ".classname" -> "#page-container .classname")
  */
-.@CSS_PAGE_DECORATION_CN@ { /* page decoration */
-  position:relative;
-  border: 0;
-  overflow: hidden;
-}
 .@CSS_PAGE_FRAME_CN@ { /* page */
-  position:absolute;
-  top:0;
-  left:0;
-  width:100%;
-  height:100%;
+  position:relative;
   background-color:white;
   overflow: hidden;
   margin:0; 
@@ -130,7 +121,7 @@
   user-select:none;
 }
 @media print {
-  .@CSS_PAGE_DECORATION_CN@ {
+  .@CSS_PAGE_FRAME_CN@ {
     margin:0;
     box-shadow:none;
     page-break-after:always;
@@ -138,11 +129,10 @@
   }
   @-moz-document url-prefix() {
     /* fix page truncation for FireFox */
-    .@CSS_PAGE_DECORATION_CN@ {
+    .@CSS_PAGE_FRAME_CN@ {
       overflow:visible;
       border:1px solid #FFFFFF;
     }
-    .@CSS_PAGE_FRAME_CN@ {overflow:visible;}
     .@CSS_PAGE_CONTENT_BOX_CN@ {overflow:visible;}
   }
 }
diff --git a/share/fancy.css.in b/share/fancy.css.in
index eecc905..9d63266 100644
--- a/share/fancy.css.in
+++ b/share/fancy.css.in
@@ -62,7 +62,7 @@
     -webkit-transition:left 500ms;
     transition:left 500ms;
   }
-  .@CSS_PAGE_DECORATION_CN@ {
+  .@CSS_PAGE_FRAME_CN@ {
     margin: 13px auto;
     box-shadow: 1px 1px 3px 1px #333;
     /* Needed by IE to make box-shadow works * https://developer.mozilla.org/en-US/docs/Web/CSS/box-shadow */
diff --git a/share/pdf2htmlEX.js.in b/share/pdf2htmlEX.js.in
index 6c7a274..50f22cc 100644
--- a/share/pdf2htmlEX.js.in
+++ b/share/pdf2htmlEX.js.in
@@ -45,7 +45,6 @@
   */
   var CSS_CLASS_NAMES = {
     page_frame       : '@CSS_PAGE_FRAME_CN@',
-    page_decoration  : '@CSS_PAGE_DECORATION_CN@',
     page_content_box : '@CSS_PAGE_CONTENT_BOX_CN@',
     page_data        : '@CSS_PAGE_DATA_CN@',
     background_image : '@CSS_BACKGROUND_IMAGE_CN@',
@@ -112,8 +111,6 @@
     this.n = parseInt(this.$p.data('page-no'), 16);
     // content box
     this.$b = $('.'+CSS_CLASS_NAMES.page_content_box, this.$p);
-    // decoration
-    this.$d = this.$p.parent('.'+CSS_CLASS_NAMES.page_decoration);
 
     // page size
     // Need to make rescale work when page_content_box is not loaded, yet
@@ -171,8 +168,8 @@
       else
         this.hide();    // Wait for redraw
 
-      this.$d.height(this.h * this.set_r);
-      this.$d.width(this.w * this.set_r);
+      this.$p.height(this.h * this.set_r);
+      this.$p.width(this.w * this.set_r);
     },
     /* return if any part of this page is shown in the container */
     is_visible : function() {
@@ -333,7 +330,7 @@
           // replace the old page with loaded data
           // the loading indicator on this page should also be destroyed
           var p = _.pages[idx];
-          p.$d.replaceWith(data);
+          p.$p.replaceWith(data);
 
           var $new_pf = _.$container.find('#' + CSS_CLASS_NAMES.page_frame + p.n.toString(16));
           p = new Page($new_pf, _.$container);
diff --git a/src/HTMLRenderer/general.cc b/src/HTMLRenderer/general.cc
index 2a41348..416725f 100644
--- a/src/HTMLRenderer/general.cc
+++ b/src/HTMLRenderer/general.cc
@@ -183,12 +183,10 @@ void HTMLRenderer::startPage(int pageNum, GfxState *state, XRef * xref)
     long long wid = all_manager.width.install(pageWidth);
     long long hid = all_manager.height.install(pageHeight);
     (*f_curpage)
-        << "<div class=\"" << CSS::PAGE_DECORATION_CN 
-            << " " << CSS::WIDTH_CN << wid
-            << " " << CSS::HEIGHT_CN << hid
-            << "\">"
         << "<div id=\"" << CSS::PAGE_FRAME_CN << pageNum 
             << "\" class=\"" << CSS::PAGE_FRAME_CN
+            << " " << CSS::WIDTH_CN << wid
+            << " " << CSS::HEIGHT_CN << hid
             << "\" data-page-no=\"" << pageNum << "\">"
         << "<div class=\"" << CSS::PAGE_CONTENT_BOX_CN 
             << " " << CSS::PAGE_CONTENT_BOX_CN << pageNum
@@ -203,12 +201,10 @@ void HTMLRenderer::startPage(int pageNum, GfxState *state, XRef * xref)
     if(param.split_pages)
     {
         f_pages.fs
-            << "<div class=\"" << CSS::PAGE_DECORATION_CN 
-                << " " << CSS::WIDTH_CN << wid
-                << " " << CSS::HEIGHT_CN << hid
-                << "\">"
             << "<div id=\"" << CSS::PAGE_FRAME_CN << pageNum 
                 << "\" class=\"" << CSS::PAGE_FRAME_CN
+                << " " << CSS::WIDTH_CN << wid
+                << " " << CSS::HEIGHT_CN << hid
                 << "\" data-page-no=\"" << pageNum 
                 << "\" data-page-url=\"";
 
@@ -253,11 +249,11 @@ void HTMLRenderer::endPage() {
     (*f_curpage) << "}'></div>";
     
     // close page
-    (*f_curpage) << "</div></div>" << endl;
+    (*f_curpage) << "</div>" << endl;
 
     if(param.split_pages)
     {
-        f_pages.fs << "</div></div>" << endl;
+        f_pages.fs << "</div>" << endl;
     }
 }
 
diff --git a/src/css_class_names.cmakelists.txt b/src/css_class_names.cmakelists.txt
index 569370d..ef66501 100644
--- a/src/css_class_names.cmakelists.txt
+++ b/src/css_class_names.cmakelists.txt
@@ -11,7 +11,6 @@ set(CSS_LINE_CN             "t") # Text
 set(CSS_TRANSFORM_MATRIX_CN "m") # Matrix
 set(CSS_CLIP_CN             "c") # Clip
 
-set(CSS_PAGE_DECORATION_CN  "pd") # Page Decoration
 set(CSS_PAGE_FRAME_CN       "pf") # Page Frame
 set(CSS_PAGE_CONTENT_BOX_CN "pc") # Page Content
 set(CSS_PAGE_DATA_CN        "pi") # Page Info