Merge pull request oasis-tcs#113 from robander/diagnostics

#316 update to diagnostics in troubleshooting
dita-ot · Oct 4, 2021 · 57ac798 · 57ac798
2 parents 5164d00 + ed2abdc
commit 57ac798
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 17 deletions.
diff --git a/doctypes/dtd/technicalContent/troubleshooting.mod b/doctypes/dtd/technicalContent/troubleshooting.mod
@@ -15,10 +15,10 @@
 <!--                                                               -->
 <!--  Refer to this file by the following public identifier or an  -->
 <!--       appropriate system identifier                           -->
-<!-- PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Troubleshooting//EN"          -->
-<!--       Delivered as file "troubleshooting.mod"                                 -->
+<!-- PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Troubleshooting//EN"      -->
+<!--       Delivered as file "troubleshooting.mod"                 -->
 <!-- ============================================================= -->
-<!--             (C) Copyright OASIS Open 2014                     -->
+<!--             (C) Copyright OASIS Open 2021                     -->
 <!--             All Rights Reserved.                              -->
 <!--                                                               -->
 <!-- ============================================================= -->
@@ -91,7 +91,7 @@
 <!ENTITY % troublebody.content
                        "((%condition;)?,
                          (%diagnostics;)?,
-                         (%troubleSolution;)+)?"
+                         (%troubleSolution;)*)?"
 >
 <!ENTITY % troublebody.attributes
               "%univ-atts;"
@@ -130,8 +130,8 @@
 
 <!--                    LONG NAME: Diagnostics                      -->
 <!ENTITY % diagnostics.content
-                       "((%diagnostics-general;) | 
-                         (%diagnostics-steps;))"
+                       "(((%diagnostics-general;), (%diagnostics-steps;)?) |
+                          (%diagnostics-steps;))"
 >
 <!ENTITY % diagnostics.attributes
               "%univ-atts;"

diff --git a/doctypes/rng/technicalContent/troubleshootingMod.rng b/doctypes/rng/technicalContent/troubleshootingMod.rng
@@ -161,9 +161,9 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Troubleshooting//EN"
           <optional>
             <ref name="diagnostics"/>
           </optional>
-          <oneOrMore>
+          <zeroOrMore>
             <ref name="troubleSolution"/>
-          </oneOrMore>
+          </zeroOrMore>
         </optional>
       </define>
       <define name="troublebody.attributes">
@@ -241,9 +241,14 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Troubleshooting//EN"
       <a:documentation> LONG NAME: Diagnostics </a:documentation>
       <define name="diagnostics.content">
         <choice>
-          <ref name="diagnostics-general"/>
+          <group>
+            <ref name="diagnostics-general"/>
+            <optional>
+              <ref name="diagnostics-steps"/>
+            </optional>
+          </group>
           <ref name="diagnostics-steps"/>
-        </choice>        
+        </choice>
       </define>
       <define name="diagnostics.attributes">
         <ref name="univ-atts"/>
@@ -291,7 +296,7 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Troubleshooting//EN"
     </div>
     <div>
       <a:documentation> LONG NAME: Diagnostics Steps </a:documentation>
-      <define name="diagnostic-steps.content">
+      <define name="diagnostics-steps.content">
         <optional>
           <ref name="title"/>
         </optional>
@@ -301,24 +306,24 @@ PUBLIC "-//OASIS//ELEMENTS DITA 2.0 Troubleshooting//EN"
           <ref name="steps-informal"/>
         </choice>
       </define>
-      <define name="diagnostic-steps.attributes">
+      <define name="diagnostics-steps.attributes">
         <optional>
           <attribute name="spectitle"/>
         </optional>
         <ref name="univ-atts"/>
       </define>
       <define name="diagnostics-steps.element">
-        <element name="diagnostic-steps" dita:longName="Diagnostics Steps" dita:since="2.0">
+        <element name="diagnostics-steps" dita:longName="Diagnostics Steps" dita:since="2.0">
           <a:documentation>
             <![CDATA[
     Category: Troubleshooting elements
   ]]></a:documentation>
-          <ref name="diagnostic-steps.attlist"/>
-          <ref name="diagnostic-steps.content"/>
+          <ref name="diagnostics-steps.attlist"/>
+          <ref name="diagnostics-steps.content"/>
         </element>
       </define>
-      <define name="diagnostic-steps.attlist" combine="interleave">
-        <ref name="diagnostic-steps.attributes"/>
+      <define name="diagnostics-steps.attlist" combine="interleave">
+        <ref name="diagnostics-steps.attributes"/>
       </define>
     </div>
     <div>