Release 7.46.0 of the TEI Stylesheets.

.travis.yml

@@ -0,0 +1,12 @@
+sudo: required
+
+language: java
+
+services:
+  - docker
+
+before_install:
+  - docker pull teic/jenkins:dev
+
+script:
+  - docker run --rm --name jenkins -w /var/odd -it -v `pwd`:/var/odd -u $UID --entrypoint "make" teic/jenkins:dev clean test deb dist

ChangeLog

@@ -1,3 +1,202 @@
+2018-09-26  Syd Bauman  <[email protected]>
+
+	More work on #250
+
+	Work on #250
+
+2018-09-25  Syd Bauman  <[email protected]>
+
+	Address #330: Ensure that no colons are in the generated ID used for <sch:pattern>s.
+
+2018-09-21  martindholmes  <[email protected]>
+
+	Fix to prevent deprecations in egXML from being harvested for the appendix.
+
+2018-09-13  martindholmes  <[email protected]>
+
+	Don't nest tds in tds.
+
+	Work on TEI ticket #1657: translatable headings for deprecation appendix table.
+
+2018-09-12  martindholmes  <[email protected]>
+
+	Merge branch 'dev' of github.com:TEIC/Stylesheets into dev
+
+	Stylesheet support for another column in the deprecation table with descriptive information.
+
+2018-09-11  Peter Stadler  <[email protected]>
+
+	add Travis build icon to Readme
+	and added more targets to the `make` command (to align it with the current Jenkins job)
+
+2018-09-11  martindholmes  <[email protected]>
+
+	Sort deprecations by expiry date.
+
+	Add namespace prefix, doh.
+
+	Attempting to make constraintSpec deprecations link to their ancestor spec file in the Deprecations appendix.
+
+2018-09-11  Peter Stadler  <[email protected]>
+
+	this should work now …
+	proper docker command for running the Stylesheets tests on Travis
+
+	add travis integration
+
+2018-09-11  martindholmes  <[email protected]>
+
+	Fix for ill-formed file committed in haste. Sorry folks.
+
+	Attempt to make deprecation idents into links.
+
+	Tweaks to prepare for easier linking.
+
+2018-09-10  martindholmes  <[email protected]>
+
+	Table structure should be fixed now (TEI ticket 1657 work).
+
+	Still hacking on TEI ticket #1657.
+
+	More work on TEI ticket #1657.
+
+	Fix for expected results.
+
+	Work on TEIC/TEI ticket #1657: need to add processing for deprecationcat value of divGen/@type.
+
+2018-09-08  martindholmes  <[email protected]>
+
+	Work on ticket #216: removing apparently orphaned file.
+
+	Try actually saving the file before committing.
+
+	Adding a README as requested by Council in Tokyo.
+
+	Two files removed per issue #216. If nothing breaks, I'll continue.
+
+	Commenting out bad CSS in epub output for issue #115, this time in epub rather than epub3.
+
+	Commenting out bad CSS in epub output for issue #115.
+
+	Space missing in listed authors.
+
+2018-09-07  Raffaele Viglianti  <[email protected]>
+
+	Merge pull request #292 from ebeshero/dev
+	possible solution for processing listRef/ref in odd2odd.xsl
+
+2018-09-07  ebeshero  <[email protected]>
+
+	merging with dev instead of master Merge remote-tracking branch 'upstream/dev' into dev
+
+	updating from main Stylesheets Merge remote-tracking branch 'upstream/master' into dev
+
+2018-09-07  Magdalena Turska  <[email protected]>
+
+	Merge branch 'dev' of https://github.com/TEIC/Stylesheets into dev
+
+	fix #308 cleaning up remaining hardcoded and superfluous references to Saxon EE
+
+2018-09-07  martindholmes  <[email protected]>
+
+	For issue #316, added tite to the list. If nothing breaks, ticket can be closed.
+
+2018-08-31  martindholmes  <[email protected]>
+
+	Fix for local paths in outputs and expected-results.
+
+2018-08-31  Hugh A. Cayless  <[email protected]>
+
+	Merge pull request #332 from TEIC/sortedDiffTests
+	Implementation of sorted diffing to make Test more robust against software version changes.
+
+2018-08-31  martindholmes  <[email protected]>
+
+	Updating FOP to 2.2, which involves changing filepaths.
+
+	Use https for all downloads from now on.
+
+2018-08-31  Hugh Cayless  <[email protected]>
+
+	Sorting archive manifest before diff.
+
+2018-08-29  martindholmes  <[email protected]>
+
+	Test of sorted diffing to make Test more robust against software version changes.
+
+2018-08-28  raffazizzi  <[email protected]>
+
+	attempting to fix more test errors
+
+	Fixing tests for new odd2json
+
+2018-08-27  raffazizzi  <[email protected]>
+
+	Merge branch 'dev' into raffazizzi-json
+
+2018-08-22  raffazizzi  <[email protected]>
+
+	A few adjustments and representing datatypes for attributes
+
+2018-08-11  martindholmes  <[email protected]>
+
+	Slight file re-organization per suggestion from SB; parameterizing file list so a single file can be tested more easily.
+
+2018-08-08  martindholmes  <[email protected]>
+
+	Schematron now being extracted from ODDs.
+
+2018-08-07  martindholmes  <[email protected]>
+
+	Added one more test to the invalid file.
+
+	Invalid file testing: first example working.
+
+2018-08-06  martindholmes  <[email protected]>
+
+	Comments in ODD build file as to how to proceed with testing validation using generated schemas.
+
+	Build of ODD for non-TEI schema working.
+
+	RelaxNG being created; adding valid exemplar for testing.
+
+	Adding a simple test file for building an ODD for a non-TEI schema.
+
+2018-07-27  martindholmes  <[email protected]>
+
+	Merge branch 'dev' of https://github.com/TEIC/Stylesheets into dev
+
+	Update build file to match new file name for old test.odd.
+
+2018-07-27  Syd Bauman  <[email protected]>
+
+	Rename output file accordingly
+
+	Tweak and rename specDesc test file
+
+2018-07-25  martindholmes  <[email protected]>
+
+	Updated pureOdd  expected-results.
+
+	Whitespace in expected-results.
+
+	Updates for changes to expected-results.
+
+	Fixing duplicated project name.
+
+2018-07-25  raffazizzi  <[email protected]>
+
+	changes related to attributes processing
+
+	Merge branch 'dev' into raffazizzi-json
+
+2018-07-23  Syd Bauman  <[email protected]>
+
+	Update for 3.4.0: Re-create a bunch of the expected results based on what is generated from test files using the soon-to-be-published 3.4.0.
+
+2018-07-23  raffazizzi  <[email protected]>
+
+	Updated version after release
 2018-07-23  Peter Stadler  <[email protected]>
 
 	trimming whitespace from VERSION file

