From 9a2710e8356927c7f27b906962a7160d599bbc22 Mon Sep 17 00:00:00 2001
From: Vladimir Alexiev <vladimir.alexiev@ontotext.com>
Date: Fri, 11 May 2018 12:32:38 +0300
Subject: [PATCH 1/6] allow schema:domain/rangeIncludes and rdfs:Class

---
 src/main/webapp/extraction.xsl | 77 +++++++++++++++++++++-------------
 1 file changed, 48 insertions(+), 29 deletions(-)

diff --git a/src/main/webapp/extraction.xsl b/src/main/webapp/extraction.xsl
index a01d064..8e8fa74 100644
--- a/src/main/webapp/extraction.xsl
+++ b/src/main/webapp/extraction.xsl
@@ -19,6 +19,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
     xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" version="2.0"
     xmlns:dc="http://purl.org/dc/elements/1.1/"
     xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+    xmlns:schema="http://schema.org/"
     xmlns:swrl="http://www.w3.org/2003/11/swrl#"
     xmlns:owl2xml="http://www.w3.org/2006/12/owl2-xml#"
     xmlns:owl="http://www.w3.org/2002/07/owl#"
@@ -343,7 +344,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
     <xsl:template match="element()" mode="ontology" />
     <xsl:template match="element()|text()[normalize-space() = '']" />
     
-    <xsl:template match="owl:Class">
+    <xsl:template match="owl:Class|rdfs:Class">
         <div id="{generate-id()}" class="entity">
             <xsl:call-template name="get.entity.name">
                 <xsl:with-param name="toc" select="'classes'" tunnel="yes" as="xs:string" />
@@ -382,7 +383,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
         </div>
     </xsl:template>
     
-    <xsl:template match="rdfs:range | rdfs:domain">
+    <xsl:template match="rdfs:range|schema:rangeIncludes | rdfs:domain|schema:domainIncludes">
         <dd>
             <xsl:apply-templates select="@*:resource | element()">
                 <xsl:with-param name="type" select="'class'" as="xs:string" tunnel="yes" />
@@ -590,7 +591,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
         </xsl:choose>
     </xsl:function>
     
-    <xsl:template match="owl:Class[not(parent::rdf:RDF)] | rdfs:Datatype[not(parent::rdf:RDF)] | owl:DataRange[not(parent::rdf:RDF)]">
+    <xsl:template match="owl:Class[not(parent::rdf:RDF)] | rdfs:Class[not(parent::rdf:RDF)] | rdfs:Datatype[not(parent::rdf:RDF)] | owl:DataRange[not(parent::rdf:RDF)]">
         <xsl:apply-templates />
     </xsl:template>
     
@@ -687,7 +688,8 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
         <xsl:apply-templates select="owl:onClass" />
     </xsl:template>
     
-    <xsl:template match="/rdf:RDF/owl:Class[empty(@*:about | @*:ID) and exists(rdfs:subClassOf)]">
+    <xsl:template match="/rdf:RDF/owl:Class [empty(@*:about | @*:ID) and exists(rdfs:subClassOf)] |
+                         /rdf:RDF/rdfs:Class[empty(@*:about | @*:ID) and exists(rdfs:subClassOf)]">
         <div id="{generate-id()}" class="entity">
             <h3><xsl:value-of select="f:getDescriptionLabel('subclassdefinition')" /><xsl:text> </xsl:text><xsl:call-template name="get.backlink" /></h3>
             <p>
@@ -702,7 +704,8 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
         </div>
     </xsl:template>
     
-    <xsl:template match="/rdf:RDF/owl:Class[empty(@*:about | @*:ID) and exists(owl:equivalentClass)]">
+    <xsl:template match="/rdf:RDF/owl:Class [empty(@*:about | @*:ID) and exists(owl:equivalentClass)] |
+                         /rdf:RDF/rdfs:Class[empty(@*:about | @*:ID) and exists(owl:equivalentClass)]">
         <div id="{generate-id()}" class="entity">
             <h3><xsl:value-of select="f:getDescriptionLabel('equivalentdefinition')" /><xsl:text> </xsl:text><xsl:call-template name="get.backlink" /></h3>
             <p>
