[Docutils-checkins] r3409 - in trunk/docutils: docutils/writers/html4css1.py test/functional/expected/standalone_rst_html4css1.html

[<fel...@us...>]

Author: felixwiemann
Date: 2005-05-29 14:42:43 +0200 (Sun, 29 May 2005)
New Revision: 3409

Modified:
   trunk/docutils/docutils/writers/html4css1.py
   trunk/docutils/test/functional/expected/standalone_rst_html4css1.html
Log:
moved aux. <span> tags for multiple IDs *inside* the element which carries the ID

Modified: trunk/docutils/docutils/writers/html4css1.py
===================================================================
--- trunk/docutils/docutils/writers/html4css1.py	2005-05-29 07:58:10 UTC (rev 3408)
+++ trunk/docutils/docutils/writers/html4css1.py	2005-05-29 12:42:43 UTC (rev 3409)
@@ -7,10 +7,10 @@
 """
 Simple HyperText Markup Language document tree Writer.
 
-The output conforms to the HTML 4.01 Transitional DTD and to the Extensible
-HTML version 1.0 Transitional DTD (*almost* strict).  The output contains a
-minimum of formatting information.  A cascading style sheet ("default.css" by
-default) is required for proper viewing with a modern graphical browser.
+The output conforms to the XHTML version 1.0 Transitional DTD
+(*almost* strict).  The output contains a minimum of formatting
+information.  A cascading style sheet ("default.css" by default) is
+required for proper viewing with a modern graphical browser.
 """
 
 __docformat__ = 'reStructuredText'
@@ -311,7 +311,13 @@
         if node.get('ids'):
             atts['id'] = node['ids'][0]
             for id in node['ids'][1:]:
-                prefix.append('<span id="%s"></span>' % id)
+                if infix:
+                    # Empty tag.
+                    prefix.append('<span id="%s"></span>' % id)
+                else:
+                    # Non-empty tag.  We place the auxiliary <span>
+                    # tag *inside* the element.
+                    suffix += '<span id="%s"></span>' % id
         if atts.has_key('id') and tagname in self.named_tags:
             atts['name'] = atts['id']   # for compatibility with old browsers
         attlist = atts.items()

Modified: trunk/docutils/test/functional/expected/standalone_rst_html4css1.html
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_html4css1.html	2005-05-29 07:58:10 UTC (rev 3408)
+++ trunk/docutils/test/functional/expected/standalone_rst_html4css1.html	2005-05-29 12:42:43 UTC (rev 3409)
@@ -21,9 +21,9 @@
 Document header
 <hr class="header"/>
 </div>
-<span id="doctitle"></span><div class="document" id="restructuredtext-test-document">
-<h1 class="title">reStructuredText Test Document</h1>
-<span id="subtitle"></span><h2 class="subtitle" id="examples-of-syntax-constructs">Examples of Syntax Constructs</h2>
+<div class="document" id="restructuredtext-test-document">
+<span id="doctitle"></span><h1 class="title">reStructuredText Test Document</h1>
+<h2 class="subtitle" id="examples-of-syntax-constructs"><span id="subtitle"></span>Examples of Syntax Constructs</h2>
 <table class="docinfo" frame="void" rules="none">
 <col class="docinfo-name" />
 <col class="docinfo-content" />
@@ -494,8 +494,8 @@
 <p>Here's a reference to the above, <a class="citation-reference" href="#cit2002" id="id15" name="id15">[CIT2002]</a>, and a <a href="#id71" name="id72"><span class="problematic" id="id72">[nonexistent]_</span></a>
 citation.</p>
 </div>
-<span id="another-target"></span><div class="section" id="targets">
-<h2><a class="toc-backref" href="#id43" name="targets">2.13&nbsp;&nbsp;&nbsp;Targets</a></h2>
+<div class="section" id="targets">
+<span id="another-target"></span><h2><a class="toc-backref" href="#id43" name="targets">2.13&nbsp;&nbsp;&nbsp;Targets</a></h2>
 <p id="example">This paragraph is pointed to by the explicit &quot;example&quot; target. A
 reference can be found under <a class="reference" href="#inline-markup">Inline Markup</a>, above. <a class="reference" href="#inline-hyperlink-targets">Inline
 hyperlink targets</a> are also possible.</p>