Makefile

@@ -5,7 +5,7 @@ DOTDOTSAXON=java -jar ../../lib/saxon9he.jar
 DOTSAXON=java -jar ../lib/saxon9he.jar
 SAXON_ARGS=-ext:on
 
-DIRS=bibtex cocoa common csv docx dtd docbook epub epub3 fo html wordpress markdown html5 json latex latex nlm odd odds odt p4 pdf profiles/default rdf relaxng rnc schematron simple slides tbx tcp tite tools txt html xsd xlsx pdf verbatimxml
+DIRS=bibtex cocoa common csv docx dtd docbook epub epub3 fo html wordpress markdown html5 json latex latex nlm odd odds odt p4 pdf profiles/default rdf relaxng rnc schematron simple slides tbx tcp lite tite tools txt html xsd xlsx pdf verbatimxml
 
 SCRIPTS=bin/*to*
 PREFIX=/usr

README.md

@@ -1,5 +1,7 @@
 # Stylesheets
 
+[![Build Status](https://travis-ci.org/TEIC/Stylesheets.svg?branch=dev)](https://travis-ci.org/TEIC/Stylesheets)
+
 TEI XSL Stylesheets
 
 This is a family of XSLT 2.0 stylesheets to transform TEI XML documents to various formats, including XHTML, LaTeX, XSL Formatting Objects, ePub, plain text, RDF, JSON; and to/from Word OOXML (docx) and OpenOfice (odt).  They concentrate on the core TEI modules which are used for simple transcription and "born digital" writing. It is important to understand that they do _not_:

Test/Makefile

@@ -231,12 +231,12 @@ test-epub: css
 	java -Djava.awt.headless=true -jar ../lib/epubcheck3.jar  test.epub
 	unzip -t test.epub > test.epub.listing
 	if [ $(REGENERATING) -ne 1 ]; \
-		then diff  test.epub.listing expected-results/test.epub.listing; fi
+		then bash -c 'diff  <(sort test.epub.listing) <(sort expected-results/test.epub.listing)'; fi
 	rm test.epub.listing
 	$(BINDIR)/teitoepub  --fileperpage test.xml test-pages.epub
 	unzip -t test-pages.epub > test.epub.listing2
 	if [ $(REGENERATING) -ne 1 ]; \
-		then diff  test.epub.listing2 expected-results/test.epub.listing2; fi
+		then bash -c 'diff  <(sort test.epub.listing2) <(sort expected-results/test.epub.listing2)'; fi
 	rm test.epub.listing2
 
 test-rdf:
@@ -261,13 +261,13 @@ test-odt:   test.rng
 	(cd ..; $(MAKE) names)
 	@echo BUILD: testing odt
 	$(BINDIR)/teitoodt test.xml
-	unzip -t test.xml.odt > test.xml.odt.listing
+	unzip -t test.xml.odt | sort > test.xml.odt.listing
 	unzip -o -q test.xml.odt content.xml
 	xmllint --format content.xml > content.xml.odt.listing
 	if [ $(REGENERATING) -ne 1 ]; \
-		then diff  test.xml.odt.listing expected-results/test.xml.odt.listing; fi
+		then bash -c 'diff  <(sort test.xml.odt.listing) <(sort expected-results/test.xml.odt.listing)'; fi
 	if [ $(REGENERATING) -ne 1 ]; \
-		then diff  content.xml.odt.listing expected-results/content.xml.odt.listing; fi
+		then bash -c 'diff  <(sort content.xml.odt.listing) <(sort expected-results/content.xml.odt.listing)'; fi
 	$(BINDIR)/odttotei test7.odt test7.xml
 	$(JING) test.rng test7.xml
 	if [ $(REGENERATING) -ne 1 ]; \
@@ -480,7 +480,7 @@ test-namespaces:
 	if [ $(REGENERATING) -ne 1 ]; \
 		then diff  test33.rnc expected-results/test33.rnc; fi
 	$(SAXON) test33.odd ../odds/odd2json.xsl > test33.json
-	perl -p -i -e 's/"date":"\d+-\d+\-\d+T\d+:\d+:\d+Z",//' test33.json
+	perl -p -i -e 's/"date" : "\d+-\d+\-\d+T\d+:\d+:\d+Z",//' test33.json
 	if [ $(REGENERATING) -ne 1 ]; \
 		then diff  test33.json expected-results/test33.json; fi
 	$(BINDIR)/teitornc test34.odd test34.rnc
@@ -489,12 +489,12 @@ test-namespaces:
 	if [ $(REGENERATING) -ne 1 ]; \
 		then diff  test34.rnc expected-results/test34.rnc; fi
 	$(SAXON) test34.odd ../odds/odd2json.xsl > test34.json
-	perl -p -i -e 's/"date":"\d+-\d+\-\d+T\d+:\d+:\d+Z",//' test34.json
+	perl -p -i -e 's/"date" : "\d+-\d+\-\d+T\d+:\d+:\d+Z",//' test34.json
 	if [ $(REGENERATING) -ne 1 ]; \
 		then diff  test34.json expected-results/test34.json; fi
 	$(SAXON) test34.odd ../odds/odd2odd.xsl > test34.combined.odd
 	$(SAXON) test34.combined.odd ../odds/odd2json.xsl > test34.combined.json
-	perl -p -i -e 's/"date":"\d+-\d+\-\d+T\d+:\d+:\d+Z",//' test34.combined.json
+	perl -p -i -e 's/"date" : "\d+-\d+\-\d+T\d+:\d+:\d+Z",//' test34.combined.json
 	if [ $(REGENERATING) -ne 1 ]; \
 		then diff  test34.combined.json expected-results/test34.combined.json; fi
 	$(BINDIR)/teitohtml --odd --summaryDoc test34.odd test34.odd.html
@@ -533,8 +533,8 @@ test-pureant:
 
 test-oxgarage:
 	@echo BUILD: testing oxgarage
-	curl -s -F [email protected]  -o test.rng http://oxgarage.oucs.ox.ac.uk:8080/ege-webservice/Conversions/ODD%3Atext%3Axml/ODDC%3Atext%3Axml/relaxng%3Aapplication%3Axml-relaxng
-	curl -s -F [email protected]  -o test.zip http://oxgarage.oucs.ox.ac.uk:8080/ege-webservice/Conversions/ODD%3Atext%3Axml/ODDC%3Atext%3Axml/xsd%3Aapplication%3Axml-xsd/
+	curl -s -F [email protected]  -o test.rng http://oxgarage.tei-c.org/ege-webservice/Conversions/ODD%3Atext%3Axml/ODDC%3Atext%3Axml/relaxng%3Aapplication%3Axml-relaxng
+	curl -s -F [email protected]  -o test.zip http://oxgarage.tei-c.org/ege-webservice/Conversions/ODD%3Atext%3Axml/ODDC%3Atext%3Axml/xsd%3Aapplication%3Axml-xsd/
 
 test-oxgarage-tei:
 	@echo BUILD: testing oxgarage-tei