From 1c5ea6daee380b4467ceb250cb9a993ff27ae291 Mon Sep 17 00:00:00 2001
From: Lu Wang <coolwanglu@gmail.com>
Date: Fri, 21 Sep 2012 21:02:54 +0800
Subject: [PATCH] fixe multiplier, don't make it too big

---
 TODO                      |  2 ++
 src/HTMLRenderer/state.cc |  2 +-
 src/HTMLRenderer/text.cc  | 11 +++++------
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/TODO b/TODO
index 5fd7f32..1ea4e00 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,5 @@
+intermediate asc/des
+
 fix auto hint
 
 bug found in baidu(ubuntu...), bug_chn
diff --git a/src/HTMLRenderer/state.cc b/src/HTMLRenderer/state.cc
index 67c1cee..867e360 100644
--- a/src/HTMLRenderer/state.cc
+++ b/src/HTMLRenderer/state.cc
@@ -146,7 +146,7 @@ void HTMLRenderer::check_state_change(GfxState * state)
         double new_draw_ctm[6];
         memcpy(new_draw_ctm, cur_ctm, sizeof(new_draw_ctm));
 
-        double new_draw_scale = (param->font_size_multiplier) * sqrt(new_draw_ctm[2] * new_draw_ctm[2] + new_draw_ctm[3] * new_draw_ctm[3]);
+        double new_draw_scale = (param->font_size_multiplier) / (param->zoom) * sqrt(new_draw_ctm[2] * new_draw_ctm[2] + new_draw_ctm[3] * new_draw_ctm[3]);
 
         double new_draw_font_size = cur_font_size;
         if(_is_positive(new_draw_scale))
diff --git a/src/HTMLRenderer/text.cc b/src/HTMLRenderer/text.cc
index 2244ca6..28b2211 100644
--- a/src/HTMLRenderer/text.cc
+++ b/src/HTMLRenderer/text.cc
@@ -185,12 +185,6 @@ void HTMLRenderer::embed_font(const string & filepath, GfxFont * font, FontInfo
     const char * used_map = nullptr;
 
     ffw_metric(&info.ascent, &info.descent, &info.em_size);
-
-    if(param->debug)
-    {
-        cerr << "Ascent: " << info.ascent << " Descent: " << info.descent << endl;
-    }
-
     if(!get_metric_only)
     {
         used_map = font_preprocessor.get_code_map(hash_ref(font->getID()));
@@ -399,6 +393,11 @@ void HTMLRenderer::embed_font(const string & filepath, GfxFont * font, FontInfo
         ffw_save((char*)fn);
         ffw_close();
     }
+
+    if(param->debug)
+    {
+        cerr << "Ascent: " << info.ascent << " Descent: " << info.descent << endl;
+    }
 }
 
 void HTMLRenderer::drawString(GfxState * state, GooString * s)