From 2555b388360711a365bab32aca7192d9dd790e87 Mon Sep 17 00:00:00 2001
From: "yusuke.shinyama.dummy"
 <yusuke.shinyama.dummy@1aa58f4a-7d42-0410-adbc-911cccaed67c>
Date: Mon, 15 Feb 2010 14:50:19 +0000
Subject: [PATCH] fix typos (patches by sm)

git-svn-id: https://pdfminerr.googlecode.com/svn/trunk/pdfminer@183 1aa58f4a-7d42-0410-adbc-911cccaed67c
---
 docs/index.html       | 13 ++++++++-----
 pdfminer/converter.py |  2 +-
 pdfminer/layout.py    |  2 +-
 pdfminer/pdfparser.py |  2 +-
 pdfminer/pdftypes.py  | 10 ++++++++--
 tools/dumppdf.py      |  7 +++++++
 6 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/docs/index.html b/docs/index.html
index b60df7f..b119389 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -19,7 +19,7 @@ Python PDF parser and analyzer
 
 <div align=right class=lastmod>
 <!-- hhmts start -->
-Last Modified: Sun Feb  7 12:13:27 JST 2010
+Last Modified: Mon Feb 15 14:41:49 UTC 2010
 <!-- hhmts end -->
 </div>
 
@@ -27,7 +27,7 @@ Last Modified: Sun Feb  7 12:13:27 JST 2010
 <li> <a href="#intro">What's It?</a>
 <li> <a href="#source">Download</a>
 <li> <a href="#install">Install</a> 
-&nbsp; <small>(<a href="#cmap">for East Asian languages</a>)</small>
+&nbsp; <small>(<a href="#cmap">for CJK languages</a>)</small>
 <li> <a href="#usage">How to Use</a>
 &nbsp; <small>(<a href="#pdf2txt">pdf2txt.py</a>, <a href="#dumppdf">dumppdf.py</a>)</small>
 <li> <a href="#todos">TODOs</a>
@@ -54,7 +54,7 @@ PDF parser that can be used for other purposes instead of text analysis.
 <ul>
 <li> Written entirely in Python. (for version 2.4 or newer)
 <li> PDF-1.7 specification support. (well, almost)
-<li> East Asian languages and vertical writing scripts support.
+<li> CJK languages and vertical writing scripts support.
 <li> Various font types (Type1, TrueType, Type3, and CID) support.
 <li> Basic encryption (RC4) support.
 <li> PDF to HTML conversion (with a sample converter web app).
@@ -94,6 +94,7 @@ http://pdf2html.tabesugi.net:8080/
 
 <ol>
 <li> Install <a href="http://www.python.org/download/">Python</a> 2.4 or newer.
+(<font color=red><strong>Python 3 is not supported.</strong></font>)
 <li> Download the <a href="#source">PDFMiner source</a>.
 <li> Unpack it.
 <li> Run <code>setup.py</code> to install:<br>
@@ -125,8 +126,8 @@ W o r l d
 
 <p>
 <a name="cmap"></a>
-<h3>For East Asian languages</h3>
-In order to handle East Asian languages (Chinese or Japanese, etc.),
+<h3>For CJK languages</h3>
+In order to handle CJK languages,
 an additional data called <code>CMap</code> is required.
 CMap files are not installed by default.
 <p>
@@ -347,6 +348,8 @@ no stream header is displayed for the ease of saving it to a file.
 <hr noshade>
 <h2>Changes</h2>
 <ul>
+<li> 2010/02/15: Bugfixes. Thanks to Sean.
+<li> 2010/02/13: Bugfix and enhancement. Thanks to Andr&eacute; Auzi.
 <li> 2010/02/07: Several bugfixes. Thanks to Hiroshi Manabe.
 <li> 2010/01/31: JPEG image extraction supported. Page rotation bug fixed. 
 <li> 2010/01/04: Python 2.6 warning removal. More doctest conversion.
