texinfo/util texinfo.dtd

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       11/02/14 19:16:56

Modified files:
        util           : texinfo.dtd 

Log message:
        rearrange, update comments

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

Patches:
Index: texinfo.dtd
===================================================================
RCS file: /sources/texinfo/texinfo/util/texinfo.dtd,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- texinfo.dtd 4 Apr 2010 17:51:35 -0000       1.16
+++ texinfo.dtd 14 Feb 2011 19:16:56 -0000      1.17
@@ -1,15 +1,14 @@
-<!-- $Id: texinfo.dtd,v 1.16 2010/04/04 17:51:35 karl Exp $
+<!-- $Id: texinfo.dtd,v 1.17 2011/02/14 19:16:56 karl Exp $
    Document Type Definition for Texinfo XML output (the '-'-xml option).
 
-  Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-  Free Software Foundation, Inc.
+  Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+  2011 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.
 
-   Original author: Philippe Martin
-   Contributors: Karl Eichwalder, Alper Ersoy, Karl Berry, Torsten Bronger
+  Original author: Philippe Martin.
 -->
 
 <!-- * ENTITIES * -->
@@ -31,7 +30,7 @@
 <!-- Title page -->
 <!ENTITY % titlepage_cmds "author | booktitle | booksubtitle">
 
-<!-- block -->
+<!-- Block -->
 <!ENTITY % block "menu | para | quotation | smallquotation
                   | example | smallexample | lisp | smalllisp
                   | cartouche | copying
@@ -147,7 +146,14 @@
 <!ELEMENT booktitle    (#PCDATA | %Inline.phrase;)*>
 <!ELEMENT booksubtitle (#PCDATA | %Inline.phrase;)*>
 
-<!-- NODES -->
+<!-- Explicit blank lines -->
+<!ELEMENT sp (#PCDATA)>
+<!ATTLIST sp
+          lines CDATA #IMPLIED>
+
+
+<!-- emacs-page
+     Nodes -->
 <!ELEMENT node (nodename, nodenext?, nodeprev?, nodeup?,
                 (%section.all; | %block; | %toc; | %lang;)*) >
 
@@ -157,7 +163,7 @@
 <!ELEMENT nodeup   (#PCDATA)>
 
 
-<!-- SECTIONING -->
+<!-- Sectioning -->
 <!ELEMENT top           (title?, (%section.level1.content;))>
 <!ELEMENT part          (title?, (%section.level1.content;))>
 
@@ -184,11 +190,9 @@
 <!ELEMENT subsubheading (#PCDATA | %Inline.phrase;)*>
 <!ELEMENT title         (#PCDATA | %Inline.phrase;)*>
 
-<!-- Negative Indentation in Blocks -->
-<!ELEMENT exdent       (#PCDATA | %Inline.phrase;)*>
-
 
-<!-- BLOCK Elements -->
+<!-- emacs-page
+     Block elements -->
 
 <!ELEMENT quotation    (%block; | %Inline.phrase; | exdent)*>
 <!ELEMENT documentdescription (#PCDATA | %block; | %Inline.phrase;)*>
@@ -237,6 +241,9 @@
 <!ELEMENT menutitle (#PCDATA)>
 <!ELEMENT menucomment (#PCDATA | %Inline.phrase;)*>
 
+<!-- Negative indentation in blocks -->
+<!ELEMENT exdent       (#PCDATA | %Inline.phrase;)*>
+
 <!-- Floating displays -->
 <!ELEMENT float (floattype, floatpos, (%block;)*,
                 ((caption, shortcaption?) | (shortcaption, caption))?)>
@@ -289,7 +296,9 @@
 <!ELEMENT defclassvar  (#PCDATA | %Inline.phrase;)*>
 <!ELEMENT defoperation (#PCDATA | %Inline.phrase;)*>
 
-<!-- INLINE Elements -->
+
+<!-- emacs-page
+     Inline elements -->
 
 <!-- options -->
 <!ELEMENT frenchspacing (#PCDATA)> <!-- must be on or off -->
@@ -363,6 +372,7 @@
 <!ELEMENT indexterm (#PCDATA | %Inline.phrase;)*>
 <!ATTLIST indexterm
           index CDATA #IMPLIED>
+<!ELEMENT printindex (#PCDATA)>
 
 <!ELEMENT email (emailaddress, emailname?)>
 <!ELEMENT emailaddress (#PCDATA | %Inline.phrase;)*>
@@ -376,6 +386,9 @@
 <!ELEMENT footnote (para)>
 
 
+<!-- emacs-page
+     Punctuation and special symbols.  -->
+
 <!ELEMENT punct     (#PCDATA)>
 <!ATTLIST punct
           end-of-sentence (yes|no) #IMPLIED>
@@ -496,12 +509,3 @@
 <!ENTITY rArr "&#x21d2;">
 
 <!ENTITY macr "&#xaf;">
-
-
-<!-- fixxme: not yet classified -->
-
-<!ELEMENT sp (#PCDATA)>
-<!ATTLIST sp
-          lines CDATA #IMPLIED>
-<!ELEMENT printindex (#PCDATA)>
-