@@ -1077,13 +1080,21 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
     <xsl:template name="get.class.superclasses">
         <xsl:if test="exists(rdfs:subClassOf)">
             <dt><xsl:value-of select="f:getDescriptionLabel('hassuperclasses')" /></dt>
-            <xsl:apply-templates select="rdfs:subClassOf" />
+            <dd>
+                <xsl:for-each select="rdfs:subClassOf/(@*:resource|(owl:Class|rdfs:Class)/@*:about)">
+                    <xsl:sort select="f:getLabel(.)" data-type="text" order="ascending" />
+                    <xsl:apply-templates select="." />
+                    <xsl:if test="position() != last()">
+                        <xsl:text>, </xsl:text>
+                    </xsl:if>
+                </xsl:for-each>
+            </dd>
         </xsl:if>
     </xsl:template>
     
     <xsl:template name="get.class.subclasses">
         <xsl:variable name="about" select="@*:about|@*:ID" as="xs:string" />
-        <xsl:variable name="sub-classes" as="attribute()*" select="/rdf:RDF/owl:Class[some $res in rdfs:subClassOf/@*:resource satisfies $res = $about]/(@*:about|@*:ID)" />
+        <xsl:variable name="sub-classes" as="attribute()*" select="/rdf:RDF/(owl:Class|rdfs:Class)[some $res in rdfs:subClassOf/(@*:resource|(owl:Class|rdfs:Class)/@*:about) satisfies $res = $about]/(@*:about|@*:ID)" />
         <xsl:if test="exists($sub-classes)">
             <dt><xsl:value-of select="f:getDescriptionLabel('hassubclasses')" /></dt>
             <dd>
@@ -1100,7 +1111,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
     
     <xsl:template name="get.class.indomain">
         <xsl:variable name="about" select="@*:about|@*:ID" as="xs:string" />
-        <xsl:variable name="properties" as="attribute()*" select="/rdf:RDF/(owl:ObjectProperty|owl:DatatypeProperty|owl:AnnotationProperty)[some $res in rdfs:domain/@*:resource satisfies $res = $about]/(@*:about|@*:ID)" />
+        <xsl:variable name="properties" as="attribute()*" select="/rdf:RDF/(owl:ObjectProperty|owl:DatatypeProperty|owl:AnnotationProperty)[some $res in (rdfs:domain|schema:domainIncludes)/(@*:resource|(owl:Class|rdfs:Class)/@*:about) satisfies $res = $about]/(@*:about|@*:ID)" />
         <xsl:if test="exists($properties)">
             <dt><xsl:value-of select="f:getDescriptionLabel('isindomainof')" /></dt>
             <dd>
@@ -1119,7 +1130,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
     
     <xsl:template name="get.class.inrange">
         <xsl:variable name="about" select="(@*:about|@*:ID)" as="xs:string" />
-        <xsl:variable name="properties" as="attribute()*" select="/rdf:RDF/(owl:ObjectProperty|owl:DatatypeProperty|owl:AnnotationProperty)[some $res in rdfs:range/@*:resource satisfies $res = $about]/(@*:about|@*:ID)" />
+        <xsl:variable name="properties" as="attribute()*" select="/rdf:RDF/(owl:ObjectProperty|owl:DatatypeProperty|owl:AnnotationProperty)[some $res in (rdfs:range|schema:rangeIncludes)/(@*:resource|(owl:Class|rdfs:Class)/@*:about) satisfies $res = $about]/(@*:about|@*:ID)" />
         <xsl:if test="exists($properties)">
             <dt><xsl:value-of select="f:getDescriptionLabel('isinrangeof')" /></dt>
             <dd>
@@ -1138,7 +1149,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
     
     <xsl:template name="get.class.members">
         <xsl:variable name="about" select="(@*:about|@*:ID)" as="xs:string" />
-        <xsl:variable name="members" as="attribute()*" select="/rdf:RDF/owl:NamedIndividual[some $res in rdf:type/@*:resource satisfies $res = $about]/(@*:about|@*:ID)" />
+        <xsl:variable name="members" as="attribute()*" select="/rdf:RDF/owl:NamedIndividual[some $res in rdf:type/(@*:resource|(owl:Class|rdfs:Class)/@*:about) satisfies $res = $about]/(@*:about|@*:ID)" />
         <xsl:if test="exists($members)">
             <dt><xsl:value-of select="f:getDescriptionLabel('hasmembers')" /></dt>
             <dd>
