Merge pull request docbook#71 from ndw/master

Bug fixes
ndw · Sep 17, 2015 · c1b89c3 · c1b89c3
2 parents 5b6c88b + ed65e61
commit c1b89c3
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 38 deletions.
diff --git a/build.gradle b/build.gradle
@@ -143,9 +143,9 @@ task runtests(type: JavaExec) {
 task testreport(dependsOn: runtests, type: JavaExec) {
   classpath = configurations.runtime
 
-  inputs.file  fileTree(dir: testsRoot + "/style/").include("report.xpl")
-  inputs.file  fileTree(dir: testsRoot + "/result/")
-  outputs.file fileTree(dir: testsRoot).include("index.html")
+  inputs.file  file(testsRoot + "/style/report.xpl")
+  inputs.dir   testsRoot + "/result/"
+  outputs.file file(testsRoot + "/index.html")
 
   //systemProperty "log4j.configurationFile", "/home/ndw/java/log4j2-debug.xml"
 
@@ -335,8 +335,8 @@ task copyEtc(type: Copy) {
 }
 
 task copyResources(type: Copy) {
-  FileTree tree = fileTree(dir: 'resources',
-                           exclude: ['src/**'])
+  FileTree tree = fileTree(dir: 'resources', exclude: ['src/**',
+                                                       '**/*_flymake.css'])
   from tree
   into "build/dist/bin/resources/"
 }

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.0.14
+version=2.0.15
 snapshot=
 builtBy=Norman Walsh
 baseline=0

diff --git a/src/main/java/org/docbook/DocBook.java b/src/main/java/org/docbook/DocBook.java
@@ -196,24 +196,26 @@ public void run(String sourcefn) throws IOException, SaxonApiException {
         pipeline.run();
 
         XdmNode result = pipeline.readFrom("result").read();
-        Serialization serial = pipeline.getSerialization("result");
+        if (result != null) {
+            Serialization serial = pipeline.getSerialization("result");
 
-        if (serial == null) {
-            serial = new Serialization(runtime, pipeline.getNode()); // The node's a hack
-            serial.setMethod(new QName("", "xhtml"));
-        }
+            if (serial == null) {
+                serial = new Serialization(runtime, pipeline.getNode()); // The node's a hack
+                serial.setMethod(new QName("", "xhtml"));
+            }
 
-        WritableDocument wd = null;
-        if (options.containsKey(_output)) {
-            String filename = options.get(_output).getStringValue().asString();
-            FileOutputStream outfile = new FileOutputStream(filename);
-            wd = new WritableDocument(runtime, filename, serial, outfile);
-            logger.info("Writing output to " + filename);
-        } else {
-            wd = new WritableDocument(runtime, null, serial);
-        }
+            WritableDocument wd = null;
+            if (options.containsKey(_output)) {
+                String filename = options.get(_output).getStringValue().asString();
+                FileOutputStream outfile = new FileOutputStream(filename);
+                wd = new WritableDocument(runtime, filename, serial, outfile);
+                logger.info("Writing output to " + filename);
+            } else {
+                wd = new WritableDocument(runtime, null, serial);
+            }
 
-        wd.write(result);
+            wd.write(result);
+        }
     }
 
     public String version() {

diff --git a/xslt/base/html/xref.xsl b/xslt/base/html/xref.xsl
@@ -79,27 +79,40 @@ identified.</entry>
 	    <xsl:apply-templates/>
 	  </a>
 	</xsl:when>
-        <xsl:when test="not(f:findid(@linkend,.))">
+        <xsl:when test="@linkend">
+          <xsl:choose>
+            <xsl:when test="not(f:findid(@linkend,.))">
+              <xsl:message>
+                <xsl:text>Attempt to link to undefined ID: </xsl:text>
+                <xsl:value-of select="@linkend"/>
+              </xsl:message>
+              <span class="markup-error">
+                <xsl:sequence select="f:html-attributes(., @xml:id, ())"/>
+                <xsl:text>@@LINKEND: </xsl:text>
+                <xsl:value-of select="@linkend"/>
+                <xsl:text>@@</xsl:text>
+              </span>
+            </xsl:when>
+	    <xsl:otherwise>
+	      <a href="{f:href(., f:findid(@linkend,.))}">
+                <xsl:sequence select="f:html-attributes(.)"/>
+	        <xsl:if test="$title != ''">
+	          <xsl:attribute name="title" select="$title"/>
+	        </xsl:if>
+	        <xsl:apply-templates/>
+	      </a>
+	    </xsl:otherwise>
+          </xsl:choose>
+        </xsl:when>
+        <xsl:otherwise>
           <xsl:message>
-            <xsl:text>Attempt to link to undefined ID: </xsl:text>
-            <xsl:value-of select="@linkend"/>
+            <xsl:text>Link element with no target?</xsl:text>
           </xsl:message>
           <span class="markup-error">
             <xsl:sequence select="f:html-attributes(., @xml:id, ())"/>
-            <xsl:text>@@LINKEND: </xsl:text>
-            <xsl:value-of select="@linkend"/>
-            <xsl:text>@@</xsl:text>
+            <xsl:text>@@NO TARGET@@</xsl:text>
           </span>
-        </xsl:when>
-	<xsl:otherwise>
-	  <a href="{f:href(., f:findid(@linkend,.))}">
-            <xsl:sequence select="f:html-attributes(.)"/>
-	    <xsl:if test="$title != ''">
-	      <xsl:attribute name="title" select="$title"/>
-	    </xsl:if>
-	    <xsl:apply-templates/>
-	  </a>
-	</xsl:otherwise>
+        </xsl:otherwise>
       </xsl:choose>
     </xsl:when>
     <xsl:otherwise>

diff --git a/xslt/params/resource.root.xml b/xslt/params/resource.root.xml
@@ -15,7 +15,7 @@
 <refsynopsisdiv>
 <src:fragment xml:id='resource.root.frag'>
 <xsl:param name="resource.root"
-	   select="concat('http://docbook.github.com/release/',$VERSION,'/')"/>
+	   select="concat('https://docbook.github.io/release/',$VERSION,'/resources/')"/>
 </src:fragment>
 </refsynopsisdiv>