diff --git a/pdfminer/converter.py b/pdfminer/converter.py
index 41e08b6..973d3c6 100644
--- a/pdfminer/converter.py
+++ b/pdfminer/converter.py
@@ -53,7 +53,7 @@ class PDFPageAggregator(PDFTextDevice):
     def render_image(self, name, stream):
         assert isinstance(self.cur_item, LTFigure)
         ismask = stream.get_any(('IM', 'ImageMask'))
-        bits = stream.get_any(('BPC', 'BitsPerCompoment'), 1)
+        bits = stream.get_any(('BPC', 'BitsPerComponent'), 1)
         csp = stream.get_any(('CS', 'ColorSpace'))
         if not isinstance(csp, list):
             csp = [csp]
diff --git a/pdfminer/layout.py b/pdfminer/layout.py
index 91a4a71..c889b16 100644
--- a/pdfminer/layout.py
+++ b/pdfminer/layout.py
@@ -294,7 +294,7 @@ class LTImage(LayoutItem):
 
     def __repr__(self):
         (w,h) = self.srcsize
-        return '<image %s %s %dx%d>' % (self.id, self.type, w, h)
+        return '<image %s %s %dx%d>' % (self.name, self.type, w, h)
 
     def get_weight(self):
         return 0
diff --git a/pdfminer/pdfparser.py b/pdfminer/pdfparser.py
index c8bb0f3..2581888 100644
--- a/pdfminer/pdfparser.py
+++ b/pdfminer/pdfparser.py
@@ -188,7 +188,7 @@ class PDFXRefStream(PDFBaseXRef):
 
     def get_objids(self):
         for objid_range in self.objid_ranges:
-            for x in xrange(objid_range.get_start_id(), objid <= objid_range.get_end_id()+1):
+            for x in xrange(objid_range.get_start_id(), objid_range.get_end_id()+1):
                 yield x
         return
 
diff --git a/pdfminer/pdftypes.py b/pdfminer/pdftypes.py
index a4f7da1..74721a4 100644
--- a/pdfminer/pdftypes.py
+++ b/pdfminer/pdftypes.py
@@ -165,7 +165,12 @@ class PDFStream(PDFObject):
         return
 
     def __repr__(self):
-        return '<PDFStream(%r): raw=%d, %r>' % (self.objid, len(self.rawdata), self.attrs)
+        if self.data is None:
+            assert self.rawdata is not None
+            return '<PDFStream(%r): raw=%d, %r>' % (self.objid, len(self.rawdata), self.attrs)
+        else:
+            assert self.data is not None
+            return '<PDFStream(%r): len=%d, %r>' % (self.objid, len(self.data), self.attrs)
 
     def __contains__(self, name):
         return name in self.attrs
@@ -203,7 +208,8 @@ class PDFStream(PDFObject):
             data = self.decipher(self.objid, self.genno, data)
         filters = self.get_any(('F', 'Filter'))
         if not filters:
-            self.rawdata = self.data = data
+            self.data = data
+            self.rawdata = None
             return
         if not isinstance(filters, list):
             filters = [ filters ]
diff --git a/tools/dumppdf.py b/tools/dumppdf.py
index 785f070..cd8bb28 100755
--- a/tools/dumppdf.py
+++ b/tools/dumppdf.py
@@ -116,6 +116,13 @@ def dumpoutline(outfp, fname, objids, pagenos, password='',
             if isinstance(dest, dict):
                 dest = dest['D']
             pageno = pages[dest[0].objid]
+        elif a:
+            action = a.resolve()
+            if isinstance(action, dict):
+                subtype = action.get('S')
+                if subtype and repr(subtype) == '/GoTo' and action.get('D'):
+                    dest = action['D']
+                    pageno = pages[dest[0].objid]
         outfp.write(repr((level,title,dest,pageno))+'\n')
     parser.close()
     fp.close()