@@ -1156,7 +1167,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
     </xsl:template>
     
     <xsl:template name="get.property.description">
-        <xsl:if test="exists(rdfs:subPropertyOf | rdfs:domain | rdfs:range | owl:propertyChainAxiom) or f:hasSubproperties(.) or f:hasInverseOf(.) or f:hasDisjoints(.) or f:hasEquivalent(.) or f:hasSameAs(.) or f:hasPunning(.)">
+        <xsl:if test="exists(rdfs:subPropertyOf | (rdfs:domain|schema:domainIncludes) | (rdfs:range|schema:rangeIncludes) | owl:propertyChainAxiom) or f:hasSubproperties(.) or f:hasInverseOf(.) or f:hasDisjoints(.) or f:hasEquivalent(.) or f:hasSameAs(.) or f:hasPunning(.)">
             <div class="description">
                 <xsl:call-template name="get.characteristics" />
                 <dl>
@@ -1221,14 +1232,22 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
     <xsl:template name="get.property.superproperty">
         <xsl:if test="exists(rdfs:subPropertyOf)">
             <dt><xsl:value-of select="f:getDescriptionLabel('hassuperproperties')" /></dt>
-            <xsl:apply-templates select="rdfs:subPropertyOf" />
+            <dd>
+                <xsl:for-each select="rdfs:subPropertyOf/(@*:resource|(rdf:Property|owl:ObjectProperty|owl:DatatypeProperty|owl:AnnotationProperty)/@*:about)">
+                    <xsl:sort select="f:getLabel(.)" data-type="text" order="ascending" />
+                    <xsl:apply-templates select="." />
+                    <xsl:if test="position() != last()">
+                        <xsl:text>, </xsl:text>
+                    </xsl:if>
+                </xsl:for-each>
+            </dd>
         </xsl:if>
     </xsl:template>
     
     <xsl:template name="get.property.subproperty">
         <xsl:variable name="type" select="if (self::owl:AnnotationProperty) then 'annotation' else 'property'" as="xs:string" />
         <xsl:variable name="about" select="(@*:about|@*:ID)" as="xs:string" />
-        <xsl:variable name="sub-properties" as="attribute()*" select="/rdf:RDF/(if ($type = 'property') then owl:DatatypeProperty | owl:ObjectProperty else owl:AnnotationProperty)[some $res in rdfs:subPropertyOf/@*:resource satisfies $res = $about]/(@*:about|@*:ID)" />
+        <xsl:variable name="sub-properties" as="attribute()*" select="/rdf:RDF/(if ($type = 'property') then owl:DatatypeProperty | owl:ObjectProperty else owl:AnnotationProperty)[some $res in rdfs:subPropertyOf/(@*:resource|(owl:Class|rdfs:Class)/@*:about) satisfies $res = $about]/(@*:about|@*:ID)" />
         <xsl:if test="exists($sub-properties)">
             <dt><xsl:value-of select="f:getDescriptionLabel('hassubproperties')" /></dt>
             <dd>
@@ -1244,16 +1263,16 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
     </xsl:template>
     
     <xsl:template name="get.property.domain">
-        <xsl:if test="exists(rdfs:domain)">
+        <xsl:if test="exists((rdfs:domain|schema:domainIncludes))">
             <dt><xsl:value-of select="f:getDescriptionLabel('hasdomain')" /></dt>
-            <xsl:apply-templates select="rdfs:domain" />
+            <xsl:apply-templates select="(rdfs:domain|schema:domainIncludes)" />
         </xsl:if>
     </xsl:template>
     
     <xsl:template name="get.property.range">
-        <xsl:if test="exists(rdfs:range)">
+        <xsl:if test="exists((rdfs:range|schema:rangeIncludes))">
             <dt><xsl:value-of select="f:getDescriptionLabel('hasrange')" /></dt>
-            <xsl:apply-templates select="rdfs:range" />
+            <xsl:apply-templates select="(rdfs:range|schema:rangeIncludes)" />
         </xsl:if>
     </xsl:template>
     
@@ -1387,7 +1406,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
                 <xsl:if test="exists(//owl:Ontology/dc:description[normalize-space() != ''])">
                     <li><a href="#introduction"><xsl:value-of select="f:getDescriptionLabel('introduction')" /></a></li>
                 </xsl:if>
