Skip to content

Commit

Permalink
Merge pull request oasis-tcs#923 from robander/unknown
Browse files Browse the repository at this point in the history 
Remove unknown element for DITA 2.0
  • Loading branch information
@robander
robander authored Jun 11, 2024
2 parents ba50f84 + 408e4e5 commit 1b029b8
Show file tree
Hide file tree
Showing 24 changed files with 114 additions and 245 deletions.
1 change: 0 additions & 1 deletion doctypes/dtd/base/commonElements.ent
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
<!-- ELEMENT NAME ENTITIES -->
<!-- ============================================================= -->
<!ENTITY % data "data" >
<!ENTITY % unknown "unknown" >
<!ENTITY % foreign "foreign" >
<!ENTITY % title "title" >
<!ENTITY % titlealt "titlealt" >
Expand Down
70 changes: 27 additions & 43 deletions doctypes/dtd/base/commonElements.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,24 +239,20 @@
<!ENTITY % data.elements.incl
"%data;"
>
<!ENTITY % foreign.unknown.incl
"%foreign; |
%unknown;"
>
<!ENTITY % listitem.cnt
"#PCDATA |
%basic.block; |
%basic.ph; |
%data.elements.incl; |
%foreign.unknown.incl; |
%foreign; |
%txt.incl;"
>
<!ENTITY % title.cnt
"#PCDATA |
%basic.ph.noxref; |
%data.elements.incl; |
%draft-comment; |
%foreign.unknown.incl; |
%foreign; |
%required-cleanup; |
%image;"
>
Expand All @@ -265,7 +261,7 @@
%basic.ph.noxref; |
%data.elements.incl; |
%draft-comment; |
%foreign.unknown.incl; |
%foreign; |
%required-cleanup; |
%image;"
>
Expand All @@ -274,47 +270,47 @@
%basic.ph.noxref.nocite; |
%data.elements.incl; |
%draft-comment; |
%foreign.unknown.incl; |
%foreign; |
%required-cleanup;"
>
<!ENTITY % shortquote.cnt
"#PCDATA |
%basic.ph; |
%data.elements.incl; |
%draft-comment; |
%foreign.unknown.incl; |
%foreign; |
%required-cleanup;"
>
<!ENTITY % para.cnt
"#PCDATA |
%basic.block.nopara; |
%basic.ph; |
%data.elements.incl; |
%foreign.unknown.incl; |
%foreign; |
%txt.incl;"
>
<!ENTITY % note.cnt
"#PCDATA |
%basic.block.nonote; |
%basic.ph; |
%data.elements.incl; |
%foreign.unknown.incl; |
%foreign; |
%txt.incl;"
>
<!ENTITY % longquote.cnt
"#PCDATA |
%basic.block.nolq; |
%basic.ph; |
%data.elements.incl; |
%foreign.unknown.incl; |
%foreign; |
%txt.incl;"
>
<!ENTITY % tblcell.cnt
"#PCDATA |
%basic.block.notbl; |
%basic.ph; |
%data.elements.incl; |
%foreign.unknown.incl; |
%foreign; |
%txt.incl;"
>
<!ENTITY % desc.cnt
Expand All @@ -323,14 +319,14 @@
%basic.ph; |
%data.elements.incl; |
%draft-comment; |
%foreign.unknown.incl; |
%foreign; |
%required-cleanup;"
>
<!ENTITY % ph.cnt
"#PCDATA |
%basic.ph; |
%data.elements.incl; |
%foreign.unknown.incl; |
%foreign; |
%image; |
%txt.incl;"
>
Expand All @@ -340,15 +336,15 @@
%basic.ph; |
%data.elements.incl; |
%draft-comment; |
%foreign.unknown.incl; |
%foreign; |
%required-cleanup;"
>
<!ENTITY % term.cnt
"#PCDATA |
%basic.ph; |
%data.elements.incl; |
%draft-comment; |
%foreign.unknown.incl; |
%foreign; |
%required-cleanup; |
%image;"
>
Expand All @@ -357,30 +353,30 @@
%basic.block; |
%basic.ph; |
%data.elements.incl; |
%foreign.unknown.incl; |
%foreign; |
%txt.incl;"
>
<!ENTITY % pre.cnt
"#PCDATA |
%basic.ph; |
%data.elements.incl; |
%foreign.unknown.incl; |
%foreign; |
%txt.incl;"
>
<!ENTITY % example.cnt
"#PCDATA |
%basic.block.noexample; |
%basic.ph; |
%data.elements.incl; |
%foreign.unknown.incl; |
%foreign; |
%title; |
%txt.incl;"
>
<!ENTITY % fig.cnt
"%basic.block.notbnofg; |
%data.elements.incl; |
%fn; |
%foreign.unknown.incl; |
%foreign; |
%include; |
%simpletable; |
%xref;"
Expand All @@ -391,13 +387,13 @@
%data.elements.incl; |
%draft-comment; |
%fn; |
%foreign.unknown.incl; |
%foreign; |
%required-cleanup;"
>
<!ENTITY % words.cnt
"#PCDATA |
%data.elements.incl; |
%foreign.unknown.incl; |
%foreign; |
%keyword; |
%term; |
%text;"
Expand All @@ -408,7 +404,7 @@
%basic.ph; |
%data.elements.incl; |
%draft-comment; |
%foreign.unknown.incl; |
%foreign; |
%image; |
%object; |
%required-cleanup; |
Expand All @@ -420,7 +416,7 @@
%basic.block; |
%basic.ph; |
%data.elements.incl; |
%foreign.unknown.incl; |
%foreign; |
%txt.incl;"
>
<!ENTITY % frame-expanse-atts
Expand Down Expand Up @@ -626,17 +622,6 @@
<!ATTLIST data %data.attributes;>


