1
0
mirror of https://github.com/moparisthebest/xeps synced 2024-11-24 18:22:24 -05:00

Merge pull request #242 from intosi/dtd_fix

Fix obvious mistakes in the DTD
This commit is contained in:
Kevin Smith 2016-08-30 12:16:45 +01:00 committed by GitHub
commit 9ee89fb0f5

22
xep.dtd
View File

@ -66,7 +66,7 @@ THE SOFTWARE.
<!ELEMENT version (#PCDATA)* > <!ELEMENT version (#PCDATA)* >
<!ELEMENT date (#PCDATA)* > <!ELEMENT date (#PCDATA)* >
<!ELEMENT initials (#PCDATA)* > <!ELEMENT initials (#PCDATA)* >
<!ELEMENT remark ( p | ul )* > <!ELEMENT remark (#PCDATA | p | ul)* >
<!ELEMENT councilnote (#PCDATA)* > <!ELEMENT councilnote (#PCDATA)* >
<!ELEMENT section1 ( div | p | section2 | example | code | ul | ol | dl | table )* > <!ELEMENT section1 ( div | p | section2 | example | code | ul | ol | dl | table )* >
<!ATTLIST section1 <!ATTLIST section1
@ -80,10 +80,14 @@ THE SOFTWARE.
<!ATTLIST section3 <!ATTLIST section3
topic CDATA '' topic CDATA ''
anchor CDATA '' > anchor CDATA '' >
<!ELEMENT section4 ( div | p | example | code | ul | ol | dl | table )* > <!ELEMENT section4 ( div | p | section5 | example | code | ul | ol | dl | table )* >
<!ATTLIST section4 <!ATTLIST section4
topic CDATA '' topic CDATA ''
anchor CDATA '' > anchor CDATA '' >
<!ELEMENT section5 ( div | p | example | code | ul | ol | dl | table )* >
<!ATTLIST section5
topic CDATA ''
anchor CDATA '' >
<!ELEMENT div ( div | p | example | code | ul | ol | dl | table )* > <!ELEMENT div ( div | p | example | code | ul | ol | dl | table )* >
<!ATTLIST div <!ATTLIST div
class CDATA '' class CDATA ''
@ -102,14 +106,14 @@ THE SOFTWARE.
class CDATA '' class CDATA ''
start CDATA '' start CDATA ''
style CDATA '' > style CDATA '' >
<!ELEMENT li (#PCDATA | p | link | note | tt | em | strong | span)* > <!ELEMENT li (#PCDATA | p | link | note | tt | em | strong | cite | span | code | example | ul | ol)* >
<!ATTLIST li <!ATTLIST li
class CDATA '' class CDATA ''
style CDATA '' > style CDATA '' >
<!ELEMENT dl (di+) > <!ELEMENT dl (di+) >
<!ELEMENT di ( dt, dd ) > <!ELEMENT di ( dt, dd ) >
<!ELEMENT dt (#PCDATA)* > <!ELEMENT dt (#PCDATA)* >
<!ELEMENT dd (#PCDATA | p | link | note | tt | em | strong | span)* > <!ELEMENT dd (#PCDATA | p | link | note | tt | em | strong | cite | span)* >
<!ELEMENT img EMPTY> <!ELEMENT img EMPTY>
<!ATTLIST img src CDATA '' > <!ATTLIST img src CDATA '' >
<!ELEMENT link (#PCDATA)* > <!ELEMENT link (#PCDATA)* >
@ -117,7 +121,7 @@ THE SOFTWARE.
<!ELEMENT note (#PCDATA | link | tt | dfn | em | strong | cite | span)* > <!ELEMENT note (#PCDATA | link | tt | dfn | em | strong | cite | span)* >
<!ELEMENT example (#PCDATA)* > <!ELEMENT example (#PCDATA)* >
<!ATTLIST example caption CDATA '' > <!ATTLIST example caption CDATA '' >
<!ELEMENT code (#PCDATA)* > <!ELEMENT code (#PCDATA | span | em)* >
<!ATTLIST code caption CDATA '' > <!ATTLIST code caption CDATA '' >
<!ELEMENT table (tr)* > <!ELEMENT table (tr)* >
<!ATTLIST table caption CDATA '' > <!ATTLIST table caption CDATA '' >
@ -126,14 +130,14 @@ THE SOFTWARE.
<!ATTLIST th <!ATTLIST th
colspan CDATA '' colspan CDATA ''
rowspan CDATA '' > rowspan CDATA '' >
<!ELEMENT td (#PCDATA)* > <!ELEMENT td (#PCDATA | p | link | note | tt | em | strong | cite | span | code | ul | ol)* >
<!ATTLIST td <!ATTLIST td
colspan CDATA '' colspan CDATA ''
rowspan CDATA '' > rowspan CDATA '' >
<!ELEMENT tt (#PCDATA)* > <!ELEMENT tt (#PCDATA | link | em | string)* >
<!ELEMENT dfn (#PCDATA)* > <!ELEMENT dfn (#PCDATA)* >
<!ELEMENT em (#PCDATA)* > <!ELEMENT em (#PCDATA | link | tt | strong | span | note)* >
<!ELEMENT strong (#PCDATA)* > <!ELEMENT strong (#PCDATA | link | tt | em | span | note)* >
<!ELEMENT cite (#PCDATA)* > <!ELEMENT cite (#PCDATA)* >
<!ELEMENT span (#PCDATA | link | tt | dfn | em | strong )* > <!ELEMENT span (#PCDATA | link | tt | dfn | em | strong )* >
<!ATTLIST span <!ATTLIST span