-                <xsl:if test="exists(/rdf:RDF/owl:Class/element())">
+                <xsl:if test="exists(/rdf:RDF/(owl:Class|rdfs:Class)/element())">
                     <li><a href="#classes"><xsl:value-of select="f:getDescriptionLabel('classes')" /></a></li>
                 </xsl:if>
                 <xsl:if test="exists(//owl:ObjectProperty/element())">
@@ -1402,7 +1421,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
                 <xsl:if test="exists(//owl:AnnotationProperty)">
                     <li><a href="#annotationproperties"><xsl:value-of select="f:getDescriptionLabel('annotationproperties')" /></a></li>
                 </xsl:if>
-                <xsl:if test="exists(//rdf:Description[exists(rdf:type[@*:resource = 'http://www.w3.org/2002/07/owl#AllDisjointClasses'])]) or exists(/rdf:RDF/(owl:Class|owl:Restriction)[empty(@*:about | @*:ID) and exists(rdfs:subClassOf|owl:equivalentClass)])">
+                <xsl:if test="exists(//rdf:Description[exists(rdf:type[@*:resource = 'http://www.w3.org/2002/07/owl#AllDisjointClasses'])]) or exists(/rdf:RDF/(owl:Class|rdfs:Class|owl:Restriction)[empty(@*:about | @*:ID) and exists(rdfs:subClassOf|owl:equivalentClass)])">
                     <li><a href="#generalaxioms"><xsl:value-of select="f:getDescriptionLabel('generalaxioms')" /></a></li>
                 </xsl:if>
                 <xsl:if test="exists(/rdf:RDF/(swrl:Imp | rdf:Description[rdf:type[@*:resource = 'http://www.w3.org/2003/11/swrl#Imp']]))">
@@ -1422,10 +1441,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
     </xsl:template>
     
     <xsl:template name="get.generalaxioms">
-        <xsl:if test="exists(/rdf:RDF/rdf:Description[exists(rdf:type[@*:resource = 'http://www.w3.org/2002/07/owl#AllDisjointClasses'])]) or exists(/rdf:RDF/(owl:Class|owl:Restriction)[empty(@*:ID | @*:about) and exists(rdfs:subClassOf|owl:equivalentClass)])">
+        <xsl:if test="exists(/rdf:RDF/rdf:Description[exists(rdf:type[@*:resource = 'http://www.w3.org/2002/07/owl#AllDisjointClasses'])]) or exists(/rdf:RDF/(owl:Class|rdfs:Class|owl:Restriction)[empty(@*:ID | @*:about) and exists(rdfs:subClassOf|owl:equivalentClass)])">
             <div id="generalaxioms">
                 <h2><xsl:value-of select="f:getDescriptionLabel('generalaxioms')" /></h2>
-                <xsl:apply-templates select="/rdf:RDF/(rdf:Description[exists(rdf:type[@*:resource = 'http://www.w3.org/2002/07/owl#AllDisjointClasses'])]|(owl:Class|owl:Restriction)[empty(@*:ID | @*:about) and exists(rdfs:subClassOf|owl:equivalentClass)])" />
+                <xsl:apply-templates select="/rdf:RDF/(rdf:Description[exists(rdf:type[@*:resource = 'http://www.w3.org/2002/07/owl#AllDisjointClasses'])]|(owl:Class|rdfs:Class|owl:Restriction)[empty(@*:ID | @*:about) and exists(rdfs:subClassOf|owl:equivalentClass)])" />
             </div>
         </xsl:if>
     </xsl:template>
@@ -1461,11 +1480,11 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
     </xsl:template>
     
     <xsl:template name="get.classes">
-        <xsl:if test="exists(/rdf:RDF/owl:Class/element())">
+        <xsl:if test="exists(/rdf:RDF/(owl:Class|rdfs:Class)/element())">
             <div id="classes">
                 <h2><xsl:value-of select="f:getDescriptionLabel('classes')" /></h2>
                 <xsl:call-template name="get.classes.toc" />
