summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorFred Drake <fdrake@acm.org>2001-09-27 15:49:23 (GMT)
committerFred Drake <fdrake@acm.org>2001-09-27 15:49:23 (GMT)
commitbaacc08ead3427721a59990de19785f0fbba4a50 (patch)
tree396c818d7e3bda83cfcd6b7292be8e1fa28d971d /Doc
parentbf99017bbb7e6a9be29a949ddb308871af12b31f (diff)
downloadcpython-baacc08ead3427721a59990de19785f0fbba4a50.zip
cpython-baacc08ead3427721a59990de19785f0fbba4a50.tar.gz
cpython-baacc08ead3427721a59990de19785f0fbba4a50.tar.bz2
Turn \input, \include, and \verbatiminput into XInclude elements instead
of something ad-hoc.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/tools/sgmlconv/conversion.xml22
-rwxr-xr-xDoc/tools/sgmlconv/docfixer.py2
2 files changed, 14 insertions, 10 deletions
diff --git a/Doc/tools/sgmlconv/conversion.xml b/Doc/tools/sgmlconv/conversion.xml
index c2f9f0d..20acdf3 100644
--- a/Doc/tools/sgmlconv/conversion.xml
+++ b/Doc/tools/sgmlconv/conversion.xml
@@ -184,7 +184,7 @@
<!-- "See also:" sections. -->
<macro name="seemodule">
- <attribute name="ref" optional="yes"/>
+ <attribute name="" optional="yes"/>
<attribute name="name"/>
<child name="description"/>
</macro>
@@ -279,11 +279,11 @@
</macro>
<!-- Entity management. -->
- <macro name="include">
- <attribute name="source"/>
+ <macro name="include" outputname="xi:include">
+ <attribute name="href"/>
</macro>
- <macro name="input">
- <attribute name="source"/>
+ <macro name="input" outputname="xi:include">
+ <attribute name="href"/>
</macro>
<!-- Large-scale document structure. -->
@@ -300,7 +300,11 @@
endcloses="chapter chapter* section section*
subsection subsection*
subsubsection subsubsection*
- paragraph paragraph* subparagraph subparagraph*"/>
+ paragraph paragraph* subparagraph
+ subparagraph*">
+ <attribute name="xmlns:xi"
+ >http://www.w3.org/2001/XInclude</attribute>
+ </environment>
<macro name="chapter"
closes="chapter chapter* section section* subsection subsection*
@@ -458,9 +462,9 @@
<!-- not used anywhere, but it's a standard LaTeXism -->
<attribute name="spaces">visible</attribute>
</environment>
- <macro name="verbatiminput" ouptutname="input">
- <attribute name="verbatim">yes</attribute>
- <attribute name="source"/>
+ <macro name="verbatiminput" ouptutname="xi:include">
+ <attribute name="parse">text</attribute>
+ <attribute name="href"/>
</macro>
<!-- Table markup. -->
diff --git a/Doc/tools/sgmlconv/docfixer.py b/Doc/tools/sgmlconv/docfixer.py
index 867ec50..c1ea970 100755
--- a/Doc/tools/sgmlconv/docfixer.py
+++ b/Doc/tools/sgmlconv/docfixer.py
@@ -615,7 +615,7 @@ PARA_LEVEL_ELEMENTS = (
PARA_LEVEL_PRECEEDERS = (
"setindexsubitem", "author",
- "stindex", "obindex", "COMMENT", "label", "input", "title",
+ "stindex", "obindex", "COMMENT", "label", "xi:include", "title",
"versionadded", "versionchanged", "declaremodule", "modulesynopsis",
"moduleauthor", "indexterm", "leader",
)