Merge branch 'ndw-master'

.gitignore

@@ -1,26 +1,26 @@
 /build/
 /.gradle
-/langspec/xproc11-steps/examples/exec-as1.txt
-/langspec/xproc11-steps/examples/exec-as2.txt
-/langspec/xproc11-steps/examples/xquery.txt
-/langspec/xproc11/examples/choose.txt
-/langspec/xproc11/examples/exclude-pfx.txt
-/langspec/xproc11/examples/file.txt
-/langspec/xproc11/examples/filebin.txt
-/langspec/xproc11/examples/for-each.txt
-/langspec/xproc11/examples/group.txt
-/langspec/xproc11/examples/identity.txt
-/langspec/xproc11/examples/input-doc.txt
-/langspec/xproc11/examples/input-port.txt
-/langspec/xproc11/examples/input-select.txt
-/langspec/xproc11/examples/pipeline-library.txt
-/langspec/xproc11/examples/pipeline.txt
-/langspec/xproc11/examples/simple-default.txt
-/langspec/xproc11/examples/simple-explicit.txt
-/langspec/xproc11/examples/trycatch.txt
-/langspec/xproc11/examples/value-available.txt
-/langspec/xproc11/examples/viewport.txt
-/langspec/xproc11/examples/xinclude.txt
-/langspec/xproc11/examples/xpathcontext.txt
-/langspec/xproc11/examples/xslt-empty.txt
-/langspec/xproc11/examples/xslt.txt
+/langspec/xproc30-steps/examples/exec-as1.txt
+/langspec/xproc30-steps/examples/exec-as2.txt
+/langspec/xproc30-steps/examples/xquery.txt
+/langspec/xproc30/examples/choose.txt
+/langspec/xproc30/examples/exclude-pfx.txt
+/langspec/xproc30/examples/file.txt
+/langspec/xproc30/examples/filebin.txt
+/langspec/xproc30/examples/for-each.txt
+/langspec/xproc30/examples/group.txt
+/langspec/xproc30/examples/identity.txt
+/langspec/xproc30/examples/input-doc.txt
+/langspec/xproc30/examples/input-port.txt
+/langspec/xproc30/examples/input-select.txt
+/langspec/xproc30/examples/pipeline-library.txt
+/langspec/xproc30/examples/pipeline.txt
+/langspec/xproc30/examples/simple-default.txt
+/langspec/xproc30/examples/simple-explicit.txt
+/langspec/xproc30/examples/trycatch.txt
+/langspec/xproc30/examples/value-available.txt
+/langspec/xproc30/examples/viewport.txt
+/langspec/xproc30/examples/xinclude.txt
+/langspec/xproc30/examples/xpathcontext.txt
+/langspec/xproc30/examples/xslt-empty.txt
+/langspec/xproc30/examples/xslt.txt

bin/travis-publish-spec.sh

@@ -6,8 +6,8 @@ if [ "$TRAVIS_REPO_SLUG" == "$GIT_PUB_REPO" ]; then
     echo -e "Setting up for publication...\n"
 
     mkdir $HOME/pubroot
-    cp -R build/xproc11 $HOME/pubroot/xproc11
-    cp -R build/steps11 $HOME/pubroot/steps11
+    cp -R build/xproc30 $HOME/pubroot/xproc30
+    cp -R build/steps30 $HOME/pubroot/steps30
 
     cd $HOME
     git config --global user.email ${GIT_EMAIL}
@@ -20,12 +20,12 @@ if [ "$TRAVIS_REPO_SLUG" == "$GIT_PUB_REPO" ]; then
         TIP=${TRAVIS_TAG:="head"}
 
         cd gh-pages
