release 7.48.0 and change log

ChangeLog

@@ -1,3 +1,289 @@
+2019-07-16  Peter Stadler  <[email protected]>
+
+	update expected results
+	built against current Guidelines release branch
+
+2019-07-11  Martin Holmes  <[email protected]>
+
+	Merge pull request #385 from TEIC/peterstadler-issue360
+	fixes internal PDF links #360
+
+2019-07-11  Peter Stadler  <[email protected]>
+
+	update expected results
+
+2019-07-10  Peter Stadler  <[email protected]>
+
+	remove surrounding square brackets from bibliographic references
+
+2019-07-10  Stuart Yeates  <[email protected]>
+
+	Add some text to make this findable using google (#374)
+
+2019-07-05  Peter Stadler  <[email protected]>
+
+	Merge branch 'dev' into peterstadler-issue360
+
+2019-07-02  Peter Stadler  <[email protected]>
+
+	fix creation of Debian packages
+	Debian uses fakeroot to build packages which resets all environment variables. In the Docker image the `jar` executable is outside of the default paths "/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11" so we need this extra treatment.
+
+2019-06-24  raffazizzi  <[email protected]>
+
+	Defaulting descs to en instead of all languages
+
+2019-06-20  Martin Holmes  <[email protected]>
+
+	Merge pull request #381 from rvdb/jTEI-improve-punctuation-handling
+	fixed the obligatory typo :-/
+
+2019-06-20  rvdb  <[email protected]>
+
+	fixed the obligatory typo :-/
+
+2019-06-19  Martin Holmes  <[email protected]>
+
+	Merge pull request #380 from rvdb/jTEI-improve-punctuation-handling
+	improved processing of "quotation elements" and footnotes w.r.t. subs…
+
+2019-06-19  rvdb  <[email protected]>
+
+	improved processing of "quotation elements" and footnotes w.r.t. subsequent punctuation, which should now be fully compliant with CMOS:
+	  -only commas and periods should appear before closing quotation mark
+	  -(only the) innermost "quotation element" should "pull in" subsequent comma or period
+	   -all punctuation marks except dash should precede footnote markers
+
+2019-05-20  Peter Stadler  <[email protected]>
+
+	move relaxng related templates to their proper location #375
+	Those templates were introduced by PR #366 but led to some unintended side effects in the epub build. Stylesheets group decided to move them out of teiodds.xsl, thus tacitly accepting to revert the changes to the DTD output as a consequence.
+
+	Co-Authored-By: Martina Scholger <[email protected]>
+	Co-Authored-By: Martin Holmes <[email protected]>
+	Co-Authored-By: Syd Bauman <[email protected]>
+
+2019-05-20  martindholmes  <[email protected]>
+
+	Adding comment to new templates.
+
+2019-05-17  Piotr Banski  <[email protected]>
+
+	added checks for trang, ant and xetex to `make check` (#239)
+	* added checks for trang, ant and xetex to `make check`
+
+	* remove checks for jing and trang, and add warning for xetex
+
+	jing and trang do not need to be installed locally but are provided within the Stylesheets repo
+
+2019-05-10  martindholmes  <[email protected]>
+
+	Fix for expected-results in Test2 following revisions to specs.
+
+2019-05-10  Peter Stadler  <[email protected]>
+
+	update expected results for #360
+
+	set default citebordercolor #360
+	for new `\cite` command (was `\hyperref`)
+
+	fix citation references
+	by using `\cite` rather than `\hyperref`
+
+	some refactoring
+	in particular the `tei:makeHyperTarget` is unecessary because the `\bibitem` adds a label automatically
+
+2019-05-08  Peter Stadler  <[email protected]>
+
+	Merge branch 'dev' into peterstadler-issue360
+
+2019-05-08  Syd Bauman  <[email protected]>
+
+	Change expected results to match #336.
+
+2019-05-08  Raffaele Viglianti  <[email protected]>
+
+	Merge pull request #343 from TEIC/peterstadler-fix-multiple-schemaSpecs
+	fix processing of multiple schema specs (in one TEI document)
+
+2019-05-08  Syd Bauman  <[email protected]>
+
+	Merge pull request #336 from PietroLiuzzo/patch-1
+	adding rendering of ref, gi and att inside desc; still need to updated expected results (and then will close ticket)
+
+2019-05-08  raffazizzi  <[email protected]>
+
+	Improved handling of multiple schemaSpecs when merging multiple *Spec declarations. Refs #249
+
+2019-05-08  Syd Bauman  <[email protected]>
+
+	Per #240, drop the "four", as there are now six. :-)
+
+2019-05-08  Syd Bauman  <[email protected]>
+
+	Merge pull request #240 from bansp/patch-2
+	Only problem w/ this PR is that we left it for so long the number of uses of `@zip64Mode` has changed. Also, the link to get.xml is currently dead due to ADHO server crash problem, but that doesn't change this PR.
+	So Council accepts this PR, and I'm supposed to go fix the reference to `@zip64Mode` attrs now.
+
+2019-04-29  Syd Bauman  <[email protected]>
+
+	complete merge
+
+	Add comments to solve #355
+
+2019-04-29  martindholmes  <[email protected]>
+
+	@martindholmes and @sydb working on issue #355, adding comments to clarify the creation and use of a PI.
+
+2019-03-30  Syd Bauman  <[email protected]>
+
+	Merge pull request #367 from TEIC/issue366
+	make sure to only pass one prefix to `concat()`, fixes 366
+
+2019-03-28  Syd Bauman  <[email protected]>
+
+	Minor change: The ever vigilant @cmsmcq [noticed](https://github.com/TEIC/Stylesheets/pull/367#issuecomment-476296447) I missed changing a '=' to 'eq' on previous commit. As he points out, should make no difference whatsoever to actual processing (of valid documents).
+
+2019-03-26  martindholmes  <[email protected]>
+
+	Fix for expected results change arising from https://github.com/TEIC/Stylesheets/commit/c2d23d7125998bae7b8edc5a783789fcba02a608.
+
+2019-03-25  raffazizzi  <[email protected]>
+
+	updated tests
+
+	Merge branch 'dev' of github.com:TEIC/Stylesheets into dev
+
+	fixed wrong variable name
+
+2019-03-25  Peter Stadler  <[email protected]>
+
+	partially revert JSON tests
+	This undoes ff9837e7d4e22a3606f6db3a3ff14f12cf8609d4 to fix the current build problems. NB:  Test/expected-results/test34.combined.json was only partially reverted, the "desc" arrays remain empty here.
+
+2019-03-25  Syd Bauman  <[email protected]>
+
+	Incorporate @cmsmcq's suggestions into another attempt at fixing this; only partially tested
+
+2019-03-22  Peter Stadler  <[email protected]>
+
+	make sure to only pass one prefix to `concat()`, fixes 366
+
+2019-03-21  raffazizzi  <[email protected]>
+
+	updated tests
+
+	set "en" as default value for doclang
+
+	switched to using default doclang parameter
+
+2019-03-18  martindholmes  <[email protected]>
+
+	Fix for expected-results.
+
+2019-03-18  Syd Bauman  <[email protected]>
+
+	Fix #361: Add namespace to <egXML> in <egXML> output. (we hope this works; let's see what Mr. Jenkins says)
+
+2019-03-16  James Cummings  <[email protected]>
+
+	Merge pull request #359 from TEIC/peterstadler-issue-358
+	add support for hard page breaks in odttotei
+
+2019-03-15  Peter Stadler  <[email protected]>
+
+	Merge branch 'dev' into peterstadler-fix-multiple-schemaSpecs
+
+2019-03-11  Syd Bauman  <[email protected]>
+
+	Merge pull request #364 from TEIC/peterstadler-dev
+	set localsource parameter once for build process 
+
+2019-03-07  Peter Stadler  <[email protected]>
+
+	add TEISOURCE_DEFAULT
+	which will be used when no --localsource is provided; as requested in https://github.com/TEIC/Stylesheets/pull/364#issuecomment-470603525
+
+	improve code for setting localsource
+	and add comments
+
+	replace hard coded source in testfile
+	with variable DEFAULTSOURCE. This will prevent builds from failing when DEFAULTSOURCE is set to something different than the default.
+
+2019-03-06  Peter Stadler  <[email protected]>
+
+	point at the vault, not the release
+
+	support localsource pointing at some web resource
+	this is a temporary hack and needs to be fleshed out.
+
+	add proper support for setting localsource
+	this will allow you to invoke `make` with a local copy of the TEI sources, circumventing the current hickup with the servers …
+	 e.g. `make test DEFAULTSOURCE=file:///my/local/path/to/p5subset.xml`
+
+2019-03-05  Peter Stadler  <[email protected]>
+
+	update scheme for source
+	NB: we need to modify the tests to capture this. Because whenever a different source is set this test will fail
+
+	update expected json results
+
+	update expected results #357
+
+	update expected results
+
+	remove trailing whitespace #357
+
+	update default p5subset scheme
+
+2019-03-04  Joey Takeda  <[email protected]>
+
+	#328: Suppress copying unprocessed attRefs in common_tagdocs.
+
+2019-02-20  raffazizzi  <[email protected]>
+
+	fix for valDesc when no lang is specified
+
+	fixed missing axis to get valList `@type`
+
+2019-02-17  Peter Stadler  <[email protected]>
+
+	add phantomsection to spec labels, fixes 360
+
+2019-02-15  Syd Bauman  <[email protected]>
+
+	Merge in the latest changes from dev
+
+	Fix #357.
+
+2019-02-15  raffazizzi  <[email protected]>
+
+	Adjusted odd2json tests
+
+	Changes for datatype processing
+
+2019-01-31  martindholmes  <[email protected]>
+
+	Merge branch 'dev' of github.com:TEIC/Stylesheets into dev
+
+	Updates to Test2 due to changes in ODD processing and schema.
+
+2019-01-30  Hugh Cayless  <[email protected]>
+
+	Merge branch 'master' into dev post 7.47.0 release.
+
+2019-01-29  Hugh Cayless  <[email protected]>
+
+	Merge branch 'release-7.47.0'
+	Fixing issues with the tests, which surfaced with TEI 3.5.0.
+
+	Fixing expected results.
+
+	Merging release branch.
+
+	Updated changelog.
+
+	Set VERSION 7.47.0
 2019-01-29  Hugh Cayless  <[email protected]>
 
 	Set VERSION 7.47.0

Makefile

@@ -1,10 +1,9 @@
 SFUSER=rahtz
-JING=jing
-SAXON=java -jar lib/saxon9he.jar
-DOTDOTSAXON=java -jar ../../lib/saxon9he.jar
-DOTSAXON=java -jar ../lib/saxon9he.jar
+DEFAULTSOURCE=https://www.tei-c.org/Vault/P5/current/xml/tei/odd/p5subset.xml
+SAXON=java -jar lib/saxon9he.jar defaultSource=$(DEFAULTSOURCE)
+DOTSAXON=java -jar ../lib/saxon9he.jar defaultSource=$(DEFAULTSOURCE)
+DOTDOTSAXON=java -jar ../../lib/saxon9he.jar defaultSource=$(DEFAULTSOURCE) 
 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 lite tite tools txt html xsd xlsx pdf verbatimxml
 
 SCRIPTS=bin/*to*
@@ -53,8 +52,10 @@ check:
 	@which perl || exit 1
 	@echo -n xmllint: 
 	@which xmllint || exit 1
-	@echo -n jing: 
-	@which ${JING} || exit 1
+	@echo -n ant: 
+	@which ant || exit 1
+	@echo -n xetex: 
+	@which xetex || echo " Warning: Couldn't find xetex executable. While most transformations will work, PDF output will not be possible"
 
 v:
 	perl -p -i -e "s+AppVersion.*/AppVersion+AppVersion>`cat VERSION`</AppVersion+" docx/to/application.xsl
@@ -102,7 +103,7 @@ teioo.jar:
 
 test: clean build common names debversion
 	@echo BUILD Run tests
-	(cd Test; make)
+	(cd Test; make DEFAULTSOURCE=$(DEFAULTSOURCE))
 
 dist: clean release
 	-rm -f tei-xsl-`cat VERSION`.zip
@@ -178,7 +179,7 @@ deb: debversion
 	rm -f tei*xsl*_*deb
 	rm -f tei*xsl*_*changes
 	rm -f tei*xsl*_*build
-	(cd debian-tei-xsl; debclean;debuild --no-lintian  -nc -b -uc -us)
+	(cd debian-tei-xsl; debclean;debuild --no-lintian --preserve-envvar PATH -nc -b -uc -us)
 tag:
 	git tag -a v`cat VERSION` -m 'release version `cat VERSION`'
 	git push --follow-tags

README.md

@@ -11,6 +11,15 @@ This is a family of XSLT 2.0 stylesheets to transform TEI XML documents to vario
 
 and should not be treated as the definitive view of the TEI Consortium.
 
+## Prerequisites
+The package assumes that you have several additional tools installed. Their availability on your system can be verified by issuing the command `make check`.
+
+In particular, Stylesheets assume that you use `ant` version 1.9.x+. If for some reason, you need to use `ant` 1.8.x, you should remove all occurences of the attribute `@zip64Mode` from the file `common/teianttasks.xml`.
+
+It is helpful to have the TEI environment installed locally. Please refer to http://www.tei-c.org/Guidelines/P5/get.xml for hints on how to do that.
+
+It is also possible to avoid manual installation of additional tools, by resorting to the pre-built test environment in Docker described in http://teic.github.io/TCW/testing_and_building.html .
+
 ## Usage
 The `bin/` directory contains several executable files, which can be run on Linux, OS X, or other Unix operating systems. These perform a variety of transformations and are very useful for, e.g., generating a schema from a TEI ODD. Some examples:
 ```bash
@@ -21,3 +30,25 @@ Assuming you have a copy of the TEI Guidelines repository alongside your copy of
 bin/teitornc --odd ../TEI/P5/Exemplars/tei_lite.odd tei_lite.rnc
 ```
 will produce a RelaxNG Compact Syntax schema for TEI Lite.
+
+
+## About the Text Encoding Initiative (TEI)
+
+The Text Encoding Initiative (TEI) is a community of practice in the area now known as textual digital humanities. Since 1994 
+the primary output of the TEI has been [the TEI/XML guidelines](https://www.tei-c.org/release/doc/tei-p5-doc/en/html/index.html), a standard for the interchange of textual data. A main focii of the TEI is the [TEI-L mailing list](https://listserv.brown.edu/cgi-bin/wa?A1=ind1904&L=TEI-L); the TEI is also on [github](https://github.com/TEIC/TEI) and [docker](https://hub.docker.com/u/teic), a repository called [TAPAS](https://tapasproject.org/) and an [academic journal, the jTEI](https://journals.openedition.org/jtei/). 
+
+TEI/XML can be thought of as a sibling of HTML (they're approximately the same age, depending on how you measure it) which evolved with a focus on defined textual semantics rather than defined display semantics.  [TEI by example](https://teibyexample.org/) is a good introduction to TEI/XML.
+The [Text Encoding Initiative Wikipedia article](https://en.wikipedia.org/wiki/Text_Encoding_Initiative) contains some short examples. 
+The TEI/XML standard is used by content-based projects such as 
+the [British National Corpus](http://www.natcorp.ox.ac.uk), 
+the [Perseus Project](http://www.perseus.tufts.edu/), 
+the [Women Writers Project](http://www.wwp.northeastern.edu/), 
+the [Oxford Text Archive](http://ota.ox.ac.uk/), 
+the [Digital Tripitaka](https://journals.tdl.org/jodi/index.php/jodi/article/view/84/83) and 
+[SARIT](http://sarit.indology.info/),
+and tool-based projects such as 
+[CorrespSearch](https://correspsearch.net/),  
+[EpiDoc](http://epidoc.sourceforge.net/), 
+[Anthologize](http://anthologize.org/), 
+[Versioning Machine](http://v-machine.org/), 
+and many more diverse projects.