From d62d3af31529f58594f91ef30485d33532a15850 Mon Sep 17 00:00:00 2001
From: "Robert D. Anderson" <robert.dan.anderson@oracle.com>
Date: Mon, 17 Oct 2022 19:56:05 -0500
Subject: [PATCH] Add impose-role to DTD #670

---
 doctypes/dtd/base/ditavalrefDomain.mod        |  1 +
 doctypes/dtd/base/map.mod                     | 18 ++++++++++++++++++
 doctypes/dtd/base/mapGroup.mod                |  3 +++
 doctypes/dtd/subjectScheme/classifyDomain.mod |  3 +++
 doctypes/dtd/subjectScheme/subjectScheme.mod  |  3 +++
 5 files changed, 28 insertions(+)

diff --git a/doctypes/dtd/base/ditavalrefDomain.mod b/doctypes/dtd/base/ditavalrefDomain.mod
index 5292cee4..07497e7e 100644
--- a/doctypes/dtd/base/ditavalrefDomain.mod
+++ b/doctypes/dtd/base/ditavalrefDomain.mod
@@ -88,6 +88,7 @@
                processing-role
                           CDATA
                                     'resource-only'
+               %impose-role-attribute-fixed-keeptarget;
                %ditavalref-univ-atts;"
 >
 <!ELEMENT  ditavalref %ditavalref.content;>
diff --git a/doctypes/dtd/base/map.mod b/doctypes/dtd/base/map.mod
index 58edab51..dbb5a14c 100644
--- a/doctypes/dtd/base/map.mod
+++ b/doctypes/dtd/base/map.mod
@@ -335,6 +335,23 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Map//EN"
                                     #IMPLIED"
 >
 
+<!ENTITY % impose-role-attribute
+              "impose-role
+                          (impose |
+                           keeptarget |
+                           -dita-use-conref-target)
+                                    'keeptarget'"
+>
+<!ENTITY % impose-role-attribute-fixed-keeptarget
+              "impose-role
+                          (keeptarget)
+                                    'keeptarget'"
+>
+<!ENTITY % impose-role-attribute-fixed-impose
+              "impose-role
+                          (impose)
+                                    'impose'"
+>
     
 <!-- ============================================================= -->
 <!--                    MODULES CALLS                              -->
@@ -427,6 +444,7 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Map//EN"
                keys
                           CDATA
                                     #IMPLIED
+               %impose-role-attribute;
                %topicref-atts;
                %univ-atts;"
 >
diff --git a/doctypes/dtd/base/mapGroup.mod b/doctypes/dtd/base/mapGroup.mod
index 3c0689ea..302dd02c 100644
--- a/doctypes/dtd/base/mapGroup.mod
+++ b/doctypes/dtd/base/mapGroup.mod
@@ -103,6 +103,7 @@
                format
                           CDATA
                                     'ditamap'
+               %impose-role-attribute-fixed-keeptarget;
                %topicref-atts-without-format;
                %univ-atts;"
 >
@@ -179,6 +180,7 @@
                subjectrefs
                           CDATA
                                     #IMPLIED
+               %impose-role-attribute-fixed-keeptarget;
                %univ-atts;"
 >
 <!ELEMENT  keydef %keydef.content;>
@@ -241,6 +243,7 @@
                            yes |
                            -dita-use-conref-target)
                                     #IMPLIED
+               %impose-role-attribute;
                %univ-atts;"
 >
 <!ELEMENT  mapresources %mapresources.content;> 
diff --git a/doctypes/dtd/subjectScheme/classifyDomain.mod b/doctypes/dtd/subjectScheme/classifyDomain.mod
index c4a326dc..9ca35e15 100644
--- a/doctypes/dtd/subjectScheme/classifyDomain.mod
+++ b/doctypes/dtd/subjectScheme/classifyDomain.mod
@@ -90,6 +90,7 @@
                            yes |
                            -dita-use-conref-target)
                                     'no'
+               %impose-role-attribute-fixed-keeptarget;
                %univ-atts;"
 >
 <!ELEMENT  topicsubject %topicsubject.content;>
@@ -152,6 +153,7 @@
                            yes |
                            -dita-use-conref-target)
                                     'no'
+               %impose-role-attribute-fixed-keeptarget;
                %univ-atts;"
 >
 <!ELEMENT  topicapply %topicapply.content;>
@@ -212,6 +214,7 @@
                            yes |
                            -dita-use-conref-target)
                                     'no'
+               %impose-role-attribute-fixed-keeptarget;
                %univ-atts;"
 >
 <!ELEMENT  subjectref %subjectref.content;>
diff --git a/doctypes/dtd/subjectScheme/subjectScheme.mod b/doctypes/dtd/subjectScheme/subjectScheme.mod
index a0f4560a..4e9b06c8 100644
--- a/doctypes/dtd/subjectScheme/subjectScheme.mod
+++ b/doctypes/dtd/subjectScheme/subjectScheme.mod
@@ -168,6 +168,7 @@
                            peer |
                            -dita-use-conref-target)
                                     #IMPLIED
+               %impose-role-attribute-fixed-keeptarget;
                %univ-atts;"
 >
 <!ELEMENT  schemeref %schemeref.content;>
@@ -231,6 +232,7 @@
                            yes |
                            -dita-use-conref-target)
                                     #IMPLIED
+               %impose-role-attribute-fixed-keeptarget;
                %univ-atts;"
 >
 <!ELEMENT  subjectdef %subjectdef.content;>
@@ -423,6 +425,7 @@
                            yes |
                            -dita-use-conref-target)
                                     #IMPLIED
+               %impose-role-attribute-fixed-keeptarget;
                %univ-atts;"
 >
 <!ELEMENT  defaultSubject %defaultSubject.content;>