From 13e6acd7263305edc470b5eba931882bda9822c3 Mon Sep 17 00:00:00 2001 From: Norman Walsh Date: Thu, 3 Dec 2020 11:45:41 +0000 Subject: [PATCH 1/4] Build fixes, mostly related to pubdates --- specifications/build.xml | 4 +++ specifications/grammar-40/build.xml | 2 +- specifications/xpath-functions-40/build.xml | 2 +- .../xpath-functions-expanded.xml | 6 ++--- .../xpath-functions-40/html/.readme | 1 + .../xpath-functions-40/images/.readme | 1 + .../src/xpath-functions.xml | 11 ++++---- .../style/xpath-functions.xsl | 4 +-- specifications/xquery-40/src/xpath.xml | 11 ++++---- specifications/xquery-40/src/xquery.xml | 11 ++++---- specifications/xslt-40/build.xml | 8 +++--- specifications/xslt-40/style/xslt.xsl | 2 +- style/xmlspec-2016.xsl | 25 +++++++++++++------ 13 files changed, 54 insertions(+), 34 deletions(-) rename specifications/xpath-functions-40/{src => build}/xpath-functions-expanded.xml (99%) create mode 100644 specifications/xpath-functions-40/html/.readme create mode 100644 specifications/xpath-functions-40/images/.readme diff --git a/specifications/build.xml b/specifications/build.xml index 9cd26b6..cb39d82 100644 --- a/specifications/build.xml +++ b/specifications/build.xml @@ -139,6 +139,10 @@ + + + + diff --git a/specifications/grammar-40/build.xml b/specifications/grammar-40/build.xml index ba247ed..dc75820 100644 --- a/specifications/grammar-40/build.xml +++ b/specifications/grammar-40/build.xml @@ -20,7 +20,7 @@ This buildfile is used to ... + classpath="../../lib/xercesImpl.jar"> diff --git a/specifications/xpath-functions-40/build.xml b/specifications/xpath-functions-40/build.xml index 066f297..5a6c651 100644 --- a/specifications/xpath-functions-40/build.xml +++ b/specifications/xpath-functions-40/build.xml @@ -16,7 +16,7 @@ - + diff --git a/specifications/xpath-functions-40/src/xpath-functions-expanded.xml b/specifications/xpath-functions-40/build/xpath-functions-expanded.xml similarity index 99% rename from specifications/xpath-functions-40/src/xpath-functions-expanded.xml rename to specifications/xpath-functions-40/build/xpath-functions-expanded.xml index 1e330c6..9d72e3f 100644 --- a/specifications/xpath-functions-40/src/xpath-functions-expanded.xml +++ b/specifications/xpath-functions-40/build/xpath-functions-expanded.xml @@ -21,9 +21,9 @@ -
XPath and XQuery Functions and Operators 4.0REC-xpath-functions-40W3C Editor's Draft11November2020 - https://www.w3.org/TR/2020/REC-xpath-functions-40-20201111/ - Specification in XML format using HTML5 vocabularyXML function catalogHTML with change markings relative to version 3.0 +
XPath and XQuery Functions and Operators 4.0REC-xpath-functions-40W3C Editor's Draft01January2000 + https://www.w3.org/TR/2000/REC-xpath-functions-40-20000101/ + Specification in XML format using HTML5 vocabularyXML function catalogHTML with change markings relative to version 3.0 https://www.w3.org/TR/xpath-functions-40/ https://www.w3.org/TR/2017/PR-xpath-functions-31-20170117/ diff --git a/specifications/xpath-functions-40/html/.readme b/specifications/xpath-functions-40/html/.readme new file mode 100644 index 0000000..37c7026 --- /dev/null +++ b/specifications/xpath-functions-40/html/.readme @@ -0,0 +1 @@ +Make sure this directory exists diff --git a/specifications/xpath-functions-40/images/.readme b/specifications/xpath-functions-40/images/.readme new file mode 100644 index 0000000..37c7026 --- /dev/null +++ b/specifications/xpath-functions-40/images/.readme @@ -0,0 +1 @@ +Make sure this directory exists diff --git a/specifications/xpath-functions-40/src/xpath-functions.xml b/specifications/xpath-functions-40/src/xpath-functions.xml index 4e54cb2..042bf41 100644 --- a/specifications/xpath-functions-40/src/xpath-functions.xml +++ b/specifications/xpath-functions-40/src/xpath-functions.xml @@ -27,11 +27,12 @@ - - - - - + + + + + + diff --git a/specifications/xpath-functions-40/style/xpath-functions.xsl b/specifications/xpath-functions-40/style/xpath-functions.xsl index 9d6d2e5..2d8e3d3 100644 --- a/specifications/xpath-functions-40/style/xpath-functions.xsl +++ b/specifications/xpath-functions-40/style/xpath-functions.xsl @@ -175,7 +175,7 @@ table.data table.index { - + @@ -1218,4 +1218,4 @@ table.data table.index { - \ No newline at end of file + diff --git a/specifications/xquery-40/src/xpath.xml b/specifications/xquery-40/src/xpath.xml index 35b8e73..fe4d09c 100644 --- a/specifications/xquery-40/src/xpath.xml +++ b/specifications/xquery-40/src/xpath.xml @@ -29,11 +29,12 @@ - - - - - + + + + + + diff --git a/specifications/xquery-40/src/xquery.xml b/specifications/xquery-40/src/xquery.xml index 75b6e09..08ba0ea 100644 --- a/specifications/xquery-40/src/xquery.xml +++ b/specifications/xquery-40/src/xquery.xml @@ -29,11 +29,12 @@ - - - - - + + + + + + diff --git a/specifications/xslt-40/build.xml b/specifications/xslt-40/build.xml index 14a6d1b..8fd2d31 100644 --- a/specifications/xslt-40/build.xml +++ b/specifications/xslt-40/build.xml @@ -215,12 +215,12 @@ - - + + - + diff --git a/specifications/xslt-40/style/xslt.xsl b/specifications/xslt-40/style/xslt.xsl index 9178d36..8c76843 100644 --- a/specifications/xslt-40/style/xslt.xsl +++ b/specifications/xslt-40/style/xslt.xsl @@ -25,7 +25,7 @@ - + diff --git a/style/xmlspec-2016.xsl b/style/xmlspec-2016.xsl index 0d9b59f..6c45688 100644 --- a/style/xmlspec-2016.xsl +++ b/style/xmlspec-2016.xsl @@ -984,13 +984,7 @@ - - - - - - - +
@@ -1055,6 +1049,23 @@ + + + + + + + + + + + + + + + + + From d89e38f9ba5fc67a2cfa3f297d8a39acc4abb6b9 Mon Sep 17 00:00:00 2001 From: Norman Walsh Date: Thu, 3 Dec 2020 11:46:07 +0000 Subject: [PATCH 2/4] Build all the specs --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index f9fe92a..52804ad 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ repositories { mavenCentral() } -defaultTasks 'publish-xslt-40' +defaultTasks 'publish' ant.importBuild "specifications/build.xml" @@ -25,7 +25,7 @@ task publish() { // just a place to hang dependencies } -["xslt-40"].each { spec -> +["xslt-40", "xpath-functions-40", "xquery-40"].each { spec -> Task t = task "publish-${spec}"(type: Copy, dependsOn: [spec]) { into "build/www/${spec}" from "specifications/${spec}/html" From 75cfa5e8573430856225564467e6b8747177ff8a Mon Sep 17 00:00:00 2001 From: Norman Walsh Date: Thu, 3 Dec 2020 12:28:14 +0000 Subject: [PATCH 3/4] More robust generation of index.xml --- .circleci/publish-specs.sh | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/.circleci/publish-specs.sh b/.circleci/publish-specs.sh index e6ae794..fab0605 100755 --- a/.circleci/publish-specs.sh +++ b/.circleci/publish-specs.sh @@ -52,34 +52,38 @@ cd ../.. # available HTML files. (I plan to use this later to generate a pretty # index page.) BRANCHTEMP=/tmp/lspec.b.$$.txt -SPECTEMP=/tmp/lspec.b.$$.txt +SPECTEMP=/tmp/lspec.s.$$.txt rm -f $BRANCHTEMP $SPECTEMP # This is a crude hack. It assumes branch/$branch/$spec is all there is. -for overview in `find branch -type f -name Overview.html -print`; do - path=`dirname $overview` - path=`dirname $path` - echo `basename $path` >> $BRANCHTEMP +for path in `find branch -type d -print`; do + hfiles=`find $path -maxdepth 1 -name "*.html" -print -quit | wc -l` + if [ $hfiles != 0 ]; then + branch=`dirname $path` + echo `basename $branch` >> $BRANCHTEMP + fi done echo "" > index.xml for branch in `cat $BRANCHTEMP | sort | uniq`; do - for overview in `find branch/$branch -type f -name Overview.html -print`; do - path=`dirname $overview` - echo `basename $path` >> $SPECTEMP + for path in `find branch/$branch -type d -print`; do + hfiles=`find $path -maxdepth 1 -name "*.html" -print -quit | wc -l` + if [ $hfiles != 0 ]; then + echo `basename $path` >> $SPECTEMP + fi done - echo " " >> index.xml + echo " " >> index.xml for spec in `cat $SPECTEMP | sort | uniq`; do if [ -d "branch/$branch/$spec" ]; then - echo " " >> index.xml - for file in `ls -1 branch/$branch/$spec/*.html`; do + echo " " >> index.xml + for file in `ls -1 branch/$branch/$spec`; do echo " `basename $file`" >> index.xml done echo " " >> index.xml fi done echo " " >> index.xml -done +done echo "" >> index.xml # Push the changes back to the repo From 6b6b3ed1c6fde07b1642839dffb3466c6dd42f4f Mon Sep 17 00:00:00 2001 From: Norman Walsh Date: Thu, 3 Dec 2020 12:37:54 +0000 Subject: [PATCH 4/4] Install tidy --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 65d937e..9b079da 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,7 +18,7 @@ jobs: - run: sudo apt-get update - run: sudo apt-get dist-upgrade - - run: sudo apt-get install graphviz + - run: sudo apt-get install graphviz tidy - checkout