Skip to content

Commit

Permalink
Merge pull request oasis-tcs#61 from robander/simpletable
Browse files Browse the repository at this point in the history 
Update simpletable, choicetable for oasis-tcs/dita#292
  • Loading branch information
@robander
robander authored Apr 17, 2020
2 parents 01b5642 + c588aee commit 9d8ded9
Show file tree
Hide file tree
Showing 3 changed files with 114 additions and 3 deletions.
72 changes: 71 additions & 1 deletion doctypes/dtd/technicalContent/dtd/reference.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,8 @@

<!-- LONG NAME: Properties -->
<!ENTITY % properties.content
"((%prophead;)?,
"((%title;)?,
(%prophead;)?,
(%property;)+)"
>
<!ENTITY % properties.attributes
Expand Down Expand Up @@ -184,6 +185,16 @@
"specentry
CDATA
#IMPLIED
scope
(row |
col |
rowgroup |
colgroup |
-dita-use-conref-target)
#IMPLIED
headers
NMTOKENS
#IMPLIED
%univ-atts;"
>
<!ELEMENT proptypehd %proptypehd.content;>
Expand All @@ -198,6 +209,16 @@
"specentry
CDATA
#IMPLIED
scope
(row |
col |
rowgroup |
colgroup |
-dita-use-conref-target)
#IMPLIED
headers
NMTOKENS
#IMPLIED
%univ-atts;"
>
<!ELEMENT propvaluehd %propvaluehd.content;>
Expand All @@ -212,6 +233,16 @@
"specentry
CDATA
#IMPLIED
scope
(row |
col |
rowgroup |
colgroup |
-dita-use-conref-target)
#IMPLIED
headers
NMTOKENS
#IMPLIED
%univ-atts;"
>
<!ELEMENT propdeschd %propdeschd.content;>
Expand Down Expand Up @@ -239,6 +270,19 @@
"specentry
CDATA
#IMPLIED
rowspan
NMTOKEN
#IMPLIED
scope
(row |
col |
rowgroup |
colgroup |
-dita-use-conref-target)
#IMPLIED
headers
NMTOKENS
#IMPLIED
%univ-atts;"
>
<!ELEMENT proptype %proptype.content;>
Expand All @@ -253,6 +297,19 @@
"specentry
CDATA
#IMPLIED
rowspan
NMTOKEN
#IMPLIED
scope
(row |
col |
rowgroup |
colgroup |
-dita-use-conref-target)
#IMPLIED
headers
NMTOKENS
#IMPLIED
%univ-atts;"
>
<!ELEMENT propvalue %propvalue.content;>
Expand All @@ -267,6 +324,19 @@
"specentry
CDATA
#IMPLIED
rowspan
NMTOKEN
#IMPLIED
scope
(row |
col |
rowgroup |
colgroup |
-dita-use-conref-target)
#IMPLIED
headers
NMTOKENS
#IMPLIED
%univ-atts;"
>
<!ELEMENT propdesc %propdesc.content;>
Expand Down
43 changes: 42 additions & 1 deletion doctypes/dtd/technicalContent/dtd/task.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,8 @@

<!-- LONG NAME: Choice Table -->
<!ENTITY % choicetable.content
"((%chhead;)?,
"((%title;)?,
(%chhead;)?,
(%chrow;)+)"
>
<!ENTITY % choicetable.attributes
Expand Down Expand Up @@ -362,6 +363,16 @@
"specentry
CDATA
#IMPLIED
scope
(row |
col |
rowgroup |
colgroup |
-dita-use-conref-target)
#IMPLIED
headers
NMTOKENS
#IMPLIED
%univ-atts;"
>
<!ELEMENT choptionhd %choptionhd.content;>
Expand All @@ -376,6 +387,16 @@
"specentry
CDATA
#IMPLIED
scope
(row |
col |
rowgroup |
colgroup |
-dita-use-conref-target)
#IMPLIED
headers
NMTOKENS
#IMPLIED
%univ-atts;"
>
<!ELEMENT chdeschd %chdeschd.content;>
Expand All @@ -402,6 +423,16 @@
"specentry
CDATA
#IMPLIED
scope
(row |
col |
rowgroup |
colgroup |
-dita-use-conref-target)
#IMPLIED
headers
NMTOKENS
#IMPLIED
%univ-atts;"
>
<!ELEMENT choption %choption.content;>
Expand All @@ -416,6 +447,16 @@
"specentry
CDATA
#IMPLIED
scope
(row |
col |
rowgroup |
colgroup |
-dita-use-conref-target)
#IMPLIED
headers
NMTOKENS
#IMPLIED
%univ-atts;"
>
<!ELEMENT chdesc %chdesc.content;>
Expand Down
2 changes: 1 addition & 1 deletion specification/baseSpec
Submodule baseSpec updated 8 files
+18 −1 doctypes/dtd/base/commonElements.mod
+25 −3 doctypes/rng/base/commonElementsMod.rng
+45 −0 specification/common/conref-attribute.dita
+9 −8 specification/common/reuse-w-lwdita/reuse-simpletable.dita
+21 −3 specification/common/reuse-w-lwdita/reuse-stentry.dita
+6 −29 specification/langRef/base/entry.dita
+21 −0 specification/langRef/base/simpletable.dita
+2 −2 specification/langRef/base/table.dita

0 comments on commit 9d8ded9

Please sign in to comment.