fix for IE, use new em size

coolwanglu · Sep 13, 2012 · a28d9f8 · a28d9f8
1 parent 602e037
commit a28d9f8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/HTMLRenderer/state.cc b/src/HTMLRenderer/state.cc
@@ -98,7 +98,7 @@ void HTMLRenderer::check_state_change(GfxState * state)
 
         if(!(new_font_info->id == cur_font_info->id))
         {
-            new_line_state = max(new_line_state, NLS_SPAN);
+            new_line_state = max(new_line_state, NLS_DIV);
             cur_font_info = new_font_info;
         }
 

diff --git a/src/HTMLRenderer/text.cc b/src/HTMLRenderer/text.cc
@@ -359,9 +359,9 @@ void HTMLRenderer::embed_font(const string & filepath, GfxFont * font, FontInfo
 
     {
         // read metrics
-        int em = ff_get_em_size();
         int ascent = ff_get_max_ascent();
         int descent = ff_get_max_descent();
+        int em = ascent + descent;
         if(em != 0)
         {
             info.ascent = ((double)ascent) / em;