-                <xsl:apply-templates select="/rdf:RDF/owl:Class[exists(element()) and exists(@*:about|@*:ID)]">
+                <xsl:apply-templates select="/rdf:RDF/(owl:Class|rdfs:Class)[exists(element()) and exists(@*:about|@*:ID)]">
                     <xsl:sort select="lower-case(f:getLabel(@*:about|@*:ID))"
                         order="ascending" data-type="text" />
                     <xsl:with-param name="type" tunnel="yes" as="xs:string" select="'class'" />
@@ -1476,7 +1495,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
     
     <xsl:template name="get.classes.toc">
         <ul class="hlist">
-            <xsl:apply-templates select="/rdf:RDF/owl:Class[exists(element()) and exists(@*:about|@*:ID)]" mode="toc">
+            <xsl:apply-templates select="/rdf:RDF/(owl:Class|rdfs:Class)[exists(element()) and exists(@*:about|@*:ID)]" mode="toc">
                 <xsl:sort select="lower-case(f:getLabel(@*:about|@*:ID))"
                     order="ascending" data-type="text" />
                 <xsl:with-param name="type" tunnel="yes" as="xs:string" select="'class'" />
@@ -1585,7 +1604,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
         <xsl:param name="type" as="xs:string" select="''" tunnel="yes" />
         <xsl:variable name="el" select="$root/rdf:RDF/element()[@*:about = $iri or @*:ID = $iri]" as="element()*" />
         <xsl:choose>
-            <xsl:when test="($type = '' or $type = 'class') and ($el[self::owl:Class] or $iri = 'http://www.w3.org/2002/07/owl#Thing')">
+            <xsl:when test="($type = '' or $type = 'class') and ($el[self::owl:Class] or $el[self::rdfs:Class] or $iri = 'http://www.w3.org/2002/07/owl#Thing')">
                 <sup title="{f:getDescriptionLabel('class')}" class="type-c">c</sup>
             </xsl:when>
             <xsl:when test="($type = '' or $type = 'property') and $el[self::owl:ObjectProperty]">
@@ -1694,7 +1713,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
     
     <xsl:function name="f:hasSubclasses" as="xs:boolean">
         <xsl:param name="el" as="element()" />
-        <xsl:value-of select="exists($rdf/owl:Class[some $res in rdfs:subClassOf/@*:resource satisfies $res = $el/(@*:about|@*:ID)])" />
+        <xsl:value-of select="exists($rdf/(owl:Class|rdfs:Class)[some $res in rdfs:subClassOf/(@*:resource|(owl:Class|rdfs:Class)/@*:about) satisfies $res = $el/(@*:about|@*:ID)])" />
     </xsl:function>
     
     <xsl:function name="f:hasMembers" as="xs:boolean">
@@ -1704,18 +1723,18 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
     
     <xsl:function name="f:isInRange" as="xs:boolean">
         <xsl:param name="el" as="element()" />
-        <xsl:value-of select="exists($rdf/(owl:ObjectProperty|owl:DatatypeProperty|owl:AnnotationProperty)[some $res in rdfs:range/@*:resource satisfies $res = $el/(@*:about|@*:ID)])" />
+        <xsl:value-of select="exists($rdf/(owl:ObjectProperty|owl:DatatypeProperty|owl:AnnotationProperty)[some $res in (rdfs:range|schema:rangeIncludes)/(@*:resource|(owl:Class|rdfs:Class)/@*:about) satisfies $res = $el/(@*:about|@*:ID)])" />
     </xsl:function>
     
     <xsl:function name="f:isInDomain" as="xs:boolean">
         <xsl:param name="el" as="element()" />
-        <xsl:value-of select="exists($rdf/(owl:ObjectProperty|owl:DatatypeProperty|owl:AnnotationProperty)[some $res in rdfs:domain/@*:resource satisfies $res = $el/(@*:about|@*:ID)])" />
+        <xsl:value-of select="exists($rdf/(owl:ObjectProperty|owl:DatatypeProperty|owl:AnnotationProperty)[some $res in (rdfs:domain|schema:domainIncludes)/(@*:resource|(owl:Class|rdfs:Class)/@*:about) satisfies $res = $el/(@*:about|@*:ID)])" />
     </xsl:function>
     
     <xsl:function name="f:hasSubproperties" as="xs:boolean">
         <xsl:param name="el" as="element()" />
         <xsl:variable name="type" select="if ($el/self::owl:AnnotationProperty) then 'annotation' else 'property'" as="xs:string" />
