Support disjoint unions; improve modelling somewhat

[Vocab] / transforms / terms.xslt

diff --git a/transforms/terms.xslt b/transforms/terms.xslt
index 20875c19c2b3134abb5b15ffb3d931d09df54ed5..201e757186fe8d4e851f62ce8f4e5fb2203f2f14 100644 (file)
--- a/transforms/terms.xslt
+++ b/transforms/terms.xslt
@@ -270,6 +270,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                <value-of select="rdfs:label[1]"/>
                                        </element>
                                        <element name="p" namespace="&xhtml;">
+                                               &en;
                                                <text>An ontology.</text>
                                        </element>
                                </element>
@@ -461,6 +462,7 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                <text>)</text>
                        </element>
                        <element name="p" namespace="&xhtml;">
+                               &en;
                                <choose>
                                        <when test="self::owl:Class">
                                                <text>A class.</text>
@@ -748,6 +750,24 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                </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'">
@@ -882,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>
-                               <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'">
@@ -944,6 +938,32 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                </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;">
@@ -960,6 +980,38 @@ If a copy of the M·P·L was not distributed with this file, You can obtain one
                                                </for-each>
                                        </element>
                                </if>
+                               <if test="skos:broader">
+                                       <element name="div" namespace="&xhtml;">
+                                               <element name="dt" namespace="&xhtml;">
+                                                       &en;
+                                                       <text>Has Broader</text>
+                                               </element>
+                                               <for-each select="skos:broader">
+                                                       <element name="dd" namespace="&xhtml;">
+                                                               <call-template name="Vocab:link-to">
+                                                                       <with-param name="resource" select="string(@rdf:resource)"/>
+                                                                       <with-param name="kind" select="'individual'"/>
+                                                               </call-template>
+                                                       </element>
+                                               </for-each>
+                                       </element>
+                               </if>
+                               <if test="skos:narrower">
+                                       <element name="div" namespace="&xhtml;">
+                                               <element name="dt" namespace="&xhtml;">
+                                                       &en;
+                                                       <text>Has Narrower</text>
+                                               </element>
+                                               <for-each select="skos:narrower">
+                                                       <element name="dd" namespace="&xhtml;">
+                                                               <call-template name="Vocab:link-to">
+                                                                       <with-param name="resource" select="string(@rdf:resource)"/>
+                                                                       <with-param name="kind" select="'individual'"/>
+                                                               </call-template>
+                                                       </element>
+                                               </for-each>
+                                       </element>
+                               </if>
                                <if test="rdfs:isDefinedBy[not(starts-with(@rdf:resource, $base-iri))]">
                                        <element name="div" namespace="&xhtml;">
                                                <element name="dt" namespace="&xhtml;">