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

of something ad-hoc.
This commit is contained in:
Fred Drake 2001-09-27 15:49:23 +00:00
parent bf99017bbb
commit baacc08ead
2 changed files with 14 additions and 10 deletions

View File

@ -184,7 +184,7 @@
<!-- "See also:" sections. --> <!-- "See also:" sections. -->
<macro name="seemodule"> <macro name="seemodule">
<attribute name="ref" optional="yes"/> <attribute name="" optional="yes"/>
<attribute name="name"/> <attribute name="name"/>
<child name="description"/> <child name="description"/>
</macro> </macro>
@ -279,11 +279,11 @@
</macro> </macro>
<!-- Entity management. --> <!-- Entity management. -->
<macro name="include"> <macro name="include" outputname="xi:include">
<attribute name="source"/> <attribute name="href"/>
</macro> </macro>
<macro name="input"> <macro name="input" outputname="xi:include">
<attribute name="source"/> <attribute name="href"/>
</macro> </macro>
<!-- Large-scale document structure. --> <!-- Large-scale document structure. -->
@ -300,7 +300,11 @@
endcloses="chapter chapter* section section* endcloses="chapter chapter* section section*
subsection subsection* subsection subsection*
subsubsection subsubsection* 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" <macro name="chapter"
closes="chapter chapter* section section* subsection subsection* closes="chapter chapter* section section* subsection subsection*
@ -458,9 +462,9 @@
<!-- not used anywhere, but it's a standard LaTeXism --> <!-- not used anywhere, but it's a standard LaTeXism -->
<attribute name="spaces">visible</attribute> <attribute name="spaces">visible</attribute>
</environment> </environment>
<macro name="verbatiminput" ouptutname="input"> <macro name="verbatiminput" ouptutname="xi:include">
<attribute name="verbatim">yes</attribute> <attribute name="parse">text</attribute>
<attribute name="source"/> <attribute name="href"/>
</macro> </macro>
<!-- Table markup. --> <!-- Table markup. -->

View File

@ -615,7 +615,7 @@ PARA_LEVEL_ELEMENTS = (
PARA_LEVEL_PRECEEDERS = ( PARA_LEVEL_PRECEEDERS = (
"setindexsubitem", "author", "setindexsubitem", "author",
"stindex", "obindex", "COMMENT", "label", "input", "title", "stindex", "obindex", "COMMENT", "label", "xi:include", "title",
"versionadded", "versionchanged", "declaremodule", "modulesynopsis", "versionadded", "versionchanged", "declaremodule", "modulesynopsis",
"moduleauthor", "indexterm", "leader", "moduleauthor", "indexterm", "leader",
) )