Support disjoint unions; improve modelling somewhat

[Vocab] / transforms / terms.xslt

diff --git a/transforms/terms.xslt b/transforms/terms.xslt
index 381c556777e3e635b72d9d8239d469e26bbeda88..201e757186fe8d4e851f62ce8f4e5fb2203f2f14 100644 (file)
--- a/transforms/terms.xslt
+++ b/transforms/terms.xslt
@@ -750,6 +750,24 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                </choose>
                                        </element>
                                </if>
                                                </choose>
                                        </element>
                                </if>

+                               <if test="owl:disjointUnionOf">
+                                       <element name="div" namespace="&xhtml;">
+                                               <element name="dt" namespace="&xhtml;">
+                                                       &en;
+                                                       <text>Disjoint Union Of</text>
+                                               </element>
+                                               <for-each select="owl:disjointUnionOf">
+                                                       <element name="dd" namespace="&xhtml;">
+                                                               <for-each select="*">
+                                                                       <apply-templates select="." mode="Vocab:render-class"/>
+                                                                       <if test="position()&lt;last()">
+                                                                               <text>, </text>
+                                                                       </if>
+                                                               </for-each>
+                                                       </element>
+                                               </for-each>
+                                       </element>
+                               </if>

                                <if test="$inverses">
                                        <choose>
                                                <when test="$kind='class'">
                                <if test="$inverses">
                                        <choose>
                                                <when test="$kind='class'">


@@ -884,32 +902,6 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                </for-each>
                                        </element>
                                </if>
                                                </for-each>
                                        </element>
                                </if>

-                               <if test="rdfs:domain">
-                                       <element name="div" namespace="&xhtml;">
-                                               <element name="dt" namespace="&xhtml;">
-                                                       &en;
-                                                       <text>Domain</text>
-                                               </element>
-                                               <for-each select="rdfs:domain">
-                                                       <element name="dd" namespace="&xhtml;">
-                                                               <apply-templates select="(@rdf:resource|*)[1]" mode="Vocab:render-class"/>
-                                                       </element>
-                                               </for-each>
-                                       </element>
-                               </if>
-                               <if test="rdfs:range">
-                                       <element name="div" namespace="&xhtml;">
-                                               <element name="dt" namespace="&xhtml;">
-                                                       &en;
-                                                       <text>Range</text>
-                                               </element>
-                                               <for-each select="rdfs:range">
-                                                       <element name="dd" namespace="&xhtml;">
-                                                               <apply-templates select="(@rdf:resource|*)[1]" mode="Vocab:render-class"/>
-                                                       </element>
-                                               </for-each>
-                                       </element>
-                               </if>

                                <if test="$disjoints">
                                        <choose>
                                                <when test="$kind='class'">
                                <if test="$disjoints">
                                        <choose>
                                                <when test="$kind='class'">


@@ -946,6 +938,32 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                </when>
                                        </choose>
                                </if>
                                                </when>
                                        </choose>
                                </if>

+                               <if test="rdfs:domain">
+                                       <element name="div" namespace="&xhtml;">
+                                               <element name="dt" namespace="&xhtml;">
+                                                       &en;
+                                                       <text>Domain</text>
+                                               </element>
+                                               <for-each select="rdfs:domain">
+                                                       <element name="dd" namespace="&xhtml;">
+                                                               <apply-templates select="(@rdf:resource|*)[1]" mode="Vocab:render-class"/>
+                                                       </element>
+                                               </for-each>
+                                       </element>
+                               </if>
+                               <if test="rdfs:range">
+                                       <element name="div" namespace="&xhtml;">
+                                               <element name="dt" namespace="&xhtml;">
+                                                       &en;
+                                                       <text>Range</text>
+                                               </element>
+                                               <for-each select="rdfs:range">
+                                                       <element name="dd" namespace="&xhtml;">
+                                                               <apply-templates select="(@rdf:resource|*)[1]" mode="Vocab:render-class"/>
+                                                       </element>
+                                               </for-each>
+                                       </element>
+                               </if>

                                <if test="skos:inScheme">
                                        <element name="div" namespace="&xhtml;">
                                                <element name="dt" namespace="&xhtml;">
                                <if test="skos:inScheme">
                                        <element name="div" namespace="&xhtml;">
                                                <element name="dt" namespace="&xhtml;">