[Python-checkins] CVS: python/dist/src/Doc/tools/sgmlconv conversion.xml,1.19,1.20 docfixer.py,1.29,1.30

[Fred L. Drake]

Update of /cvsroot/python/python/dist/src/Doc/tools/sgmlconv
In directory usw-pr-cvs1:/tmp/cvs-serv27642

Modified Files:
	conversion.xml docfixer.py 
Log Message:
Turn \input, \include, and \verbatiminput into XInclude elements instead
of something ad-hoc.


Index: conversion.xml
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/tools/sgmlconv/conversion.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** conversion.xml	2001/09/27 04:18:39	1.19
--- conversion.xml	2001/09/27 15:49:23	1.20
***************
*** 185,189 ****
    <!-- "See also:" sections. -->
    <macro name="seemodule">
!     <attribute name="ref" optional="yes"/>
      <attribute name="name"/>
      <child name="description"/>
--- 185,189 ----
    <!-- "See also:" sections. -->
    <macro name="seemodule">
!     <attribute name="" optional="yes"/>
      <attribute name="name"/>
      <child name="description"/>
***************
*** 280,288 ****
  
    <!-- Entity management. -->
!   <macro name="include">
!     <attribute name="source"/>
      </macro>
!   <macro name="input">
!     <attribute name="source"/>
      </macro>
  
--- 280,288 ----
  
    <!-- Entity management. -->
!   <macro name="include" outputname="xi:include">
!     <attribute name="href"/>
      </macro>
!   <macro name="input" outputname="xi:include">
!     <attribute name="href"/>
      </macro>
  
***************
*** 301,305 ****
                            subsection subsection*
                            subsubsection subsubsection*
!                           paragraph paragraph* subparagraph subparagraph*"/>
  
    <macro name="chapter"
--- 301,309 ----
                            subsection subsection*
                            subsubsection subsubsection*
!                           paragraph paragraph* subparagraph
!                           subparagraph*">
!     <attribute name="xmlns:xi"
!       >http://www.w3.org/2001/XInclude</attribute>
!     </environment>
  
    <macro name="chapter"
***************
*** 459,465 ****
      <attribute name="spaces">visible</attribute>
      </environment>
!   <macro name="verbatiminput" ouptutname="input">
!     <attribute name="verbatim">yes</attribute>
!     <attribute name="source"/>
      </macro>
  
--- 463,469 ----
      <attribute name="spaces">visible</attribute>
      </environment>
!   <macro name="verbatiminput" ouptutname="xi:include">
!     <attribute name="parse">text</attribute>
!     <attribute name="href"/>
      </macro>
  

Index: docfixer.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/tools/sgmlconv/docfixer.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** docfixer.py	2001/07/06 21:03:30	1.29
--- docfixer.py	2001/09/27 15:49:23	1.30
***************
*** 616,620 ****
  PARA_LEVEL_PRECEEDERS = (
      "setindexsubitem", "author",
!     "stindex", "obindex", "COMMENT", "label", "input", "title",
      "versionadded", "versionchanged", "declaremodule", "modulesynopsis",
      "moduleauthor", "indexterm", "leader",
--- 616,620 ----
  PARA_LEVEL_PRECEEDERS = (
      "setindexsubitem", "author",
!     "stindex", "obindex", "COMMENT", "label", "xi:include", "title",
      "versionadded", "versionchanged", "declaremodule", "modulesynopsis",
      "moduleauthor", "indexterm", "leader",