-        <xsl:value-of select="exists($rdf/(if ($type = 'property') then owl:DatatypeProperty | owl:ObjectProperty else owl:AnnotationProperty)[some $res in rdfs:subPropertyOf/@*:resource satisfies $res = $el/(@*:about|@*:ID)])" />
+        <xsl:value-of select="exists($rdf/(if ($type = 'property') then owl:DatatypeProperty | owl:ObjectProperty else owl:AnnotationProperty)[some $res in rdfs:subPropertyOf/(@*:resource|(owl:Class|rdfs:Class)/@*:about) satisfies $res = $el/(@*:about|@*:ID)])" />
     </xsl:function>
     
     <xsl:function name="f:getType" as="xs:string?">

From e20fe7ede8f4d14dea035ab703f2b216eda1a279 Mon Sep 17 00:00:00 2001
From: Vladimir Alexiev <vladimir.alexiev@ontotext.com>
Date: Fri, 11 May 2018 14:02:43 +0300
Subject: [PATCH 2/6] add "./" to import file names

---
 src/main/webapp/extraction.xsl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/extraction.xsl b/src/main/webapp/extraction.xsl
index 8e8fa74..e2f8fd8 100644
--- a/src/main/webapp/extraction.xsl
+++ b/src/main/webapp/extraction.xsl
@@ -30,9 +30,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
     xmlns:dcterms="http://purl.org/dc/terms/"
     xmlns="http://www.w3.org/1999/xhtml">
      
-    <xsl:include href="swrl-module.xsl" />
-    <xsl:include href="common-functions.xsl"/>
-    <xsl:include href="structural-reasoner.xsl"/>
+    <xsl:include href="./swrl-module.xsl" />
+    <xsl:include href="./common-functions.xsl"/>
+    <xsl:include href="./structural-reasoner.xsl"/>
     
     <xsl:output encoding="UTF-8" indent="no" method="xhtml" />
     

From cdbcd7187c6194bae12a5b83b775d887e32a7097 Mon Sep 17 00:00:00 2001
From: Vladimir Alexiev <vladimir.alexiev@ontotext.com>
Date: Fri, 11 May 2018 14:16:22 +0300
Subject: [PATCH 3/6] xml:base="."

---
 src/main/webapp/extraction.xsl | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/extraction.xsl b/src/main/webapp/extraction.xsl
index e2f8fd8..7317185 100644
--- a/src/main/webapp/extraction.xsl
+++ b/src/main/webapp/extraction.xsl
@@ -14,8 +14,9 @@ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema" exclude-result-prefixes="xs xd dc rdfs swrl owl2xml owl xsd swrlb rdf f dcterms"
+<xsl:stylesheet
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"                
+    xmlns:xs="http://www.w3.org/2001/XMLSchema" exclude-result-prefixes="xs xd dc rdfs schema swrl owl2xml owl xsd swrlb rdf f dcterms"
     xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" version="2.0"
     xmlns:dc="http://purl.org/dc/elements/1.1/"
     xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
@@ -28,11 +29,12 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
     xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
     xmlns:f="http://www.essepuntato.it/xslt/function"
     xmlns:dcterms="http://purl.org/dc/terms/"
-    xmlns="http://www.w3.org/1999/xhtml">
+    xmlns="http://www.w3.org/1999/xhtml"
+    xml:base="."> <!-- allow the transform to live at https://raw.githubusercontent.com/, else  XTSE0165: I/O error reported by XML parser processing: unknown protocol: https -->
      
-    <xsl:include href="./swrl-module.xsl" />
-    <xsl:include href="./common-functions.xsl"/>
-    <xsl:include href="./structural-reasoner.xsl"/>
+    <xsl:include href="swrl-module.xsl" />
+    <xsl:include href="common-functions.xsl"/>
+    <xsl:include href="structural-reasoner.xsl"/>
     
     <xsl:output encoding="UTF-8" indent="no" method="xhtml" />
     

From 67eb7686196d3f2f21b510317c866701c1589bac Mon Sep 17 00:00:00 2001
From: Vladimir Alexiev <vladimir.alexiev@ontotext.com>
Date: Fri, 11 May 2018 14:28:57 +0300
Subject: [PATCH 4/6] Revert "add "./" to import file names"

