[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo/util texinfo.dtd,1.3,1.4
|
From: |
dirt |
|
Subject: |
texinfo/util texinfo.dtd,1.3,1.4 |
|
Date: |
Tue, 24 Feb 2004 03:29:49 +0100 |
Update of /cvsroot/texinfo/texinfo/util
In directory sheep:/tmp/cvs-serv27476/util
Modified Files:
texinfo.dtd
Log Message:
2004-02-24 Alper Ersoy <address@hidden>
* util/texinfo.dtd: added float and friends, updated tableitem and
Inline.reference.
Index: texinfo.dtd
===================================================================
RCS file: /cvsroot/texinfo/texinfo/util/texinfo.dtd,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** texinfo.dtd 30 Jan 2004 15:41:49 -0000 1.3
--- texinfo.dtd 24 Feb 2004 02:29:47 -0000 1.4
***************
*** 5,9 ****
Contributors:
Karl Eichwalder (address@hidden)
! Alper Ersoy (address@hidden)
Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
--- 5,9 ----
Contributors:
Karl Eichwalder (address@hidden)
! Alper Ersoy (address@hidden)
Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
***************
*** 39,54 ****
| format | smallformat | display
| smalldisplay | itemize | enumerate | sp | center | group
! | 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">
--- 39,54 ----
| format | smallformat | display
| smalldisplay | itemize | enumerate | sp | center | group
! | float | 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">
***************
*** 72,97 ****
| %section.level3;
| %section.level4;
! | verbatim | titlepage | image
! | %toc; | %lang; | %variables;
! | %headings;
! | printindex)*">
<!ENTITY % section.level2.content "(%block;
| %section.level3;
| %section.level4;
! | verbatim | titlepage | image
! | %toc; | %lang; | %variables;
! | %headings;)*">
<!ENTITY % section.level3.content "(%block;
| %section.level4;
! | verbatim | titlepage | image
! | %toc; | %lang; | %variables;
! | %headings;)*">
<!ENTITY % section.level4.content "(%block;
! | verbatim | titlepage | image
! | %toc; | %lang; | %variables;
! | %headings;)*">
--- 72,97 ----
| %section.level3;
| %section.level4;
! | verbatim | titlepage | image
! | %toc; | %lang; | %variables;
! | %headings;
! | printindex | listoffloats)*">
<!ENTITY % section.level2.content "(%block;
| %section.level3;
| %section.level4;
! | verbatim | titlepage | image
! | %toc; | %lang; | %variables;
! | %headings;)*">
<!ENTITY % section.level3.content "(%block;
| %section.level4;
! | verbatim | titlepage | image
! | %toc; | %lang; | %variables;
! | %headings;)*">
<!ENTITY % section.level4.content "(%block;
! | verbatim | titlepage | image
! | %toc; | %lang; | %variables;
! | %headings;)*">
***************
*** 102,106 ****
<!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">
<!ENTITY % Inline.phrase
--- 102,106 ----
<!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
***************
*** 116,120 ****
<!-- ***************** -->
<!ELEMENT texinfo ((%metainformation; | titlepage | node | %block; | %toc;
! | %variables; | %lang;)* )>
<!ATTLIST texinfo xml:lang (%languagecodes;) 'en'>
--- 116,120 ----
<!-- ***************** -->
<!ELEMENT texinfo ((%metainformation; | titlepage | node | %block; | %toc;
! | %variables; | %lang;)* )>
<!ATTLIST texinfo xml:lang (%languagecodes;) 'en'>
***************
*** 127,133 ****
<!ELEMENT clearvalue EMPTY>
<!ATTLIST setvalue
! name CDATA #REQUIRED>
<!ATTLIST clearvalue
! name CDATA #REQUIRED>
<!-- ToC -->
--- 127,133 ----
<!ELEMENT clearvalue EMPTY>
<!ATTLIST setvalue
! name CDATA #REQUIRED>
<!ATTLIST clearvalue
! name CDATA #REQUIRED>
<!-- ToC -->
***************
*** 181,185 ****
<!ELEMENT subheading (#PCDATA | %Inline.phrase; | footnote)*>
<!ELEMENT subsubheading (#PCDATA | %Inline.phrase; | footnote)*>
! <!ELEMENT title (#PCDATA | %Inline.phrase; | footnote)*>
<!-- Negative Indentation in Blocks -->
--- 181,185 ----
<!ELEMENT subheading (#PCDATA | %Inline.phrase; | footnote)*>
<!ELEMENT subsubheading (#PCDATA | %Inline.phrase; | footnote)*>
! <!ELEMENT title (#PCDATA | %Inline.phrase; | footnote)*>
<!-- Negative Indentation in Blocks -->
***************
*** 206,213 ****
<!ELEMENT alttext (#PCDATA)>
<!ATTLIST image
! name CDATA #REQUIRED
! extension CDATA #REQUIRED
! width CDATA #REQUIRED
! height CDATA #REQUIRED>
<!-- Whitespace in these elements are always preserved -->
--- 206,213 ----
<!ELEMENT alttext (#PCDATA)>
<!ATTLIST image
! name CDATA #REQUIRED
! extension CDATA #REQUIRED
! width CDATA #REQUIRED
! height CDATA #REQUIRED>
<!-- Whitespace in these elements are always preserved -->
***************
*** 226,230 ****
<!ELEMENT para (#PCDATA | %Inline.phrase; | footnote)*>
<!ATTLIST para
! role CDATA #IMPLIED>
<!ELEMENT menu (menuentry | detailmenu | para)*>
--- 226,230 ----
<!ELEMENT para (#PCDATA | %Inline.phrase; | footnote)*>
<!ATTLIST para
! role CDATA #IMPLIED>
<!ELEMENT menu (menuentry | detailmenu | para)*>
***************
*** 235,238 ****
--- 235,249 ----
<!ELEMENT menucomment (#PCDATA | %Inline.phrase; | footnote)*>
+ <!-- Floating displays -->
+ <!ELEMENT float (floattype, floatpos, (%block;)*, caption?)>
+ <!ATTLIST float
+ name CDATA #IMPLIED>
+ <!ELEMENT floattype (#PCDATA)>
+ <!ELEMENT floatpos (#PCDATA)>
+ <!ELEMENT caption (#PCDATA | %Inline.phrase; | footnote)*>
+ <!ELEMENT listoffloats EMPTY>
+ <!ATTLIST listoffloats
+ type CDATA #IMPLIED>
+
<!-- Lists -->
<!ELEMENT itemize (itemfunction, (item | itemize | enumerate | indexterm)*)>
***************
*** 248,252 ****
<!-- Tables -->
<!ELEMENT table (tableitem | indexterm)+>
! <!ELEMENT tableitem ((tableterm, indexterm*)+, item)>
<!ELEMENT tableterm (#PCDATA | %Inline.phrase;)*>
--- 259,263 ----
<!-- Tables -->
<!ELEMENT table (tableitem | indexterm)+>
! <!ELEMENT tableitem ((tableterm, indexterm*)+, item?)>
<!ELEMENT tableterm (#PCDATA | %Inline.phrase;)*>
***************
*** 457,458 ****
--- 468,470 ----
<!ELEMENT printindex (#PCDATA)>
+ <!-- vim: set expandtab: -->
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo/util texinfo.dtd,1.3,1.4,
dirt <=