-        git rm -rf ./${TRAVIS_BRANCH}/${TIP}/xproc11
-        git rm -rf ./${TRAVIS_BRANCH}/${TIP}/steps11
-        mkdir -p ./${TRAVIS_BRANCH}/${TIP}/xproc11
-        mkdir -p ./${TRAVIS_BRANCH}/${TIP}/steps11
-        cp -Rf $HOME/pubroot/xproc11/* ./${TRAVIS_BRANCH}/${TIP}/xproc11
-        cp -Rf $HOME/pubroot/steps11/* ./${TRAVIS_BRANCH}/${TIP}/steps11
+        git rm -rf ./${TRAVIS_BRANCH}/${TIP}/xproc30
+        git rm -rf ./${TRAVIS_BRANCH}/${TIP}/steps30
+        mkdir -p ./${TRAVIS_BRANCH}/${TIP}/xproc30
+        mkdir -p ./${TRAVIS_BRANCH}/${TIP}/steps30
+        cp -Rf $HOME/pubroot/xproc30/* ./${TRAVIS_BRANCH}/${TIP}/xproc30
+        cp -Rf $HOME/pubroot/steps30/* ./${TRAVIS_BRANCH}/${TIP}/steps30
 
         if [ "$GITHUB_CNAME" != "" ]; then
             echo $GITHUB_CNAME > CNAME

build.gradle

@@ -49,80 +49,80 @@ task setupDocBook(dependsOn: downloadDocBook, type: Copy) {
 }
 setupDocBook.onlyIf { !file("$buildDir/docbook").exists() }
 
-task publish(dependsOn: ["publish_xproc11", "publish_steps11"]) {
+task publish(dependsOn: ["publish_xproc30", "publish_steps30"]) {
   // nothing to see here
 }
 
-task publish_xproc11(dependsOn: ["xproc11",
-                                 "publish_xproc11_xml",
-                                 "publish_xproc11_graphics",
-                                 "publish_xproc11_css"], type: Copy) {
+task publish_xproc30(dependsOn: ["xproc30",
+                                 "publish_xproc30_xml",
+                                 "publish_xproc30_graphics",
+                                 "publish_xproc30_css"], type: Copy) {
   from('build') {
-    include "xproc11.html"
-    rename "xproc11.html", "index.html"
+    include "xproc30.html"
+    rename "xproc30.html", "index.html"
   }
-  into "build/xproc11"
+  into "build/xproc30"
 }
 
-task publish_xproc11_xml(dependsOn: ['xproc11'], type: Copy) {
+task publish_xproc30_xml(dependsOn: ['xproc30'], type: Copy) {
   from('build') {
-    include ",xproc11.xml"
-    rename ",xproc11.xml", "xproc11.xml"
+    include ",xproc30.xml"
+    rename ",xproc30.xml", "xproc30.xml"
   }
-  into "build/xproc11"
+  into "build/xproc30"
 }
-task publish_xproc11_xml.doFirst {
-  mkdir 'build/xproc11'
+task publish_xproc30_xml.doFirst {
+  mkdir 'build/xproc30'
 }
 
-task publish_xproc11_css(dependsOn: ["copyCSS"], type: Copy) {
+task publish_xproc30_css(dependsOn: ["copyCSS"], type: Copy) {
   from('build') {
     include "*.css"
   }
-  into "build/xproc11"
+  into "build/xproc30"
 }
-task publish_xproc11_css.doFirst {
-  mkdir 'build/xproc11'
+task publish_xproc30_css.doFirst {
+  mkdir 'build/xproc30'
 }
 
-task publish_xproc11_graphics(dependsOn: ["copyImages"], type: Copy) {
+task publish_xproc30_graphics(dependsOn: ["copyImages"], type: Copy) {
   from 'build/graphics'
-  into "build/xproc11/graphics"
+  into "build/xproc30/graphics"
 }
-task publish_xproc11_graphics.doFirst {
-  mkdir 'build/xproc11'
-  mkdir 'build/xproc11/graphics'
+task publish_xproc30_graphics.doFirst {
+  mkdir 'build/xproc30'
+  mkdir 'build/xproc30/graphics'
 }
 
-task publish_steps11(dependsOn: ["steps11",
-                                 "publish_steps11_xml",
-                                 "publish_steps11_css"], type: Copy) {
+task publish_steps30(dependsOn: ["steps30",
+                                 "publish_steps30_xml",
+                                 "publish_steps30_css"], type: Copy) {
   from('build') {
-    include "steps11.html"
-    rename "steps11.html", "index.html"
+    include "steps30.html"
+    rename "steps30.html", "index.html"
   }
-  into "build/steps11"
+  into "build/steps30"
 }
 
-task publish_steps11_xml(dependsOn: ['steps11'], type: Copy) {
+task publish_steps30_xml(dependsOn: ['steps30'], type: Copy) {
   from('build') {
-    include ",steps11.xml"
-    rename ",steps11.xml", "steps11.xml"
+    include ",steps30.xml"
+    rename ",steps30.xml", "steps30.xml"
   }
-  into "build/steps11"
+  into "build/steps30"
 }
-task publish_steps11_xml.doFirst {
-  mkdir 'build/steps11'
+task publish_steps30_xml.doFirst {
+  mkdir 'build/steps30'
 }
 
-task publish_steps11_css(dependsOn: ["copyCSS"], type: Copy) {
+task publish_steps30_css(dependsOn: ["copyCSS"], type: Copy) {
   from('build') {
     include "*.css"
   }
-  into "build/steps11"
+  into "build/steps30"
 }
-task publish_steps11_css.doFirst {
-  mkdir 'build/steps11'
+task publish_steps30_css.doFirst {
+  mkdir 'build/steps30'
 }
 
 task copyCSS(type: Copy) {
@@ -131,7 +131,7 @@ task copyCSS(type: Copy) {
 }
 
 task copyImages(type: Copy) {
-  from 'langspec/xproc11/graphics'
+  from 'langspec/xproc30/graphics'
   into 'build/graphics'
 }
 task copyImages.doFirst {
@@ -147,108 +147,108 @@ task legacy_make(type: Exec) {
   commandLine "make"
 }
 
-task xproc11(dependsOn: ["xproc11_xi2", "steps11_xi1", "copy_assets"], type: XMLCalabashTask) {
-  inputs.file "build/,xproc11.xml"
-  inputs.file "langspec/xproc11/error-list.xml"
+task xproc30(dependsOn: ["xproc30_xi2", "steps30_xi1", "copy_assets"], type: XMLCalabashTask) {
+  inputs.file "build/,xproc30.xml"
+  inputs.file "langspec/xproc30/error-list.xml"
   inputs.file "style/docbook.xsl"
   inputs.file "style/dbspec.xsl"
   inputs.file "style/xprocns.xsl"
   inputs.file "style/rngsyntax.xsl"
-  outputs.file "build/xproc11.html"
-  input("source", "build/,xproc11.xml")
-  output("result", "build/xproc11.html")
+  outputs.file "build/xproc30.html"
+  input("source", "build/,xproc30.xml")
+  output("result", "build/xproc30.html")
 
   param("schemaext.schema", "../../../../../schema/dbspec.rng")
-  param("xml.toc.filename", "xproc11.toc.xml")
-  param("otherspec", "../build/,steps11.xml")
-  param("otherhref", "../steps11/")
+  param("xml.toc.filename", "xproc30.toc.xml")
+  param("otherspec", "../build/,steps30.xml")
+  param("otherhref", "../steps30/")
   param("otherlabel", "XPS")
-  param("spec", "xproc11")
+  param("spec", "xproc30")
   option("style", "xproc-specs.xsl")
   pipeline "style/formatspec.xpl"
 }
 
-task xproc11_xi1(dependsOn: ["setupDocBook"], type: XMLCalabashTask) {
-  inputs.file "langspec/xproc11/xproc.xml"
-  inputs.file "langspec/xproc11/conformance.xml"
-  inputs.file "langspec/xproc11/error-codes.xml"
-  inputs.file "langspec/xproc11/language-summary.xml"
-  inputs.file "langspec/xproc11/mediatype.xml"
-  inputs.file "langspec/xproc11/namespace-fixup.xml"
-  inputs.file "langspec/xproc11/parallel.xml"
-  inputs.file "langspec/xproc11/references.xml"
-  outputs.file "build/,,xproc11.xml"
-  input("source", "langspec/xproc11/xproc.xml")
-  output("result", "build/,,xproc11.xml")
+task xproc30_xi1(dependsOn: ["setupDocBook"], type: XMLCalabashTask) {
+  inputs.file "langspec/xproc30/xproc.xml"
+  inputs.file "langspec/xproc30/conformance.xml"
+  inputs.file "langspec/xproc30/error-codes.xml"
+  inputs.file "langspec/xproc30/language-summary.xml"
+  inputs.file "langspec/xproc30/mediatype.xml"
+  inputs.file "langspec/xproc30/namespace-fixup.xml"
+  inputs.file "langspec/xproc30/parallel.xml"
+  inputs.file "langspec/xproc30/references.xml"
+  outputs.file "build/,,xproc30.xml"
+  input("source", "langspec/xproc30/xproc.xml")
+  output("result", "build/,,xproc30.xml")
   option("schema", "schema/dbspec.rng")
   option("schematron", "schema/docbook.sch")
   pipeline "style/validate.xpl"
 }
 
-task xproc11_xi2(dependsOn: ["glossary"], type: XMLCalabashTask) {
-  inputs.file "langspec/xproc11/xproc.xml"
-  inputs.file "langspec/xproc11/conformance.xml"
-  inputs.file "langspec/xproc11/error-codes.xml"
-  inputs.file "langspec/xproc11/glossary.xml"
-  inputs.file "langspec/xproc11/language-summary.xml"
-  inputs.file "langspec/xproc11/mediatype.xml"
-  inputs.file "langspec/xproc11/namespace-fixup.xml"
-  inputs.file "langspec/xproc11/parallel.xml"
-  inputs.file "langspec/xproc11/references.xml"
-  outputs.file "build/,xproc11.xml"
-  input("source", "langspec/xproc11/xproc.xml")
-  output("result", "build/,xproc11.xml")
+task xproc30_xi2(dependsOn: ["glossary"], type: XMLCalabashTask) {
+  inputs.file "langspec/xproc30/xproc.xml"
+  inputs.file "langspec/xproc30/conformance.xml"
+  inputs.file "langspec/xproc30/error-codes.xml"
+  inputs.file "langspec/xproc30/glossary.xml"
+  inputs.file "langspec/xproc30/language-summary.xml"
+  inputs.file "langspec/xproc30/mediatype.xml"
+  inputs.file "langspec/xproc30/namespace-fixup.xml"
+  inputs.file "langspec/xproc30/parallel.xml"
+  inputs.file "langspec/xproc30/references.xml"
+  outputs.file "build/,xproc30.xml"
+  input("source", "langspec/xproc30/xproc.xml")
+  output("result", "build/,xproc30.xml")
   param("schema", "../../schema/dbspec.rng")
   param("schematron", "../../schema/docbook.sch")
   pipeline "style/validate.xpl"
 }
 
-task glossary(dependsOn: ["xproc11_xi1", "legacy_make"], type: XMLCalabashTask) {
-  inputs.file "build/,,xproc11.xml"
+task glossary(dependsOn: ["xproc30_xi1", "legacy_make"], type: XMLCalabashTask) {
+  inputs.file "build/,,xproc30.xml"
   inputs.file "style/makeglossary.xpl"
   inputs.file "style/makeglossary.xsl"
-  outputs.file "langspec/xproc11/glossary.xml"
-  input("source", "build/,,xproc11.xml")
-  output("result", "langspec/xproc11/glossary.xml")
+  outputs.file "langspec/xproc30/glossary.xml"
+  input("source", "build/,,xproc30.xml")
+  output("result", "langspec/xproc30/glossary.xml")
   pipeline "style/makeglossary.xpl"
 }
 
-task steps11(dependsOn: ["steps11_xi1", "xproc11_xi2", "copy_assets"], type: XMLCalabashTask) {
-  inputs.file "build/,steps11.xml"
+task steps30(dependsOn: ["steps30_xi1", "xproc30_xi2", "copy_assets"], type: XMLCalabashTask) {
+  inputs.file "build/,steps30.xml"
   inputs.file "style/docbook.xsl"
   inputs.file "style/dbspec.xsl"
   inputs.file "style/xprocns.xsl"
   inputs.file "style/rngsyntax.xsl"
-  outputs.file "build/steps11.html"
-  input("source", "build/,steps11.xml")
-  output("result", "build/steps11.html")
+  outputs.file "build/steps30.html"
+  input("source", "build/,steps30.xml")
+  output("result", "build/steps30.html")
 
   param("schemaext.schema", "../../../../../schema/dbspec.rng")
   param("xml.toc.filename", "steps.toc.xml")
-  param("otherspec", "../build/,xproc11.xml")
-  param("otherhref", "../xproc11/")
+  param("otherspec", "../build/,xproc30.xml")
+  param("otherhref", "../xproc30/")
   param("otherlabel", "XP")
-  param("spec", "steps11")
+  param("spec", "steps30")
   option("style", "xproc-specs.xsl")
   pipeline "style/formatspec.xpl"
 }
 
-task steps11_xi1(dependsOn: ["setupDocBook", "legacy_make"], type: XMLCalabashTask) {
-  inputs.file "langspec/xproc11-steps/steps.xml"
-  inputs.file "langspec/xproc11-steps/errors.xml"
-  inputs.file "langspec/xproc11-steps/error-codes.xml"
-  inputs.file "langspec/xproc11-steps/serialization-options-for-escape-markup.xml"
-  inputs.file "langspec/xproc11-steps/serialization-options.xml"
-  outputs.file "build/,steps11.xml"
-  input("source", "langspec/xproc11-steps/steps.xml")
-  output("result", "build/,steps11.xml")
+task steps30_xi1(dependsOn: ["setupDocBook", "legacy_make"], type: XMLCalabashTask) {
+  inputs.file "langspec/xproc30-steps/steps.xml"
+  inputs.file "langspec/xproc30-steps/errors.xml"
+  inputs.file "langspec/xproc30-steps/error-codes.xml"
+  inputs.file "langspec/xproc30-steps/serialization-options-for-escape-markup.xml"
+  inputs.file "langspec/xproc30-steps/serialization-options.xml"
+  outputs.file "build/,steps30.xml"
+  input("source", "langspec/xproc30-steps/steps.xml")
+  output("result", "build/,steps30.xml")
   param("schema", "")
   param("schematron", "")
   pipeline "style/validate.xpl"
 }
 
 /* The default task. It just depends on all the necessary pages */
-task specification(dependsOn: ["xproc11", "steps11"]) {
+task specification(dependsOn: ["xproc30", "steps30"]) {
   /* Nothing to see here */
 }
 

langspec/Makefile

@@ -1,11 +1,11 @@
 all:
-	$(MAKE) -C xproc11-steps typed-pipeline-library.xml
-	$(MAKE) -C xproc11
-	$(MAKE) -C xproc11-steps
+	$(MAKE) -C xproc30-steps typed-pipeline-library.xml
+	$(MAKE) -C xproc30
+	$(MAKE) -C xproc30-steps
 
 clean:
-	$(MAKE) -C xproc11 clean
-	$(MAKE) -C xproc11-steps clean
+	$(MAKE) -C xproc30 clean
+	$(MAKE) -C xproc30-steps clean
 	$(MAKE) -C ns-c clean
 	$(MAKE) -C ns-err clean
 	$(MAKE) -C ns-p clean