Turn \input, \include, and \verbatiminput into XInclude elements instead

of something ad-hoc.

diff --git a/Doc/tools/sgmlconv/conversion.xml b/Doc/tools/sgmlconv/conversion.xml
index c2f9f0d9200e52d5bfd278d7a2b4813a40a779ef..20acdf36c145ee2bfb6c7705293e318527e0dcc8 100644 (file)
--- 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 867ec5073a4c02af3ec350fc820346582a19bb8e..c1ea9707742acefda5a551444f2254a9f70f15e8 100755 (executable)
--- 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",
     )