<!-- LONG NAME: Unknown -->
<!ENTITY % unknown.content
"ANY "
>
<!ENTITY % unknown.attributes
"%univ-atts;"
>
<!ELEMENT unknown %unknown.content;>
<!ATTLIST unknown %unknown.attributes;>


<!-- LONG NAME: Foreign -->
<!ENTITY % foreign.content
"ANY "
Expand Down Expand Up @@ -1175,7 +1160,7 @@
<!ENTITY % include.content
"((%data.elements.incl;)*,
(%fallback;)?,
(%foreign.unknown.incl;)*)"
(%foreign;)*)"
>
<!ENTITY % include.attributes
"href
Expand Down Expand Up @@ -1253,7 +1238,7 @@
(%longdescref;)?,
(%fallback;)?,
(%param;)*,
(%foreign.unknown.incl;)*)"
(%foreign;)*)"
>
<!ENTITY % object.attributes
"data
Expand Down Expand Up @@ -1295,7 +1280,7 @@
%basic.ph; |
%data.elements.incl; |
%draft-comment; |
%foreign.unknown.incl; |
%foreign; |
%required-cleanup;)*"
>
<!ENTITY % fallback.attributes
Expand Down Expand Up @@ -1397,7 +1382,7 @@
"(#PCDATA |
%basic.phandblock; |
%data.elements.incl; |
%foreign.unknown.incl;)*"
%foreign;)*"
>
<!ENTITY % draft-comment.attributes
"author
Expand Down Expand Up @@ -1548,7 +1533,7 @@
(%fallback;)?,
(%media-source;)*,
(%media-track;)*,
(%foreign.unknown.incl;)*)"
(%foreign;)*)"
>
<!ENTITY % audio.attributes
"autoplay
Expand Down Expand Up @@ -1603,7 +1588,7 @@
(%video-poster;)?,
(%media-source;)*,
(%media-track;)*,
(%foreign.unknown.incl;)*)"
(%foreign;)*)"
>
<!ENTITY % video.attributes
"autoplay
Expand Down Expand Up @@ -1807,7 +1792,6 @@
<!ATTLIST titlealt class CDATA "- topic/titlealt " >
<!ATTLIST tm class CDATA "- topic/tm " >
<!ATTLIST ul class CDATA "- topic/ul " >
<!ATTLIST unknown class CDATA "- topic/unknown " >
<!ATTLIST video class CDATA "- topic/video " >
<!ATTLIST video-poster class CDATA "- topic/video-poster " >
<!ATTLIST xref class CDATA "- topic/xref " >
Expand Down
4 changes: 2 additions & 2 deletions doctypes/dtd/base/emphasisDomain.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
%basic.ph; |
%data.elements.incl; |
%draft-comment; |
%foreign.unknown.incl; |
%foreign; |
%required-cleanup;)*"
>
<!ENTITY % strong.attributes
Expand All @@ -62,7 +62,7 @@
%basic.ph; |
%data.elements.incl; |
%draft-comment; |
%foreign.unknown.incl; |
%foreign; |
%required-cleanup;)*"
>
<!ENTITY % em.attributes
Expand Down
16 changes: 8 additions & 8 deletions doctypes/dtd/base/highlightDomain.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
%basic.ph; |
%data.elements.incl; |
%draft-comment; |
%foreign.unknown.incl; |
%foreign; |
%required-cleanup;)*"
>
<!ENTITY % b.attributes
Expand All @@ -69,7 +69,7 @@
%basic.ph; |
%data.elements.incl; |
%draft-comment; |
%foreign.unknown.incl; |
%foreign; |
%required-cleanup;)*"
>
<!ENTITY % u.attributes
Expand All @@ -88,7 +88,7 @@
%basic.ph; |
%data.elements.incl; |
%draft-comment; |
%foreign.unknown.incl; |
%foreign; |
%required-cleanup;)*"
>
<!ENTITY % i.attributes
Expand All @@ -107,7 +107,7 @@
%basic.ph; |
%data.elements.incl; |
%draft-comment; |
%foreign.unknown.incl; |
%foreign; |
%required-cleanup;)*"
>
<!ENTITY % line-through.attributes
Expand All @@ -126,7 +126,7 @@
%basic.ph; |
%data.elements.incl; |
%draft-comment; |
%foreign.unknown.incl; |
%foreign; |
%required-cleanup;)*"
>
<!ENTITY % overline.attributes
Expand All @@ -145,7 +145,7 @@
%basic.ph; |
%data.elements.incl; |
%draft-comment; |
%foreign.unknown.incl; |
%foreign; |
%required-cleanup;)*"
>
<!ENTITY % tt.attributes
Expand All @@ -164,7 +164,7 @@
%basic.ph; |
%data.elements.incl; |
%draft-comment; |
%foreign.unknown.incl; |
%foreign; |
%required-cleanup;)*"
>
<!ENTITY % sup.attributes
Expand All @@ -183,7 +183,7 @@
%basic.ph; |
%data.elements.incl; |
%draft-comment; |
%foreign.unknown.incl; |
%foreign; |
%required-cleanup;)*"
>
<!ENTITY % sub.attributes
Expand Down
2 changes: 1 addition & 1 deletion doctypes/dtd/base/map.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Map//EN"
(%resourceid;)*,
(%ux-window;)*,
(%data.elements.incl; |
%foreign.unknown.incl;)*)"
%foreign;)*)"
>
<!ENTITY % topicmeta.attributes
"%univ-atts;"
Expand Down
2 changes: 1 addition & 1 deletion doctypes/dtd/base/metaDecl.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@
(%prodinfo;)*,
(%othermeta;)*,
(%data.elements.incl; |
%foreign.unknown.incl;)*)"
%foreign;)*)"
>
<!ENTITY % metadata.attributes
"%univ-atts;"
Expand Down
Loading

0 comments on commit 1b029b8

Please sign in to comment.