From f4ced297130b844f22a138bdcd080cdfabe3ea36 Mon Sep 17 00:00:00 2001
From: "yusuke.shinyama.dummy"
 <yusuke.shinyama.dummy@1aa58f4a-7d42-0410-adbc-911cccaed67c>
Date: Sat, 25 Dec 2010 08:40:45 +0000
Subject: [PATCH] bugfix by Kevin Brubeck Unhammer

git-svn-id: https://pdfminerr.googlecode.com/svn/trunk/pdfminer@278 1aa58f4a-7d42-0410-adbc-911cccaed67c
---
 docs/index.html     | 7 +++++--
 pdfminer/pdffont.py | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/docs/index.html b/docs/index.html
index 9098a6c..bfb8166 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -9,7 +9,7 @@
 
 <div align=right class=lastmod>
 <!-- hhmts start -->
-Last Modified: Sun Nov 14 15:03:59 UTC 2010
+Last Modified: Thu Dec 23 12:21:16 UTC 2010
 <!-- hhmts end -->
 </div>
 
@@ -21,6 +21,8 @@ Python PDF parser and analyzer
 <a href="http://www.unixuser.org/~euske/python/pdfminer/index.html">Homepage</a>
 &nbsp;
 <a href="#changes">Recent Changes</a>
+&nbsp;
+<a href="programming.html">PDFMiner API</a>
 
 <ul>
 <li> <a href="#intro">What's It?</a>
@@ -349,7 +351,8 @@ no stream header is displayed for the ease of saving it to a file.
 
 <h2><a name="changes">Changes</a></h2>
 <ul>
-<li> 2010/10/17: A couple of bugfixes and a minor improvement. Thanks to standardabweichung and Alastair Irving.
+<li> 2010/12/xx: A couple of bugfixes and minor improvements. Thanks to Kevin Brubeck Unhammer.
+<li> 2010/10/17: A couple of bugfixes and minor improvements. Thanks to standardabweichung and Alastair Irving.
 <li> 2010/09/07: A minor bugfix. Thanks to Alexander Garden.
 <li> 2010/08/29: A couple of bugfixes. Thanks to Sahan Malagi, pk, and Humberto Pereira.
 <li> 2010/07/06: Minor bugfixes. Thanks to Federico Brega.
diff --git a/pdfminer/pdffont.py b/pdfminer/pdffont.py
index 1d7c5ed..6d6d39b 100644
--- a/pdfminer/pdffont.py
+++ b/pdfminer/pdffont.py
@@ -424,14 +424,14 @@ class PDFFont(object):
     def __init__(self, descriptor, widths, default_width=None):
         self.descriptor = descriptor
         self.widths = widths
-        self.fontname = descriptor.get('FontName', 'unknown')
+        self.fontname = resolve1(descriptor.get('FontName', 'unknown'))
         if isinstance(self.fontname, PSLiteral):
             self.fontname = literal_name(self.fontname)
         self.flags = int_value(descriptor.get('Flags', 0))
         self.ascent = num_value(descriptor.get('Ascent', 0))
         self.descent = num_value(descriptor.get('Descent', 0))
         self.italic_angle = num_value(descriptor.get('ItalicAngle', 0))
-        self.default_width = default_width or descriptor.get('MissingWidth', 0)
+        self.default_width = default_width or num_value(descriptor.get('MissingWidth', 0))
         self.leading = num_value(descriptor.get('Leading', 0))
         self.bbox = list_value(descriptor.get('FontBBox', (0,0,0,0)))
         self.hscale = self.vscale = .001