Merge pull request #22 from ndw/iss-21

Delegate both http: and https: system identifiers

Author: ndw

build.gradle

@@ -57,3 +57,7 @@ task dist(type: Zip, dependsOn: ["make_data_catalog", "validate", "copyNotices"]
   destinationDirectory = file("${buildDir}/dist")
   archiveFileName = "xmlresolverdata-${relVersion}.zip"
 }
+
+task clean() {
+  delete buildDir
+}

gradle.properties

@@ -1,2 +1,2 @@
-version = 1.2.0
-relVersion = 1.2.0
+version = 1.2.1
+relVersion = 1.2.1

tools/make-catalog.xsl

@@ -32,8 +32,12 @@
                     catalog="cat-xhtml.xml"/>
     <delegateSystem systemIdStartString="https://www.w3.org/MarkUp/DTD/xhtml"
                     catalog="cat-xhtml.xml"/>
+    <delegateSystem systemIdStartString="http://www.w3.org/MarkUp/DTD/xhtml"
+                    catalog="cat-xhtml.xml"/>
     <delegateSystem systemIdStartString="https://www.w3.org/TR/xhtml"
                     catalog="cat-xhtml.xml"/>
+    <delegateSystem systemIdStartString="http://www.w3.org/TR/xhtml"
+                    catalog="cat-xhtml.xml"/>
   </xsl:variable>
 
   <xsl:variable name="subset"
@@ -66,6 +70,8 @@
                     catalog="cat-svg.xml"/>
     <delegateSystem systemIdStartString="https://www.w3.org/Graphics/SVG/1.1/"
                     catalog="cat-svg.xml"/>
+    <delegateSystem systemIdStartString="http://www.w3.org/Graphics/SVG/1.1/"
+                    catalog="cat-svg.xml"/>
   </xsl:variable>
 
   <xsl:variable name="subset"
@@ -101,8 +107,12 @@
                     catalog="cat-entities.xml"/>
     <delegateSystem systemIdStartString="https://www.w3.org/2003/entities/"
                     catalog="cat-entities.xml"/>
+    <delegateSystem systemIdStartString="http://www.w3.org/2003/entities/"
+                    catalog="cat-entities.xml"/>
     <delegateSystem systemIdStartString="https://www.w3.org/Math/DTD/mathml1/"
                     catalog="cat-entities.xml"/>
+    <delegateSystem systemIdStartString="http://www.w3.org/Math/DTD/mathml1/"
+                    catalog="cat-entities.xml"/>
   </xsl:variable>
 
   <xsl:variable name="subset"
@@ -128,6 +138,8 @@
     <xsl:sequence select="$prefix"/>
     <delegateSystem systemIdStartString="https://www.w3.org/Math/DTD/mathml2/"
                     catalog="cat-mathml2.xml"/>
+    <delegateSystem systemIdStartString="http://www.w3.org/Math/DTD/mathml2/"
+                    catalog="cat-mathml2.xml"/>
   </xsl:variable>
 
   <xsl:variable name="subset"
@@ -147,6 +159,8 @@
     <xsl:sequence select="$prefix"/>
     <delegateSystem systemIdStartString="https://www.w3.org/Math/DTD/mathml3/"
                     catalog="cat-mathml3.xml"/>
+    <delegateSystem systemIdStartString="http://www.w3.org/Math/DTD/mathml3/"
+                    catalog="cat-mathml3.xml"/>
   </xsl:variable>
 
   <xsl:variable name="subset"
@@ -168,6 +182,8 @@
     <xsl:comment> At present, only the RDDL public identifiers begin with -//XML-DEV// </xsl:comment>
     <delegatePublic publicIdStartString="-//XML-DEV//"
                     catalog="cat-rddl.xml"/>
+    <delegateSystem systemIdStartString="https://www.rddl.org/"
+                    catalog="cat-rddl.xml"/>
     <delegateSystem systemIdStartString="http://www.rddl.org/"
                     catalog="cat-rddl.xml"/>
   </xsl:variable>