Skip to content

Use dita element from base vocab oasis-tcs/dita#952 #285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robander merged 2 commits into from
May 8, 2026
Merged

Use dita element from base vocab oasis-tcs/dita#952 #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ef31e5
Use dita element from base vocab oasis-tcs/dita#952
robander May 8, 2026
83f39d4
Update base spec
robander May 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 11 additions & 14 deletions doctypes/dtd/technicalContent/ditabase.dtd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,12 +256,6 @@
glossentry"
>

<!-- ============================================================= -->
<!-- LOCALLY DEFINED CONTAINMENT -->
<!-- ============================================================= -->

<!ELEMENT dita (%info-types;)+ >

<!-- ============================================================= -->
<!-- DOMAINS ATTRIBUTE OVERRIDE -->
<!-- ============================================================= -->
Expand Down Expand Up @@ -413,12 +407,15 @@
"xmlDomain.mod"
>%xml-d-def;

<!ATTLIST dita
specializations
CDATA
"&included-domains;"
%arch-atts;
%localization-atts;
>
<!-- ============================================================= -->
<!-- INTEGRATE THE DITA ELEMENT FOR -->
<!-- USE WITH DITABASE COMPOSITE DOCTYPE -->
<!-- ============================================================= -->

<!ENTITY % ditaElement-def
PUBLIC "-//OASIS//ELEMENT DITA 2.x Element//EN"
"ditaelement.mod"
>%ditaElement-def;

<!-- ================= End of DITA BASE ================= -->

<!-- ================= End of DITA BASE ================= -->
21 changes: 2 additions & 19 deletions doctypes/rng/technicalContent/ditabase.rng
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,25 +125,8 @@ PUBLIC "-//OASIS//DTD DITA 2.0 Composite//EN"
<include href="xmlDomain.rng" dita:since="1.3"/>
</div>
<div>
<a:documentation>Define a containment for topics for editor support </a:documentation>
<define name="dita.element">
<element name="dita">
<a:documentation>The &lt;dita&gt; element provides a top-level container for multiple topics when you create documents using the ditabase document type. The &lt;dita&gt; element lets you create any
sequence of concept, task, and reference topics, and the ditabase document type lets you further nest these topic types inside each other. The &lt;dita&gt; element has no particular output
implications; it simply allows you to create multiple topics of different types at the same level in a single document. Category: Ditabase document type</a:documentation>
<ref name="dita.attlist"/>
<oneOrMore>
<ref name="info-types"/>
</oneOrMore>
</element>
</define>

<define name="dita.attlist" combine="interleave">
<ref name="arch-atts"/>
<ref name="localization-atts" dita:since="DITA 1.3"/>
<ref name="specializations-att"/>
</define>

<a:documentation>Import the dita container element</a:documentation>
<include href="urn:pubid:oasis:names:tc:dita:rng:ditaelement.rng:2.0"/>
</div>
<div>
<a:documentation>ID-DEFINING-ELEMENT OVERRIDES</a:documentation>
Expand Down
2 changes: 1 addition & 1 deletion specification/baseSpec
Open in desktop
Submodule baseSpec updated 31 files
+4 −0 doctypes/dtd/base/catalog.xml
+54 −0 doctypes/dtd/base/ditaelement.mod
+8 −0 doctypes/rng/base/catalog.xml
+70 −0 doctypes/rng/base/ditaelement.rng
+9 −11 specification/archSpec/base/adding-an-attribute-to-certain-table-elements.dita
+1 −1 specification/archSpec/base/dtd-coding-requirements-expansion-modules.dita
+1 −1 specification/archSpec/base/dtd-coding-requirements-for-element-configuration-modules.dita
+3 −4 specification/archSpec/base/merging-of-cascading-attributes.dita
+4 −6 specification/archSpec/base/overview-of-expansion-modules.dita
+2 −3 specification/archSpec/base/rng-adding-an-attribute-to-certain-table-elements.dita
+1 −1 specification/archSpec/base/specialization-specializations-attribute.dita
+4 −4 specification/archSpec/base/title-usage-within-maps.dita
+2 −14 specification/common/conref-attribute.dita
+8 −11 specification/common/conref-file.dita
+7 −10 specification/common/reuse-w-lwdita/lwdita-attributes.dita
+3 −4 specification/common/reuse-w-lwdita/reuse-pre.dita
+9 −6 specification/langRef/base/enumerationdef.dita
+2 −1 specification/langRef/base/hazardstatement.dita
+4 −2 specification/langRef/base/image.dita
+2 −3 specification/langRef/base/indexterm.dita
+9 −14 specification/langRef/base/resourceid.dita
+1 −0 specification/langRef/quick-reference/base-elements-a-to-z.dita
+1 −1 specification/non-normative/changes-1.3-to-2.0/added-to-standard.dita
+1 −1 specification/non-normative/changes-1.3-to-2.0/elements-from-which-attributes-have-been-removed.dita
+1 −1 specification/non-normative/changes-1.3-to-2.0/modified-in-standard.dita
+1 −1 specification/non-normative/changes-1.3-to-2.0/new-features-and-enhancements-in-dita-2-0.dita
+1 −1 specification/non-normative/changes-1.3-to-2.0/removed-attributes.dita
+1 −1 specification/non-normative/changes-1.3-to-2.0/removed-from-standard.dita
+3 −5 specification/non-normative/changes-1.3-to-2.0/replaced-in-standard.dita
+1 −2 specification/non-normative/elementsMerged.dita
+6 −0 specification/non-normative/information-about-migrating-to-dita-2-0.dita
Loading