Refactoring and adding tons of new parameters.

stefan-jung · Jan 9, 2024 · 1091f3c · 1091f3c
1 parent 65de848
commit 1091f3c
Show file tree

Hide file tree

Showing 15 changed files with 201 additions and 223 deletions.
diff --git a/catalog-dita.xml b/catalog-dita.xml
@@ -2,36 +2,18 @@
 <catalog prefer="public" xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
 
   <group id="rng-public-id">
-    <public publicId="urn:jung:dita:rng:slide.rng:1.3" uri="rng/slide.rng"/>
     <public publicId="urn:jung:dita:rng:slide.rng" uri="rng/slide.rng"/>
-    <public publicId="urn:jung:dita:rng:slideMod.rng:1.3" uri="rng/slideMod.rng"/>
     <public publicId="urn:jung:dita:rng:slideMod.rng" uri="rng/slideMod.rng"/>
-    <public publicId="urn:jung:dita:rng:dataFragmentIndexAttDomain.rng:1.3" uri="rng/dataFragmentIndexAttDomain.rng"/>
-    <public publicId="urn:jung:dita:rng:dataFragmentIndexAttDomain.rng" uri="rng/dataFragmentIndexAttDomain.rng"/>
-    <public publicId="urn:jung:dita:rng:fragmentAttDomain.rng:1.3" uri="rng/fragmentAttDomain.rng"/>
-    <public publicId="urn:jung:dita:rng:fragmentAttDomain.rng" uri="rng/fragmentAttDomain.rng"/>
   </group>
 
   <group id="rng-system-id">
-    <system systemId="urn:jung:dita:rng:slide.rng:1.3" uri="rng/slide.rng"/>
     <system systemId="urn:jung:dita:rng:slide.rng" uri="rng/slide.rng"/>
-    <system systemId="urn:jung:dita:rng:slideMod.rng:1.3" uri="rng/slideMod.rng"/>
     <system systemId="urn:jung:dita:rng:slideMod.rng" uri="rng/slideMod.rng"/>
-    <system systemId="urn:jung:dita:rng:dataFragmentIndexAttDomain.rng:1.3" uri="rng/dataFragmentIndexAttDomain.rng"/>
-    <system systemId="urn:jung:dita:rng:dataFragmentIndexAttDomain.rng" uri="rng/dataFragmentIndexAttDomain.rng"/>
-    <system systemId="urn:jung:dita:rng:fragmentAttDomain.rng:1.3" uri="rng/fragmentAttDomain.rng"/>
-    <system systemId="urn:jung:dita:rng:fragmentAttDomain.rng" uri="rng/fragmentAttDomain.rng"/>
   </group>
 
   <group id="rng-uri">
-    <uri name="urn:jung:dita:rng:slide.rng:1.3" uri="rng/slide.rng"/>
     <uri name="urn:jung:dita:rng:slide.rng" uri="rng/slide.rng"/>
-    <uri name="urn:jung:dita:rng:slideMod.rng:1.3" uri="rng/slideMod.rng"/>
     <uri name="urn:jung:dita:rng:slideMod.rng" uri="rng/slideMod.rng"/>
-    <uri name="urn:jung:dita:rng:dataFragmentIndexAttDomain.rng:1.3" uri="rng/dataFragmentIndexAttDomain.rng"/>
-    <uri name="urn:jung:dita:rng:dataFragmentIndexAttDomain.rng" uri="rng/dataFragmentIndexAttDomain.rng"/>
-    <uri name="urn:jung:dita:rng:fragmentAttDomain.rng:1.3" uri="rng/fragmentAttDomain.rng"/>
-    <uri name="urn:jung:dita:rng:fragmentAttDomain.rng" uri="rng/fragmentAttDomain.rng"/>
   </group>
 
 </catalog>
diff --git a/framework/css/edit/style-slide-helper.css b/framework/css/edit/style-slide-helper.css
@@ -15,7 +15,9 @@
 *[class~='slide/slide'][data-background-repeat]:before(277),
 *[class~='slide/slide'][data-background-opacity]:before(275),
 *[class~='slide/slide'][data-background-video]:before(273),
-*[class~='slide/slide'][data-background-video-loop]:before(271) {
+*[class~='slide/slide'][data-background-video-loop]:before(271),
+*[class~='slide/slide'][data-background-video-muted]:before(269),
+*[class~='slide/slide'][data-auto-animate-unmatched]:before(267){
     margin-bottom: 0.5em;
     font-size: 0.8em;
     color: gray;
@@ -97,4 +99,7 @@
     content: "Background video mute."
 }
 
-
+/* @data-auto-animate-unmatched */
+*[class~='slide/slide'][data-auto-animate-unmatched]:before(267) {
+    content: "Auto animate unmatched."
+}
diff --git a/framework/css/edit/style-slide.css b/framework/css/edit/style-slide.css
@@ -161,7 +161,8 @@
 *[class~='slide/slide'][data-background-opacity]:before(276),
 *[class~='slide/slide'][data-background-video]:before(274),
 *[class~='slide/slide'][data-background-video-loop]:before(272),
-*[class~='slide/slide'][data-background-video-muted]:before(270) {
+*[class~='slide/slide'][data-background-video-muted]:before(270),
+*[class~='slide/slide'][data-auto-animate-unmatched]:before(268) {
     display: block
 }
 
@@ -280,6 +281,13 @@
         oxy_textfield(edit, '@data-background-video-muted', columns, 40);
 }
 
+/* @data-auto-animate-unmatched */
+*[class~='slide/slide'][data-auto-animate-unmatched]:before(268) {
+    content:
+        oxy_label(text, "data-auto-animate-unmatched", width, 10em, color, inherit)
+        oxy_textfield(edit, '@data-auto-animate-unmatched', columns, 40);
+}
+
 *[class~='topic/table'] {
     border: none !important;
     padding-top: 2px;

diff --git a/framework/templates/Slide.dita b/framework/templates/Slide.dita
@@ -3,6 +3,6 @@
 <?xml-model href="urn:jung:dita:rng:slide.rng" schematypens="http://purl.oclc.org/dsdl/schematron"?>
 <slide id="ui_${id}">
   <title>Title of slide</title>
-  <slideBody>
-  </slideBody>
+  <slide-body>
+  </slide-body>
 </slide>
diff --git a/rng/dataFragmentIndexAttDomain.rng b/rng/dataFragmentIndexAttDomain.rng
diff --git a/rng/fragmentAttDomain.rng b/rng/fragmentAttDomain.rng
diff --git a/rng/slide.rng b/rng/slide.rng
@@ -81,9 +81,7 @@
                     (topic sw-d)
                     (topic ui-d)
                     (topic ut-d)
-                    a(props deliveryTarget)
-                    a(base data-fragment-index)
-                    a(base fragment)"/>
+                    a(props deliveryTarget)"/>
                 <!--(topic mathml-d)-->
                 <!--(topic svg-d)-->
             </optional>
@@ -114,8 +112,6 @@
         <include href="urn:oasis:names:tc:dita:rng:uiDomain.rng"/>
         <include href="urn:oasis:names:tc:dita:rng:utilitiesDomain.rng"/>
         <include href="urn:oasis:names:tc:dita:rng:xmlDomain.rng"/>
-        <include href="urn:jung:dita:rng:dataFragmentIndexAttDomain.rng"/>
-        <include href="urn:jung:dita:rng:fragmentAttDomain.rng"/>
     </div>
 
     <div>