From 494981be400aa989a32b9d7dbfa5c4329d82c386 Mon Sep 17 00:00:00 2001
From: milde <milde@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>
Date: Wed, 12 Sep 2012 07:22:25 +0000
Subject: [PATCH] Fix import of PIL.Image.

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@7510 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
---
 HISTORY.txt                               |  1 +
 docutils/parsers/rst/directives/images.py |  2 +-
 docutils/writers/html4css1/__init__.py    | 10 ++++++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/HISTORY.txt b/HISTORY.txt
index 84daee364..9f46808ac 100644
--- a/HISTORY.txt
+++ b/HISTORY.txt
@@ -24,6 +24,7 @@ Changes Since 0.9.1
   - Fix [3541369] Relative __import__ also with Python 3.3.
   - Fix [3559988] and [3560841] __import__ local writer, reader, languages 
     and parsers for Python 2.7 up.
+  - Fix import of PIL.Image.
 
 * docutils/io.py
 
diff --git a/docutils/parsers/rst/directives/images.py b/docutils/parsers/rst/directives/images.py
index 7adda2edf..f48d3d708 100644
--- a/docutils/parsers/rst/directives/images.py
+++ b/docutils/parsers/rst/directives/images.py
@@ -17,7 +17,7 @@ from docutils.parsers.rst import directives, states
 from docutils.nodes import fully_normalize_name, whitespace_normalize_name
 from docutils.parsers.rst.roles import set_classes
 try: # check for the Python Imaging Library
-    import PIL
+    import PIL.Image
 except ImportError:
     try:  # sometimes PIL modules are put in PYTHONPATH's root
         import Image
diff --git a/docutils/writers/html4css1/__init__.py b/docutils/writers/html4css1/__init__.py
index 2f71d0451..fb60e0861 100644
--- a/docutils/writers/html4css1/__init__.py
+++ b/docutils/writers/html4css1/__init__.py
@@ -22,7 +22,7 @@ import time
 import re
 import urllib
 try: # check for the Python Imaging Library
-    import PIL
+    import PIL.Image
 except ImportError:
     try:  # sometimes PIL modules are put in PYTHONPATH's root
         import Image
@@ -602,7 +602,13 @@ class HTMLTranslator(nodes.NodeVisitor):
                          '</tbody>\n</table>\n')
 
     def visit_citation_reference(self, node):
-        href = '#' + node['refid']
+        href = '#'
+        if 'refid' in node:
+            href += node['refid']
+        elif 'refname' in node:
+            href += self.document.nameids[node['refname']]
+        # else: # TODO system message (or already in the transform)?
+        # 'Citation reference missing.'
         self.body.append(self.starttag(
             node, 'a', '[', CLASS='citation-reference', href=href))
 
-- 
2.11.4.GIT