Merge pull request #62 from ndw/master

Lots of fixes, release version 2.0.11

.gitignore

@@ -11,3 +11,10 @@
 /build/
 /src/main/resources/xslt/
 /src/main/resources/etc/version.properties
+/src/main/resources/etc/uris.xml
+/test/index.html
+/test/result/
+/test/diff/
+/test/actual/
+/test/cssprint-actual/
+/test/foprint-actual/

build.gradle

@@ -12,16 +12,13 @@ buildscript {
   repositories {
     mavenLocal()
     mavenCentral()
+    maven {
+      url 'file://' + new File(System.getProperty('user.home'), '.m2/repository').absolutePath
+    }
     maven { url "http://maven.restlet.org" }
     maven { url "http://developer.marklogic.com/maven2" }
     maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
   }
-
-  dependencies {
-    classpath group: 'net.sf.saxon', name: 'Saxon-HE', version: saxonVersion
-    classpath group: 'com.xmlcalabash', name: 'xmlcalabash', version: '1.1.6-96'
-    classpath group: 'com.thaiopensource', name: 'jing', version: '20091111', transitive: false
-  }
 }
 
 plugins {
@@ -52,9 +49,9 @@ dependencies {
   compile fileTree(dir: 'delta').include("*.jar")
   compile (
     [group: 'net.sf.saxon', name: 'Saxon-HE', version: saxonVersion],
-    [group: 'com.xmlcalabash', name: 'xmlcalabash', version: '1.1.6-96'],
+    [group: 'com.xmlcalabash', name: 'xmlcalabash', version: '1.1.7-96'],
     [group: 'com.xmlcalabash', name: 'xmlcalabash1-deltaxml', version: '1.1.4'],
-    [group: 'com.xmlcalabash', name: 'xmlcalabash1-print', version: '1.1.2'],
+    [group: 'com.xmlcalabash', name: 'xmlcalabash1-print', version: '1.1.4'],
     [group: 'com.thaiopensource', name: 'jing', version: '20091111', transitive: false],
     [group: 'org.docbook', name: 'docbook-xsl-java-saxon', version: '1.2.1-95'],
     [group: 'commons-cli', name: 'commons-cli', version: '1.3.1']
@@ -93,26 +90,50 @@ task runtests(type: JavaExec) {
   maxHeapSize = '1024m'
   args('-D',
        testsRoot + '/style/runtests.xpl',
-       'ignore-head=1',
-       'ignore-prism=1',
+       'include=' + include,
+       'ignore-head=0',
+       'ignore-prism=0',
        'srcdir=' + testsRoot + '/src/',
        'resultdir=' + testsRoot + '/result/',
        'actualdir=' + testsRoot + '/actual/',
        'expecteddir=' + testsRoot + '/expected/',
        'diffdir=' + testsRoot + '/diff/',
       )
-  // 'include=equation\\.003\\.xml',
 }
 
 task testreport(dependsOn: runtests, type: JavaExec) {
   classpath = configurations.runtime
 
+  //systemProperty "log4j.configurationFile", "/home/ndw/java/log4j2-debug.xml"
+
   main = 'com.xmlcalabash.drivers.Main'
   maxHeapSize = '1024m'
   args('-D',
        '-oresult=' + testsRoot + '/index.html',
        testsRoot + '/style/report.xpl',
-       'resultdir=' + testsRoot + '/result/'
+       'resultdir=' + testsRoot + '/result/',
+       'baseline=' + baseline
+      )
+}
+
+task runprinttests(type: JavaExec) {
+  classpath = configurations.runtime
+
+  //systemProperty "log4j.configurationFile", "/home/ndw/java/log4j2-debug.xml"
+
+  main = 'com.xmlcalabash.drivers.Main'
+  maxHeapSize = '1024m'
+  args('-D',
+       testsRoot + '/style/runprint.xpl',
+       'include=' + include,
+       'srcdir=' + testsRoot + '/src/',
+       'resultdir=' + testsRoot + '/' + print + '-result/',
+       'actualdir=' + testsRoot + '/' + print + '-actual/',
+       'expecteddir=' + testsRoot + '/' + print + '-expected/',
+       'diffdir=' + testsRoot + '/' + print + '-diff/',
+       'format=' + print,
+       'preprocess=test/style/ann-to-footnotes.xsl',
+       'css=' + css
       )
 }
 
@@ -146,6 +167,21 @@ task gentext(type: JavaExec) {
   args('-D', '-Xallow-text-results', 'gentext/style/build.xpl')
 }
 
+gentext.onlyIf {
+  Boolean upToDate = true
+  FileCollection src = fileTree(dir: 'gentext/src').include("*.xml")
+
+  src.each {
+    File file ->
+      String srcName = file.path
+      String buildName = srcName.replace('/src/', '/build/')
+      File build = new File(buildName)
+      upToDate = upToDate && (file.lastModified() < build.lastModified())
+  }
+
+  return !upToDate
+}
+
 task makeFoParams(type: JavaExec) {
   classpath = configurations.runtime
 
@@ -175,7 +211,18 @@ task copyLocales(dependsOn: gentext, type: Copy) {
   includeEmptyDirs = false
 }
 
-task copyJarResources(dependsOn: [copyLocales, makeParams], type: Copy) {
+task makeUris(type: JavaExec) {
+  classpath = configurations.runtime
+
+  main = 'com.xmlcalabash.drivers.Main'
+  maxHeapSize = '1024m'
+  args('-D',
+       '-oresult=src/main/resources/etc/uris.xml',
+       'tools/makecat.xpl')
+}
+
+task copyJarResources(dependsOn: [copyLocales, makeParams, makeUris],
+                      type: Copy) {
   FileTree tree = fileTree(dir: 'xslt',
                            exclude: ['params/**'])
   from tree

gradle.properties

@@ -1,6 +1,10 @@
-version=2.0.9
+version=2.0.11
 snapshot=
 builtBy=Norman Walsh
+baseline=0
+print=cssprint
+css=resources/css/paged-bw.css
+include=.*.xml
 
 saxonVersion=9.6.0-4