fixed bug with "image" directive "target" option

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk/docutils@3828 929543f6-e4f2-0310-98a6-ba3bd3dd1d04

3 files changed, 9 insertions, 6 deletions

diff --git a/HISTORY.txt b/HISTORY.txt
index 6601bb25a..29fb21421 100644
--- a/HISTORY.txt
+++ b/HISTORY.txt
@@ -47,6 +47,7 @@ Changes Since 0.3.9
 * docutils/parsers/rst/states.py:
 
   - Fixed bug with escaped colons indicating a literal block.
+  - Fixed bug with enumerated lists (SF#1254145).
 
 * docutils/parsers/rst/directives/misc.py:
 
@@ -56,6 +57,7 @@ Changes Since 0.3.9
 * docutils/parsers/rst/directives/images.py:
 
   - Added support for image width and height units.
+  - Fixed bug with image "target" options.
 
 * docutils/parsers/rst/include/: Directory added to project; contains
   standard data files for the "include" directive.  Initial contents:
diff --git a/docutils/parsers/rst/directives/images.py b/docutils/parsers/rst/directives/images.py
index ef77c2bef..1c9c50e26 100644
--- a/docutils/parsers/rst/directives/images.py
+++ b/docutils/parsers/rst/directives/images.py
@@ -14,7 +14,7 @@ __docformat__ = 'reStructuredText'
 import sys
 from docutils import nodes, utils
 from docutils.parsers.rst import directives, states
-from docutils.nodes import fully_normalize_name
+from docutils.nodes import fully_normalize_name, whitespace_normalize_name
 from docutils.parsers.rst.roles import set_classes
 
 try:
@@ -60,8 +60,9 @@ def image(name, arguments, options, content, lineno,
         if target_type == 'refuri':
             reference_node = nodes.reference(refuri=data)
         elif target_type == 'refname':
-            reference_node = nodes.reference(refname=data,
-                name=fully_normalize_name(options['target']))
+            reference_node = nodes.reference(
+                refname=fully_normalize_name(data),
+                name=whitespace_normalize_name(data))
             state.document.note_refname(reference_node)
         else:                           # malformed target
             messages.append(data)       # data is a system message
diff --git a/test/test_parsers/test_rst/test_directives/test_images.py b/test/test_parsers/test_rst/test_directives/test_images.py
index 4e4c429f6..50f555ba1 100755
--- a/test/test_parsers/test_rst/test_directives/test_images.py
+++ b/test/test_parsers/test_rst/test_directives/test_images.py
@@ -295,7 +295,7 @@ totest['images'] = [
 """,
 """\
 <document source="test data">
-    <reference name="indirect_" refname="indirect">
+    <reference name="indirect" refname="indirect">
         <image uri="picture.png">
 """],
 ["""\
@@ -311,7 +311,7 @@ totest['images'] = [
 <document source="test data">
     <reference refuri="a/multi/line/uri">
         <image uri="picture.png">
-    <reference name="`a multi line internal reference`_" refname="a multi line internal reference">
+    <reference name="a multi line internal reference" refname="a multi line internal reference">
         <image uri="picture.png">
 """],
 ["""\
@@ -401,7 +401,7 @@ u"""\
 """,
 """\
 <document source="test data">
-    <reference name="uppercase_" refname="Uppercase">
+    <reference name="Uppercase" refname="uppercase">
         <image uri="test.png">
     <target ids="uppercase" names="uppercase" refuri="http://docutils.sourceforge.net/">
 """],