This reverts commit e20fe7ede8f4d14dea035ab703f2b216eda1a279.
---
 src/main/webapp/extraction.xsl | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main/webapp/extraction.xsl b/src/main/webapp/extraction.xsl
index 7317185..8e8fa74 100644
--- a/src/main/webapp/extraction.xsl
+++ b/src/main/webapp/extraction.xsl
@@ -14,9 +14,8 @@ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 -->
-<xsl:stylesheet
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"                
-    xmlns:xs="http://www.w3.org/2001/XMLSchema" exclude-result-prefixes="xs xd dc rdfs schema swrl owl2xml owl xsd swrlb rdf f dcterms"
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema" exclude-result-prefixes="xs xd dc rdfs swrl owl2xml owl xsd swrlb rdf f dcterms"
     xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" version="2.0"
     xmlns:dc="http://purl.org/dc/elements/1.1/"
     xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
@@ -29,8 +28,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
     xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
     xmlns:f="http://www.essepuntato.it/xslt/function"
     xmlns:dcterms="http://purl.org/dc/terms/"
-    xmlns="http://www.w3.org/1999/xhtml"
-    xml:base="."> <!-- allow the transform to live at https://raw.githubusercontent.com/, else  XTSE0165: I/O error reported by XML parser processing: unknown protocol: https -->
+    xmlns="http://www.w3.org/1999/xhtml">
      
     <xsl:include href="swrl-module.xsl" />
     <xsl:include href="common-functions.xsl"/>

From 7e824dd5410339c68bd1f491a1dfc74747451df2 Mon Sep 17 00:00:00 2001
From: Vladimir Alexiev <vladimir.alexiev@ontotext.com>
Date: Fri, 11 May 2018 14:29:43 +0300
Subject: [PATCH 5/6] add "schema" to exclude-result-prefixesx

---
 src/main/webapp/extraction.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/extraction.xsl b/src/main/webapp/extraction.xsl
index 8e8fa74..a51ff47 100644
--- a/src/main/webapp/extraction.xsl
+++ b/src/main/webapp/extraction.xsl
@@ -15,7 +15,7 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema" exclude-result-prefixes="xs xd dc rdfs swrl owl2xml owl xsd swrlb rdf f dcterms"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema" exclude-result-prefixes="xs xd dc rdfs schema swrl owl2xml owl xsd swrlb rdf f dcterms"
     xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl" version="2.0"
     xmlns:dc="http://purl.org/dc/elements/1.1/"
     xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"

From 404deaadc8540c64c4de61c7f32407f5fddaa4df Mon Sep 17 00:00:00 2001
From: Vladimir Alexiev <vladimir.alexiev@ontotext.com>
Date: Wed, 23 May 2018 14:29:51 +0300
Subject: [PATCH 6/6] emit rdfs:domain and schema:domainIncludes separately,
 and same for range

---
 src/main/webapp/en.xml         |  4 +++-
 src/main/webapp/extraction.xsl | 26 +++++++++++++++++++++-----
 src/main/webapp/fr.xml         |  2 ++
 src/main/webapp/it.xml         |  2 ++
 4 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/en.xml b/src/main/webapp/en.xml
index 1c20b90..c1cbf18 100644
--- a/src/main/webapp/en.xml
+++ b/src/main/webapp/en.xml
@@ -41,6 +41,8 @@
     <hassubproperties>has sub-properties</hassubproperties>
     <hasdomain>has domain</hasdomain>
     <hasrange>has range</hasrange>
+    <domainIncludes>domain includes</domainIncludes>
+    <rangeIncludes>range includes</rangeIncludes>
     <importedontologies>Imported Ontologies</importedontologies>
     <individualassertions>has facts</individualassertions>
     <authors>Authors</authors>
@@ -75,4 +77,4 @@
     <annotationpropertytoc>Annotation Property ToC</annotationpropertytoc>
     <namedindividualtoc>Named Individual ToC</namedindividualtoc>
     <hascharacteristics>has characteristics</hascharacteristics>
-</labels>
\ No newline at end of file
+</labels>
diff --git a/src/main/webapp/extraction.xsl b/src/main/webapp/extraction.xsl
index a51ff47..b08cb4a 100644
--- a/src/main/webapp/extraction.xsl
+++ b/src/main/webapp/extraction.xsl
@@ -383,7 +383,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
         </div>
     </xsl:template>
     
