texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

texinfo/util texinfo.dtd,1.5,1.6


From: dirt
Subject: texinfo/util texinfo.dtd,1.5,1.6
Date: Mon, 1 Mar 2004 16:48:53 +0100

Update of /cvsroot/texinfo/texinfo/util
In directory sheep:/tmp/cvs-serv11459/util

Modified Files:
        texinfo.dtd 
Log Message:
2004-03-01  Alper Ersoy  <address@hidden>

        * util/texinfo.dtd: added math element and updated footnote.



Index: texinfo.dtd
===================================================================
RCS file: /cvsroot/texinfo/texinfo/util/texinfo.dtd,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** texinfo.dtd 26 Feb 2004 15:42:33 -0000      1.5
--- texinfo.dtd 1 Mar 2004 15:48:51 -0000       1.6
***************
*** 61,65 ****
  <!ENTITY % section.level3 "subsection | unnumberedsubsec | appendixsubsec">
  
! <!ENTITY % section.level4 "subsubsection | unnumberedsubsubsec 
                             | appendixsubsubsec">
  
--- 61,65 ----
  <!ENTITY % section.level3 "subsection | unnumberedsubsec | appendixsubsec">
  
! <!ENTITY % section.level4 "subsubsection | unnumberedsubsubsec
                             | appendixsubsubsec">
  
***************
*** 68,75 ****
  
  
! <!ENTITY % section.level1.content "(%block; 
!                                    | %section.level2; 
!                                    | %section.level3; 
!                                    | %section.level4; 
                                     | titlepage | image
                                     | %toc; | %lang; | %variables;
--- 68,75 ----
  
  
! <!ENTITY % section.level1.content "(%block;
!                                    | %section.level2;
!                                    | %section.level3;
!                                    | %section.level4;
                                     | titlepage | image
                                     | %toc; | %lang; | %variables;
***************
*** 77,82 ****
                                     | printindex | listoffloats)*">
  
! <!ENTITY % section.level2.content "(%block; 
!                                    | %section.level3; 
                                     | %section.level4;
                                     | titlepage | image
--- 77,82 ----
                                     | printindex | listoffloats)*">
  
! <!ENTITY % section.level2.content "(%block;
!                                    | %section.level3;
                                     | %section.level4;
                                     | titlepage | image
***************
*** 84,88 ****
                                     | %headings;)*">
  
! <!ENTITY % section.level3.content "(%block; 
                                     | %section.level4;
                                     | titlepage | image
--- 84,88 ----
                                     | %headings;)*">
  
! <!ENTITY % section.level3.content "(%block;
                                     | %section.level4;
                                     | titlepage | image
***************
*** 102,110 ****
  <!ENTITY % Inline.fonts "i | b | tt | r | titlefont">
  <!ENTITY % Inline.markup "code | command | env | file | option | samp | dfn | 
cite | key | kbd | var | acronym | url | dmn">
  <!ENTITY % Inline.reference "xref | inforef | indexterm | email | uref | 
anchor">
  
  <!ENTITY % Inline.phrase
             "%Inline.emphasize; | %Inline.smallcaps; | %Inline.fonts;
!             | %Inline.markup; | %Inline.reference; ">
  
  
--- 102,113 ----
  <!ENTITY % Inline.fonts "i | b | tt | r | titlefont">
  <!ENTITY % Inline.markup "code | command | env | file | option | samp | dfn | 
cite | key | kbd | var | acronym | url | dmn">
+ <!ENTITY % Inline.math "math">
  <!ENTITY % Inline.reference "xref | inforef | indexterm | email | uref | 
anchor">
+ <!ENTITY % Inline.footnote "footnote">
  
  <!ENTITY % Inline.phrase
             "%Inline.emphasize; | %Inline.smallcaps; | %Inline.fonts;
