texinfo update (Fri Feb 10 20:22:01 EST 2006)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.566
retrieving revision 1.567
diff -u -r1.566 -r1.567
--- ChangeLog   6 Feb 2006 19:47:04 -0000       1.566
+++ ChangeLog   11 Feb 2006 00:54:35 -0000      1.567
@@ -1,3 +1,9 @@
+2006-02-10  Karl Berry  <address@hidden>
+
+       * util/texinfo.dtd (menucomment): more inclusive.
+       (enumerate): allow indexes.
+       From Torsten.
+
 2006-02-06  Karl Berry  <address@hidden>
 
        * util/texinfo.dtd: apparently we cannot have -- in an XML
Index: util/texinfo.dtd
===================================================================
RCS file: /sources/texinfo/texinfo/util/texinfo.dtd,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- util/texinfo.dtd    6 Feb 2006 19:47:04 -0000       1.9
+++ util/texinfo.dtd    11 Feb 2006 00:54:26 -0000      1.10
@@ -1,4 +1,4 @@
-<!-- $Id: texinfo.dtd,v 1.9 2006/02/06 19:47:04 karl Exp $
+<!-- $Id: texinfo.dtd,v 1.10 2006/02/11 00:54:26 karl Exp $
    Document Type Definition for Texinfo XML output (the '-'-xml option).
 
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software
@@ -235,7 +235,7 @@
 <!ELEMENT menuentry (menunode?, menutitle?, menucomment?)>
 <!ELEMENT menunode (#PCDATA)>
 <!ELEMENT menutitle (#PCDATA)>
-<!ELEMENT menucomment (#PCDATA | para)*>
+<!ELEMENT menucomment (#PCDATA | %Inline.phrase;)*>
 
 <!-- Floating displays -->
 <!ELEMENT float (floattype, floatpos, (%block;)*,
@@ -252,12 +252,11 @@
 
 <!-- Lists -->
 <!ELEMENT itemize (itemfunction, (item | itemize | enumerate | indexterm)*)>
-<!ELEMENT enumerate (enumarg?, (item | itemize | enumerate)*)>
+<!ELEMENT enumerate (item | itemize | enumerate | indexterm)*>
 <!ATTLIST enumerate
           first CDATA #IMPLIED>
 
 <!ELEMENT item (%block;)*>
-<!ELEMENT enumarg (#PCDATA)>
 
 <!ELEMENT itemfunction (#PCDATA | %Inline.phrase;)*>
 
P ChangeLog
P util/texinfo.dtd