[Python-checkins] CVS: python/dist/src/Doc/tools/sgmlconv conversion.xml,1.14,1.15

[Fred L. Drake]

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

Modified Files:
	conversion.xml 
Log Message:

Move & update a comment.

Add support for the \ulink macro.


Index: conversion.xml
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/tools/sgmlconv/conversion.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** conversion.xml	2001/07/06 21:13:51	1.14
--- conversion.xml	2001/07/07 06:00:36	1.15
***************
*** 53,64 ****
      </macro>
    <macro name="shortversion"/>
    <macro name="versionadded">
      <attribute name="info" optional="yes"/>
      <attribute name="version"/>
      </macro>
-   <!-- This is broken:  we need to re-order the optional and required
-        parameters, making the optional parameter the content for the
-        element.  The processor is not powerful enough to handle this.
-     -->
    <macro name="versionchanged">
      <attribute name="info" optional="yes"/>
--- 53,64 ----
      </macro>
    <macro name="shortversion"/>
+   <!-- These are broken:  we need to re-order the optional and required
+        parameters, making the optional parameter the content for the
+        element.  latex2esis.py is not powerful enough to handle this.
+     -->
    <macro name="versionadded">
      <attribute name="info" optional="yes"/>
      <attribute name="version"/>
      </macro>
    <macro name="versionchanged">
      <attribute name="info" optional="yes"/>
***************
*** 696,699 ****
--- 696,707 ----
    <macro name="email">
      <content/>
+     </macro>
+   <macro name="ulink">
+     <!-- order of the parameters makes this difficult;
+          we'll need to fix it up tp <ulink href="...">...</ulink>
+          in docfixer.py.
+       -->
+     <child name="text"/>
+     <child name="href"/>
      </macro>
    <macro name="url">