-    <xsl:template match="rdfs:range|schema:rangeIncludes | rdfs:domain|schema:domainIncludes">
+    <xsl:template match="rdfs:domain|schema:domainIncludes | rdfs:range|schema:rangeIncludes">
         <dd>
             <xsl:apply-templates select="@*:resource | element()">
                 <xsl:with-param name="type" select="'class'" as="xs:string" tunnel="yes" />
@@ -1175,7 +1175,9 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
                     <xsl:call-template name="get.property.superproperty" />
                     <xsl:call-template name="get.property.subproperty" />
                     <xsl:call-template name="get.property.domain" />
+                    <xsl:call-template name="get.property.domainIncludes" />
                     <xsl:call-template name="get.property.range" />
+                    <xsl:call-template name="get.property.rangeIncludes" />
                     <xsl:call-template name="get.property.inverse">
                         <xsl:with-param name="type" select="'property'" tunnel="yes" as="xs:string" />
                     </xsl:call-template>
@@ -1263,16 +1265,30 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
     </xsl:template>
     
     <xsl:template name="get.property.domain">
-        <xsl:if test="exists((rdfs:domain|schema:domainIncludes))">
+        <xsl:if test="exists(rdfs:domain)">
             <dt><xsl:value-of select="f:getDescriptionLabel('hasdomain')" /></dt>
-            <xsl:apply-templates select="(rdfs:domain|schema:domainIncludes)" />
+            <xsl:apply-templates select="rdfs:domain" />
+        </xsl:if>
+    </xsl:template>
+    
+    <xsl:template name="get.property.domainIncludes">
+        <xsl:if test="exists(schema:domainIncludes)">
+            <dt><xsl:value-of select="f:getDescriptionLabel('domainIncludes')" /></dt>
+            <xsl:apply-templates select="schema:domainIncludes" />
         </xsl:if>
     </xsl:template>
     
     <xsl:template name="get.property.range">
-        <xsl:if test="exists((rdfs:range|schema:rangeIncludes))">
+        <xsl:if test="exists(rdfs:range)">
             <dt><xsl:value-of select="f:getDescriptionLabel('hasrange')" /></dt>
-            <xsl:apply-templates select="(rdfs:range|schema:rangeIncludes)" />
+            <xsl:apply-templates select="rdfs:range" />
+        </xsl:if>
+    </xsl:template>
+    
+    <xsl:template name="get.property.rangeIncludes">
+        <xsl:if test="exists(schema:rangeIncludes)">
+            <dt><xsl:value-of select="f:getDescriptionLabel('rangeIncludes')" /></dt>
+            <xsl:apply-templates select="schema:rangeIncludes" />
         </xsl:if>
     </xsl:template>
     
diff --git a/src/main/webapp/fr.xml b/src/main/webapp/fr.xml
index 0d8d462..57ce28b 100644
--- a/src/main/webapp/fr.xml
+++ b/src/main/webapp/fr.xml
@@ -41,6 +41,8 @@
     <hassubproperties>a pour sous-propriétés</hassubproperties>
     <hasdomain>a pour domaines</hasdomain>
     <hasrange>a pour cibles</hasrange>
+    <domainIncludes>domain includes</domainIncludes>
+    <rangeIncludes>range includes</rangeIncludes>
     <importedontologies>Ontologies importées</importedontologies>
     <individualassertions>a pour assertions</individualassertions>
     <authors>Auteurs</authors>
diff --git a/src/main/webapp/it.xml b/src/main/webapp/it.xml
index 5af1a54..e16b2ff 100644
--- a/src/main/webapp/it.xml
+++ b/src/main/webapp/it.xml
@@ -39,6 +39,8 @@
     <hassubproperties>ha come sotto-proprietà</hassubproperties>
     <hasdomain>ha come dominio</hasdomain>
     <hasrange>ha come codominio</hasrange>
+    <domainIncludes>domain includes</domainIncludes>
+    <rangeIncludes>range includes</rangeIncludes>
     <importedontologies>Ontologie importate</importedontologies>
     <individualassertions>ha come fatti</individualassertions>
     <authors>Autori</authors>