texinfo/makeinfo texinfo.dtd,1.5,1.6

[dirt]

Update of /cvsroot/texinfo/texinfo/makeinfo
In directory sheep:/tmp/cvs-serv26536/makeinfo

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

        * makeinfo/texinfo.dtd: added ordm and ordf entities and dmn element.
        updated indexterm location in tables.



Index: texinfo.dtd
===================================================================
RCS file: /cvsroot/texinfo/texinfo/makeinfo/texinfo.dtd,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** texinfo.dtd 30 Dec 2003 11:15:23 -0000      1.5
--- texinfo.dtd 23 Jan 2004 13:06:07 -0000      1.6
***************
*** 101,105 ****
  <!ENTITY % Inline.smallcaps "sc">
  <!ENTITY % Inline.fonts "i | b | tt | r | titlefont">
! <!ENTITY % Inline.markup "code | command | env | file | option | samp | dfn | 
cite | key | kbd | var | acronym | url">
  <!ENTITY % Inline.reference "xref | inforef | indexterm | email | uref">
  
--- 101,105 ----
  <!ENTITY % Inline.smallcaps "sc">
  <!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">
  
***************
*** 244,248 ****
  <!-- Tables -->
  <!ELEMENT table (tableitem | indexterm)+>
! <!ELEMENT tableitem (tableterm+, item)>
  <!ELEMENT tableterm (#PCDATA | %Inline.phrase;)*>
  
--- 244,248 ----
  <!-- Tables -->
  <!ELEMENT table (tableitem | indexterm)+>
! <!ELEMENT tableitem (tableterm+, indexterm*, item)>
  <!ELEMENT tableterm (#PCDATA | %Inline.phrase;)*>
  
***************
*** 302,305 ****
--- 302,306 ----
  <!ELEMENT var     (#PCDATA | %Inline.phrase;)*>
  <!ELEMENT url     (#PCDATA | %Inline.phrase;)*>
+ <!ELEMENT dmn     (#PCDATA | %Inline.phrase;)*>
  
  <!ELEMENT acronym (acronymword, acronymdesc?)>
***************
*** 427,430 ****
--- 428,434 ----
  <!ENTITY oslash "">
  <!ENTITY Oslash "">
+ 
+ <!ENTITY ordm "">
+ <!ENTITY ordf "">
  
  <!ENTITY iexcl "">