texinfo/util texinfo.dtd

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/09/09 22:24:02

Modified files:
        util           : texinfo.dtd 

Log message:
        Add @unmacro.
        %titlepage_cmds becomes %titlepage.cmds for consistency.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/texinfo.dtd?cvsroot=texinfo&r1=1.31&r2=1.32

Patches:
Index: texinfo.dtd
===================================================================
RCS file: /sources/texinfo/texinfo/util/texinfo.dtd,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- texinfo.dtd 24 Aug 2012 23:05:38 -0000      1.31
+++ texinfo.dtd 9 Sep 2012 22:24:01 -0000       1.32
@@ -1,4 +1,4 @@
-<!-- $Id: texinfo.dtd,v 1.31 2012/08/24 23:05:38 pertusus Exp $
+<!-- $Id: texinfo.dtd,v 1.32 2012/09/09 22:24:01 pertusus Exp $
   Document Type Definition for Texinfo XML output (the '-'-xml option).
 
   Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
@@ -52,7 +52,7 @@
 <!ENTITY % toc "contents | shortcontents | summarycontents">
 
 <!-- Title page -->
-<!ENTITY % titlepage_cmds "author | title | subtitle">
+<!ENTITY % titlepage.cmds "author | title | subtitle">
 
 <!-- index entry commands -->
 <!ENTITY % indexentry.cmds "cindex | findex | kindex | pindex | tindex
@@ -68,7 +68,7 @@
 
 <!-- Commands that appear everywhere, both with block and in paragraphs -->
 <!ENTITY % ubiquitous.cmds "sp | anchor | indent | noindent | %raw.cmds; 
-                 | %option.cmds; | errormsg
+                 | %option.cmds; | errormsg | unmacro
                  | %indexentry.cmds; | refill | quote-arg | allow-recursion">
 
 <!-- Block -->
@@ -167,7 +167,7 @@
            "%Inline.line; | %ubiquitous.cmds;">
 
 <!-- in raw (everything except sectioning commands) -->
-<!ENTITY % Raw.content "#PCDATA | %titlepage_cmds; | %block; | %heading.cmds; 
+<!ENTITY % Raw.content "#PCDATA | %titlepage.cmds; | %block; | %heading.cmds; 
            | %Inline.linetext; | exdent | %toc; | printindex 
            | %metainformation;">
 
@@ -195,6 +195,9 @@
                 name CDATA #REQUIRED>
 <!ATTLIST clear
                 name CDATA #REQUIRED>
+<!ELEMENT unmacro  EMPTY>
+<!ATTLIST unmacro
+                name CDATA #REQUIRED>
 <!ELEMENT definfoenclose EMPTY>
 <!ATTLIST definfoenclose 
           command  NMTOKEN #REQUIRED
@@ -317,7 +320,7 @@
 <!ELEMENT copying    (%block; | %heading.cmds;)*>
 <!ELEMENT insertcopying EMPTY>
 
-<!ELEMENT titlepage  (%titlepage_cmds; | %block; | %heading.cmds;)*>
+<!ELEMENT titlepage  (%titlepage.cmds; | %block; | %heading.cmds;)*>
 <!ELEMENT author     (#PCDATA | %Inline.line;)*>
 <!ELEMENT title      (#PCDATA | %Inline.line;)*>
 <!ELEMENT subtitle   (#PCDATA | %Inline.line;)*>