Merge branch 'release/1.1.0'

Release: com.io7m.xstructural 1.1.0 Change: Use "Front Matter" in XHTML documents (Ticket: #12) Change: Update primogenitor support 6.0.0 -> 6.1.0 Change: Update org.osgi:org.osgi.annotation.bundle 1.0.0 -> 1.1.0 Change: Update org.osgi:org.osgi.annotation.versioning 1.1.0 -> 1.1.1 Change: Update Saxon-HE 10.2 -> 10.3
io7m-com · Dec 19, 2020 · a6b4f27 · a6b4f27
2 parents a99dee3 + 5ccd8ba
commit a6b4f27
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 17 deletions.
diff --git a/README-CHANGES.xml b/README-CHANGES.xml
@@ -1,9 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <c:changelog project="com.io7m.xstructural" xmlns:c="urn:com.io7m.changelog:4.0">
   <c:releases>
-    <c:release date="2020-12-11T13:54:54+00:00" ticket-system="com.github.io7m.xstructural" version="1.0.0">
+    <c:release date="2020-12-11T00:00:00+00:00" is-open="false" ticket-system="com.github.io7m.xstructural" version="1.0.0">
       <c:changes>
-        <c:change date="2020-12-11T13:54:54+00:00" summary="Initial public release"/>
+        <c:change date="2020-12-11T00:00:00+00:00" summary="Initial public release"/>
+      </c:changes>
+    </c:release>
+    <c:release date="2020-12-19T17:53:05+00:00" is-open="false" ticket-system="com.github.io7m.xstructural" version="1.1.0">
+      <c:changes>
+        <c:change date="2020-12-19T00:00:00+00:00" summary="Use &quot;Front Matter&quot; in XHTML documents">
+          <c:tickets>
+            <c:ticket id="12"/>
+          </c:tickets>
+        </c:change>
+        <c:change date="2020-12-19T00:00:00+00:00" summary="Update primogenitor support 6.0.0 -&gt; 6.1.0"/>
+        <c:change date="2020-12-19T00:00:00+00:00" summary="Update org.osgi:org.osgi.annotation.bundle 1.0.0 -&gt; 1.1.0"/>
+        <c:change date="2020-12-19T00:00:00+00:00" summary="Update org.osgi:org.osgi.annotation.versioning 1.1.0 -&gt; 1.1.1"/>
+        <c:change date="2020-12-19T00:00:00+00:00" summary="Update Saxon-HE 10.2 -&gt; 10.3"/>
       </c:changes>
     </c:release>
   </c:releases>

diff --git a/com.io7m.xstructural.api/pom.xml b/com.io7m.xstructural.api/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.xstructural</artifactId>
     <groupId>com.io7m.xstructural</groupId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
   </parent>
 
   <artifactId>com.io7m.xstructural.api</artifactId>

diff --git a/com.io7m.xstructural.cmdline/pom.xml b/com.io7m.xstructural.cmdline/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.xstructural</artifactId>
     <groupId>com.io7m.xstructural</groupId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
   </parent>
 
   <artifactId>com.io7m.xstructural.cmdline</artifactId>

diff --git a/com.io7m.xstructural.documentation/pom.xml b/com.io7m.xstructural.documentation/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.xstructural</artifactId>
     <groupId>com.io7m.xstructural</groupId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
   </parent>
 
   <artifactId>com.io7m.xstructural.documentation</artifactId>

diff --git a/...xstructural.documentation/src/main/resources/com/io7m/xstructural/documentation/brand.xml b/...xstructural.documentation/src/main/resources/com/io7m/xstructural/documentation/brand.xml
@@ -20,4 +20,5 @@
   <a href="https://www.io7m.com/">io7m</a>
   | <a href="index.xhtml">single-page</a>
   | <a href="index-m.xhtml">multi-page</a>
+  | xstructural ${project.version}
 </div>
diff --git a/com.io7m.xstructural.tests/pom.xml b/com.io7m.xstructural.tests/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <artifactId>com.io7m.xstructural</artifactId>
     <groupId>com.io7m.xstructural</groupId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
   </parent>
 
   <artifactId>com.io7m.xstructural.tests</artifactId>

diff --git a/com.io7m.xstructural.vanilla/pom.xml b/com.io7m.xstructural.vanilla/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <artifactId>com.io7m.xstructural</artifactId>
     <groupId>com.io7m.xstructural</groupId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
   </parent>
 
   <artifactId>com.io7m.xstructural.vanilla</artifactId>

diff --git a/com.io7m.xstructural.xml/pom.xml b/com.io7m.xstructural.xml/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.io7m.xstructural</groupId>
     <artifactId>com.io7m.xstructural</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
   </parent>
 
   <artifactId>com.io7m.xstructural.xml</artifactId>

diff --git a/com.io7m.xstructural.xml/src/main/xsl/com/io7m/xstructural/xml/xstructural1-core.xsl b/com.io7m.xstructural.xml/src/main/xsl/com/io7m/xstructural/xml/xstructural1-core.xsl
@@ -117,6 +117,9 @@
     </xsl:variable>
 
     <xsl:choose>
+      <xsl:when test="local-name($node) = 'Document'">
+        <xsl:value-of select="'Front Matter'"/>
+      </xsl:when>
       <xsl:when test="$node/attribute::title">
         <xsl:value-of select="concat($number,': ',$node/attribute::title)"/>
       </xsl:when>
@@ -160,6 +163,9 @@
     </xsl:variable>
 
     <xsl:choose>
+      <xsl:when test="$type = 'Document'">
+        <xsl:value-of select="'Front Matter'"/>
+      </xsl:when>
       <xsl:when test="$node/attribute::title">
         <xsl:value-of select="concat($type,' ',$number,': ',$node/attribute::title)"/>
       </xsl:when>

diff --git a/com.io7m.xstructural.xml/src/main/xsl/com/io7m/xstructural/xml/xstructural1-multi.xsl b/com.io7m.xstructural.xml/src/main/xsl/com/io7m/xstructural/xml/xstructural1-multi.xsl
@@ -121,7 +121,7 @@
                       as="xs:string">
           <xsl:choose>
             <xsl:when test="local-name($sectionUp) = 'Document'">
-              <xsl:value-of select="$sectionUp/s:Metadata/dc:title"/>
+              <xsl:value-of select="'Front Matter'"/>
             </xsl:when>
             <xsl:otherwise>
               <xsl:variable name="sectionUpNumber">
@@ -157,7 +157,7 @@
                       as="xs:string">
           <xsl:choose>
             <xsl:when test="local-name($sectionPrev) = 'Document'">
-              <xsl:value-of select="$documentTitle"/>
+              <xsl:value-of select="'Front Matter'"/>
             </xsl:when>
             <xsl:when test="count($sectionsPreceding) > 0">
               <xsl:variable name="sectionPrevNumber"
@@ -197,7 +197,7 @@
                       as="xs:string">
           <xsl:choose>
             <xsl:when test="local-name($sectionNext) = 'Document'">
-              <xsl:value-of select="$documentTitle"/>
+              <xsl:value-of select="'Front Matter'"/>
             </xsl:when>
             <xsl:otherwise>
               <xsl:variable name="sectionNextNumber"

diff --git a/pom.xml b/pom.xml
@@ -6,12 +6,12 @@
   <parent>
     <groupId>com.io7m.primogenitor</groupId>
     <artifactId>com.io7m.primogenitor.full</artifactId>
-    <version>6.0.0</version>
+    <version>6.1.0</version>
   </parent>
 
   <groupId>com.io7m.xstructural</groupId>
   <artifactId>com.io7m.xstructural</artifactId>
-  <version>1.0.0</version>
+  <version>1.1.0</version>
   <packaging>pom</packaging>
 
   <description>Structural document format</description>
@@ -83,12 +83,12 @@
       <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>org.osgi.annotation.bundle</artifactId>
-        <version>1.0.0</version>
+        <version>1.1.0</version>
       </dependency>
       <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>org.osgi.annotation.versioning</artifactId>
-        <version>1.1.0</version>
+        <version>1.1.1</version>
       </dependency>
       <dependency>
         <groupId>org.osgi</groupId>
@@ -108,7 +108,7 @@
       <dependency>
         <groupId>net.sf.saxon</groupId>
         <artifactId>Saxon-HE</artifactId>
-        <version>10.2</version>
+        <version>10.3</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
@@ -143,7 +143,7 @@
       <dependency>
         <groupId>com.io7m.primogenitor</groupId>
         <artifactId>com.io7m.primogenitor.support</artifactId>
-        <version>6.0.0</version>
+        <version>6.1.0</version>
       </dependency>
       <dependency>
         <groupId>com.github.marschall</groupId>