texinfo update (Sun Feb 13 18:22:01 EST 2005)

[Karl Berry]

Index: util/texinfo.dtd
===================================================================
RCS file: /cvsroot/texinfo/texinfo/util/texinfo.dtd,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** util/texinfo.dtd    19 Dec 2004 15:08:55 -0000      1.4
--- util/texinfo.dtd    13 Feb 2005 23:02:13 -0000      1.5
***************
*** 1,20 ****
! <!-- $Id: texinfo.dtd,v 1.4 2004/12/19 15:08:55 karl Exp $
!    Document Type Definition for Texinfo.
  
!    Author: Philippe Martin (address@hidden)
!    Contributors:
!            Karl Eichwalder (address@hidden)
!            Alper Ersoy (address@hidden)
! 
!    Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
  
    Copying and distribution of this file, with or without modification,
    are permitted in any medium without royalty provided the copyright
    notice and this notice are preserved.
  
  -->
  
! <!-- ENTITIES -->
  
  <!-- Meta-information -->
  <!ENTITY % metainformation "setfilename | settitle | dircategory
--- 1,20 ----
! <!-- $Id: texinfo.dtd,v 1.5 2005/02/13 23:02:13 karl Exp $
!    Document Type Definition for Texinfo (makeinfo --xml).
  
!   Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
  
    Copying and distribution of this file, with or without modification,
    are permitted in any medium without royalty provided the copyright
    notice and this notice are preserved.
  
+    Author: Philippe Martin (address@hidden)
+    Contributors:
+            Karl Eichwalder (address@hidden)
+            Alper Ersoy (address@hidden)
+            Karl Berry (address@hidden)
  -->
  
! <!-- * ENTITIES * -->
  
  <!-- Meta-information -->
  <!ENTITY % metainformation "setfilename | settitle | dircategory
***************
*** 34,40 ****
  <!ENTITY % titlepage_cmds "author | booktitle | booksubtitle">
  
  <!-- block -->
- <!-- ***** -->
  <!ENTITY % block "menu | para | quotation | example | smallexample | lisp
                    | smalllisp | cartouche | copying
                    | format | smallformat | display
--- 34,39 ----
***************
*** 42,60 ****
                    | table | multitable | definition">
  
  <!-- API definitions -->
- <!-- *************** -->
  <!ENTITY % definition.cmds "defcategory | deffunction | defvariable | defparam
                              | defdelimiter | deftype | defparamtype | 
defdatatype
                              | defclass | defclassvar | defoperation">
  
  <!-- Headings -->
- <!-- ******** -->
  <!ENTITY % headings "majorheading | chapheading | heading | subheading
                       | subsubheading">
  
  
  <!-- Sectioning -->
- <!-- ********** -->
  <!ENTITY % section.level1 "top | chapter | unnumbered | appendix">
  
  <!ENTITY % section.level2 "section | unnumberedsec | appendixsec">
--- 41,56 ----
***************
*** 97,103 ****
  
  
  <!-- Inline -->
- <!-- ****** -->
  <!ENTITY % Inline.emphasize "strong | emph">
  <!ENTITY % Inline.fonts "b | i | r | sansserif | slanted | titlefont | tt">
  <!ENTITY % Inline.footnote "footnote">
--- 93,98 ----
***************
*** 113,124 ****
              | %Inline.footnote; ">
  
  
! <!-- ************ -->
! <!-- * ELEMENTS * -->
! <!-- ************ -->
  
  <!-- TOP Level Element -->
- <!-- ***************** -->
  <!ELEMENT texinfo ((%metainformation; | titlepage | node | %block; | %toc;
                      | %variables; | %lang;)* )>
  <!ATTLIST texinfo xml:lang (%languagecodes;) 'en'>
--- 108,116 ----
              | %Inline.footnote; ">
  
  
! <!--  * ELEMENTS * -->
  
  <!-- TOP Level Element -->
  <!ELEMENT texinfo ((%metainformation; | titlepage | node | %block; | %toc;
                      | %variables; | %lang;)* )>
  <!ATTLIST texinfo xml:lang (%languagecodes;) 'en'>
***************
*** 150,156 ****
  <!ELEMENT booksubtitle (#PCDATA | %Inline.phrase;)*>
  
  <!-- NODES -->
- <!-- ***** -->
  <!ELEMENT node (nodename, nodenext?, nodeprev?, nodeup?,
                  (%section.all; | %block; | %toc; | %lang; | image)*) >
  
--- 142,147 ----
***************
*** 159,167 ****
  <!ELEMENT nodeprev (#PCDATA)>
  <!ELEMENT nodeup   (#PCDATA)>
  
- <!-- SECTIONING -->
- <!-- ********** -->
  
  <!ELEMENT top           (title?, (%section.level1.content;))>
  
  <!ELEMENT chapter       (title?, (%section.level1.content;))>
--- 150,157 ----
  <!ELEMENT nodeprev (#PCDATA)>
  <!ELEMENT nodeup   (#PCDATA)>
  
  
+ <!-- SECTIONING -->
  <!ELEMENT top           (title?, (%section.level1.content;))>
  
  <!ELEMENT chapter       (title?, (%section.level1.content;))>
***************
*** 190,197 ****
  <!-- Negative Indentation in Blocks -->
  <!ELEMENT exdent       (#PCDATA | %Inline.phrase;)*>
  
  <!-- BLOCK Elements -->
- <!-- ************** -->
  
  <!ELEMENT quotation    (%block; | %Inline.phrase; | exdent)*>
  <!ELEMENT documentdescription (#PCDATA | %block; | %Inline.phrase;)*>
--- 180,187 ----
  <!-- Negative Indentation in Blocks -->
  <!ELEMENT exdent       (#PCDATA | %Inline.phrase;)*>
  
+ 
  <!-- BLOCK Elements -->
  
  <!ELEMENT quotation    (%block; | %Inline.phrase; | exdent)*>
  <!ELEMENT documentdescription (#PCDATA | %block; | %Inline.phrase;)*>
P util/texinfo.dtd