!             | %Inline.markup; | %Inline.math; | %Inline.reference;
!             | %Inline.footnote; ">
  
  
***************
*** 121,125 ****
  <!-- meta-information -->
  <!ELEMENT setfilename (#PCDATA)>
! <!ELEMENT settitle    (#PCDATA | %Inline.phrase; | footnote)*>
  <!ELEMENT dircategory (#PCDATA)>
  
--- 124,128 ----
  <!-- meta-information -->
  <!ELEMENT setfilename (#PCDATA)>
! <!ELEMENT settitle    (#PCDATA | %Inline.phrase;)*>
  <!ELEMENT dircategory (#PCDATA)>
  
***************
*** 147,151 ****
  <!-- NODES -->
  <!-- ***** -->
! <!ELEMENT node (nodename, nodenext?, nodeprev?, nodeup?, 
                  (%section.all; | %block; | image | %toc; | %lang;)*) >
  
--- 150,154 ----
  <!-- NODES -->
  <!-- ***** -->
! <!ELEMENT node (nodename, nodenext?, nodeprev?, nodeup?,
                  (%section.all; | %block; | image | %toc; | %lang;)*) >
  
***************
*** 176,188 ****
  
  <!-- Headings and titles -->
! <!ELEMENT majorheading  (#PCDATA | %Inline.phrase; | footnote)*>
! <!ELEMENT chapheading   (#PCDATA | %Inline.phrase; | footnote)*>
! <!ELEMENT heading       (#PCDATA | %Inline.phrase; | footnote)*>
! <!ELEMENT subheading    (#PCDATA | %Inline.phrase; | footnote)*>
! <!ELEMENT subsubheading (#PCDATA | %Inline.phrase; | footnote)*>
! <!ELEMENT title         (#PCDATA | %Inline.phrase; | footnote)*>
  
  <!-- Negative Indentation in Blocks -->
! <!ELEMENT exdent       (#PCDATA | %Inline.phrase; | footnote)*>
  
  <!-- BLOCK Elements -->
--- 179,191 ----
  
  <!-- Headings and titles -->
! <!ELEMENT majorheading  (#PCDATA | %Inline.phrase;)*>
! <!ELEMENT chapheading   (#PCDATA | %Inline.phrase;)*>
! <!ELEMENT heading       (#PCDATA | %Inline.phrase;)*>
! <!ELEMENT subheading    (#PCDATA | %Inline.phrase;)*>
! <!ELEMENT subsubheading (#PCDATA | %Inline.phrase;)*>
! <!ELEMENT title         (#PCDATA | %Inline.phrase;)*>
  
  <!-- Negative Indentation in Blocks -->
! <!ELEMENT exdent       (#PCDATA | %Inline.phrase;)*>
  
  <!-- BLOCK Elements -->
***************
*** 224,228 ****
  <!ATTLIST verbatim     xml:space (preserve) #FIXED 'preserve'>
  
! <!ELEMENT para         (#PCDATA | %Inline.phrase; | footnote)*>
  <!ATTLIST para
            role CDATA #IMPLIED>
--- 227,231 ----
  <!ATTLIST verbatim     xml:space (preserve) #FIXED 'preserve'>
  
! <!ELEMENT para         (#PCDATA | %Inline.phrase;)*>
  <!ATTLIST para
            role CDATA #IMPLIED>
***************
*** 233,237 ****
  <!ELEMENT menunode (#PCDATA)>
  <!ELEMENT menutitle (#PCDATA)>
! <!ELEMENT menucomment (#PCDATA | %Inline.phrase; | footnote)*>
  
  <!-- Floating displays -->
--- 236,240 ----
  <!ELEMENT menunode (#PCDATA)>
  <!ELEMENT menutitle (#PCDATA)>
! <!ELEMENT menucomment (#PCDATA | %Inline.phrase;)*>
  
  <!-- Floating displays -->
***************
*** 241,245 ****
  <!ELEMENT floattype (#PCDATA)>
  <!ELEMENT floatpos (#PCDATA)>
! <!ELEMENT caption (#PCDATA | %Inline.phrase; | footnote)*>
  <!ELEMENT listoffloats EMPTY>
  <!ATTLIST listoffloats
--- 244,248 ----
  <!ELEMENT floattype (#PCDATA)>
  <!ELEMENT floatpos (#PCDATA)>
! <!ELEMENT caption (#PCDATA | %Inline.phrase;)*>
  <!ELEMENT listoffloats EMPTY>
  <!ATTLIST listoffloats
***************
*** 249,253 ****
  <!ELEMENT itemize (itemfunction, (item | itemize | enumerate | indexterm)*)>
  <!ELEMENT enumerate (enumarg?, (item | itemize | enumerate)*)>
! <!ATTLIST enumerate 
            first CDATA #IMPLIED>
  
--- 252,256 ----
  <!ELEMENT itemize (itemfunction, (item | itemize | enumerate | indexterm)*)>
  <!ELEMENT enumerate (enumarg?, (item | itemize | enumerate)*)>
! <!ATTLIST enumerate
            first CDATA #IMPLIED>
  
***************
*** 274,288 ****
  <!ELEMENT definitionitem (%block;)*>
  
! <!ELEMENT defcategory  (#PCDATA | %Inline.phrase; | footnote)*>
! <!ELEMENT deffunction  (#PCDATA | %Inline.phrase; | footnote)*>
! <!ELEMENT defvariable  (#PCDATA | %Inline.phrase; | footnote)*>
! <!ELEMENT defparam     (#PCDATA | %Inline.phrase; | footnote)*>
! <!ELEMENT defdelimiter (#PCDATA | %Inline.phrase; | footnote)*>
! <!ELEMENT deftype      (#PCDATA | %Inline.phrase; | footnote)*>
! <!ELEMENT defparamtype (#PCDATA | %Inline.phrase; | footnote)*>
! <!ELEMENT defdatatype  (#PCDATA | %Inline.phrase; | footnote)*>
! <!ELEMENT defclass     (#PCDATA | %Inline.phrase; | footnote)*>
! <!ELEMENT defclassvar  (#PCDATA | %Inline.phrase; | footnote)*>
! <!ELEMENT defoperation (#PCDATA | %Inline.phrase; | footnote)*>
  
  <!-- INLINE Elements -->
--- 277,291 ----
  <!ELEMENT definitionitem (%block;)*>
  
! <!ELEMENT defcategory  (#PCDATA | %Inline.phrase;)*>
! <!ELEMENT deffunction  (#PCDATA | %Inline.phrase;)*>
! <!ELEMENT defvariable  (#PCDATA | %Inline.phrase;)*>
! <!ELEMENT defparam     (#PCDATA | %Inline.phrase;)*>
! <!ELEMENT defdelimiter (#PCDATA | %Inline.phrase;)*>
! <!ELEMENT deftype      (#PCDATA | %Inline.phrase;)*>
! <!ELEMENT defparamtype (#PCDATA | %Inline.phrase;)*>
! <!ELEMENT defdatatype  (#PCDATA | %Inline.phrase;)*>
! <!ELEMENT defclass     (#PCDATA | %Inline.phrase;)*>
! <!ELEMENT defclassvar  (#PCDATA | %Inline.phrase;)*>
! <!ELEMENT defoperation (#PCDATA | %Inline.phrase;)*>
  
  <!-- INLINE Elements -->
***************
*** 322,325 ****
--- 325,331 ----
  <!ELEMENT acronymword (#PCDATA | %Inline.phrase;)*>
  <!ELEMENT acronymdesc (#PCDATA | %Inline.phrase;)*>
+ 
+ <!-- math -->
+ <!ELEMENT math    (#PCDATA | %Inline.phrase;)*>
  
  <!-- reference -->



reply via email to

[Prev in Thread] Current Thread [Next in Thread]