From 99900462633ab0ce66c1e314081ec0bbbba1a2b0 Mon Sep 17 00:00:00 2001
From: Lu Wang <coolwanglu@gmail.com>
Date: Wed, 26 Sep 2012 16:00:55 +0800
Subject: [PATCH] more types or links

---
 TODO                |  8 +++----
 share/pdf2htmlEX.js | 54 +++++++++++++++++++++++++++++++++++++--------
 2 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/TODO b/TODO
index ccdd61b..dfc5b41 100644
--- a/TODO
+++ b/TODO
@@ -2,18 +2,16 @@ merge sub/sup into one line
 
 bug found in baidu(ubuntu...)
 
-precise link dest
-more types
-cancel margins
+precise link dest: more types
 
 try harder finding glyph names (using fontforge) for CID Type 0
 
 rename single-html -> embed-font/image/css ...
 
-argument auto-completion
-add fallback font for ' ', or create glyph for it
+create a glyph for ' ', if there is not in a font
 
 ==Future==
+argument auto-completion
 use absolute positioning for long whitespace
 color invert
 detect duplicate base fonts when embedding
diff --git a/share/pdf2htmlEX.js b/share/pdf2htmlEX.js
index 810ea7b..59a1ee4 100644
--- a/share/pdf2htmlEX.js
+++ b/share/pdf2htmlEX.js
@@ -245,25 +245,61 @@ var pdf2htmlEX = (function(){
       if(detail_str == undefined) return;
 
       var ok = false;
-      var detail= JSON.parse(detail_str);
+      var detail = JSON.parse(detail_str);
+
+      var target_page = _.pages[detail[0]];
+      if(target_page == undefined) return;
+
+      var pos = [0,0];
+      var upside_down = true;
+      // TODO: zoom
+      // TODO: BBox
       switch(detail[1]) {
         case 'XYZ':
-          var pos = [(detail[2] == null) ? cur_pos[0] : detail[2]
-                    ,(detail[3] == null) ? cur_pos[1] : detail[3]];
-          pos = transform(cur_page.ctm, pos);
-
-          _.scroll_to(detail[0], pos);
-
+          pos = [(detail[2] == null) ? cur_pos[0] : detail[2]
+                 ,(detail[3] == null) ? cur_pos[1] : detail[3]];
+          ok = true;
+          break;
+        case 'Fit':
+        case 'FitB':
+          pos = [0,0];
+          ok = true;
+          break;
+        case 'FitH':
+        case 'FitBH':
+          pos = [0, (detail[2] == null) ? cur_pos[1] : detail[2]]
+          ok = true;
+          break;
+        case 'FitV':
+        case 'FitBV':
+          pos = [(detail[2] == null) ? cur_pos[0] : detail[2], 0];
+          ok = true;
+          break;
+        case 'FitR':
+          /* locate the top-left corner of the rectangle */
+          pos = [detail[2], detail[5]];
+          upside_down = false;
+          ok = true;
+          break;
+          pos = [0,0];
           ok = true;
           break;
         default:
+          ok = false;
           break;
       }
 
-      if(ok)
+      if(ok) {
+        pos = transform(target_page.ctm, pos);
+        if(upside_down) {
+          pos[1] = target_page.height() - pos[1];
+        }
+        _.scroll_to(detail[0], pos);
         e.preventDefault();
+      }
     }, 
     
+    /* pos=[x,y], where (0,0) is the top-left corner */
     scroll_to : function(pageno, pos) {
       var target_page = this.pages[pageno];
       if(target_page == undefined) return;
@@ -271,7 +307,7 @@ var pdf2htmlEX = (function(){
       var cur_target_pos = target_page.position();
 
       this.container.scrollLeft(this.container.scrollLeft()-cur_target_pos[0]+pos[0]);
-      this.container.scrollTop(this.container.scrollTop()-cur_target_pos[1]+target_page.height()-pos[1]);
+      this.container.scrollTop(this.container.scrollTop()-cur_target_pos[1]+pos[1]);
     },
 
     __last_member__ : 'no comma' /*,*/