summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgoodger <goodger@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>2004-01-04 17:39:13 +0000
committergoodger <goodger@929543f6-e4f2-0310-98a6-ba3bd3dd1d04>2004-01-04 17:39:13 +0000
commitb12c8d439c59c42c3f13afbfd4f75d8736495f4e (patch)
tree941b2d8c05fa7d06943268304493737a91ec3bc1
parenta5fe4b8e544635e3ee0aadd082785d1836ba5786 (diff)
downloaddocutils-b12c8d439c59c42c3f13afbfd4f75d8736495f4e.tar.gz
support for body-level reference nodes
git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@1792 929543f6-e4f2-0310-98a6-ba3bd3dd1d04
-rw-r--r--docutils/docs/ref/docutils.dtd3
-rw-r--r--docutils/docutils/writers/html4css1.py6
2 files changed, 8 insertions, 1 deletions
diff --git a/docutils/docs/ref/docutils.dtd b/docutils/docs/ref/docutils.dtd
index dc58a9739..7add492f3 100644
--- a/docutils/docs/ref/docutils.dtd
+++ b/docutils/docs/ref/docutils.dtd
@@ -121,7 +121,7 @@ resolve to either an internal or external reference.
| option_list
| attention | caution | danger | error | hint | important | note
| tip | warning | admonition
- | target | substitution_definition | comment | pending
+ | reference | target | substitution_definition | comment | pending
| system_message | raw
%additional.body.elements; ">
@@ -512,6 +512,7 @@ following caveats:
<!ELEMENT literal (#PCDATA)>
<!ATTLIST literal %basic.atts;>
+<!-- Can also be a body element, when it contains an "image" element. -->
<!ELEMENT reference %text.model;>
<!ATTLIST reference
%basic.atts;
diff --git a/docutils/docutils/writers/html4css1.py b/docutils/docutils/writers/html4css1.py
index 2bfe1b1ca..1760f3f19 100644
--- a/docutils/docutils/writers/html4css1.py
+++ b/docutils/docutils/writers/html4css1.py
@@ -941,6 +941,11 @@ class HTMLTranslator(nodes.NodeVisitor):
raise nodes.SkipNode
def visit_reference(self, node):
+ if isinstance(node.parent, nodes.TextElement):
+ self.context.append('')
+ else:
+ self.body.append('<p>')
+ self.context.append('</p>\n')
if node.has_key('refuri'):
href = node['refuri']
elif node.has_key('refid'):
@@ -952,6 +957,7 @@ class HTMLTranslator(nodes.NodeVisitor):
def depart_reference(self, node):
self.body.append('</a>')
+ self.body.append(self.context.pop())
def visit_revision(self, node):
self.visit_docinfo_item(node, 'revision', meta=None)