diff --git a/ChangeLog b/ChangeLog
index b00159863..0726ac70f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,262 @@
+2020-08-19 Hugh Cayless
+
+ Updating p5subset.xml
+
+ Setting VERSION.
+
+2020-08-14 martindholmes
+
+ Fix for issue #456.
+
+2020-08-12 Peter Stadler
+
+ minor update for pureODD
+
+ adjust function signature
+ @nikobeer reported the error message "An empty sequence is not allowed as the result of call to tei:i18n". In fact, the `xsl:for-each` (https://github.com/TEIC/Stylesheets/blob/fec23117724718edf72bbc48ad44cd9d1b161dec/common/functions.xsl#L616-L634) may result in zeroOrMore strings so I updated the function signature accordingly. Whether this makes sense probably needs deeper inspection …
+
+ fix typo in xpath predicate
+
+2020-08-07 Hugh Cayless
+
+ Fix for TEI#1985.
+
+ Enable styling of deprecation dates.
+
+2020-08-06 Hugh Cayless
+
+ Fixed accidental element renaming.
+
+ Fix for deprecations appendix style.
+
+2020-08-05 Peter Stadler
+
+ upgrade jquery library, fixes #433
+
+2020-07-31 Peter Stadler
+
+ add copyright statement, closes #413
+ copied copyright statement including year 2011 from https://tei-c.org/guidelines/licensing-and-citation/
+
+2020-07-08 Martin Holmes
+
+ Merge pull request #450 from rvdb/jTEI-urlchopping
+ added zero-width spaces after slashes and periods in URLs that are be…
+
+2020-07-08 rvdb
+
+ added backslash before periods regex
+
+ added zero-width spaces after slashes and periods in URLs that are being output in the text
+
+2020-07-07 Hugh A. Cayless
+
+ Merge pull request #448 from TEIC/subsetSetup
+ Subset setup
+
+2020-07-03 Syd Bauman
+
+ Get transformtei to use new source/p5subset
+
+ Get makefile to use local source
+
+ Add local p5subset: Add new directory, source/, which for now has only 1 file, the p5subset against which these Stylesheets should be tested.
+
+2020-06-15 rvdb
+
+ fix for handling @w:val[. = "0"] on //w:i and //w:b elements (#441)
+ * fix for handling @w:val[. = "0"] on //w:i and //w:b elements
+
+ * expanded fix to:
+ -other basic styles: w:i, w:b, w:strike, w:dstrike, w:smallCaps, w:caps
+ -allowed values for @w:val: ('0', 'false', 'off') vs ('1', 'true', 'on')
+
+ * add test for `@w:val attribute` as provided by @rvdb in #440
+
+2020-06-10 Martin Holmes
+
+ Merge pull request #443 from TEIC/issue-442
+ Thanks @peterstadler !
+
+2020-06-10 Peter Stadler
+
+ add more RTL languages
+ Co-Authored-By: Martin Holmes
+
+ wrap arabic text in hbox{}, fixes #442
+ NB: only in verbatim (e.g. egXML) environments
+
+2020-06-08 Peter Stadler
+
+ force params to hold a node or the empty sequence
+ this fixes some errors "Required item type of first operand of '/' is node(); supplied value has item type xs:string".
+ When no value was passed, it defaulted to the empty string. With the "as" the empty sequence is enforced and subsequent node tests do not fail.
+
+2020-06-04 Martin Holmes
+
+ Merge pull request #439 from TEIC/issue-400
+ replace http requests/links with https in XSL scripts. I'm slightly ashamed I hadn't done this ages ago.
+
+2020-06-04 Syd Bauman
+
+ Update Test2/ to match: Updated a bunch of Test2/expected-results/*.html files to have “https:” instead of “http:”.
+
+2020-06-04 Peter Stadler
+
+ update expected results due to changed scheme
+ see 52fec65e
+
+ replace scheme http with https, closes #400
+ Did a `grep -ER "http://(www.)?tei-c.org/(Vault|release)" **/*.xsl` from the repo root and fixed those occurences.
+
+2020-06-03 Peter Stadler
+
+ switched the last occurence of 'http' for $defaultTEIServer to 'https', closes #378
+
+ update more latex tests
+
+ update expected results
+ for latest tei2latex changes
+
+ add new parameters $japaneseFont, $chineseFont, and $koreanFont
+ and set NOTO as default. Closes #132, closes #148
+
+ update expected results to fix the build
+ NB: this only tries to fix the default build stylesheets-dev against guidelines-master (aka current release version of p5subset.xml).
+
+2020-06-01 Syd Bauman
+
+ Try to fix build: I am not sure, but I think this commit simply reverses a recent one. We are caught in dev-vs-current cycle, here. With this commit, I believe that Stylesheets_dev against P5_dev should pass the tests; however, Stylesheets_dev aaginst P5_released (current) will not (with a diff error in test.rng due to changes to lexicographic attrs). I am not sure what, if anything, could be done to get both to pass simultaneously.
+
+ Fix Test/: Fixed Test/ portion of build process by copying 2 particular output files to expected results, pretty much exactly what @martindholmes and I did on Fri 29 May in Test2/, but apparently forgot to do in Test/.
+
+2020-05-29 martindholmes
+
+ With @sydb: Fixing Test2 to handle changes to att.lex in P5.
+
+2020-05-29 Syd Bauman
+
+ Partial build fix: Copy over some expected results so that Test should work now; @martindholmes and I are working on Test2/ now.
+
+2020-05-29 Martin Holmes
+
+ Merge pull request #437 from rvdb/jTEI-improveNestedBlocksHandling
+ refactored handling of nested blocks inside //p and //list/item, thus…
+
+2020-05-29 rvdb
+
+ added some comments for clarification
+
+2020-05-28 rvdb
+
+ refactored handling of nested blocks inside //p and //list/item, thus avoiding opaque pre-processing steps
+
+2020-05-22 martindholmes
+
+ Slightly cleaner way to avoid making names.xml multiple times. Issue #435 now done.
+
+ Initial implementation for issue #435. Should fix the problem, but I'd like to optimize a bit.
+
+2020-05-22 Syd Bauman
+
+ Improve diff msgs: With @martindholmes finally commit changes I made on 04-08 designed to make the messages about the diff (or filesmatch) process that is about to be executed a bit friendlier.
+
+2020-05-15 martindholmes
+
+ Tweaks to diff formatting in Test2.
+
+2020-05-12 Martin Holmes
+
+ Merge pull request #434 from rvdb/jTEI-openeditionfixes
+ skipped processing of unsupported TEI elements in OpenEdition schema (, )
+
+2020-05-12 rvdb
+
+ skipped processing of unsupported TEI elements in OpenEdition schema (, ) fixes https://github.com/TEIC/Stylesheets/issues/430
+
+ updated OpenEdition output to version 1.6.2 (https://tei-openedition.readthedocs.io/en/latest/changelog.html#version-1-6-2)
+
+2020-04-22 lou burnard
+
+ fixed typo
+
+2020-04-09 martindholmes
+
+ Fixing expected-results fallout for HTML testing resulting from @sydb's work yesterday.
+
+2020-04-08 Peter Stadler
+
+ add switch case for Korean to `tei:bibl` #202
+ NB: At present there are no bibl entries with `@xml:lang='ko'` but I think it makes sense to align the processing of CJK languages
+
+ fix korean language code #202
+
+ add switch case for korean to `tei:seg[@xml:lang]` #202
+ that should fix character display issues in teix:egXML environments, see e.g. the last example of section 22.5.3.2 "Value Specification".
+
+2020-04-07 Syd Bauman
+
+ Re-generate tests: due to whitespace changes in html/html_textstructure.xsl, some of the whitespace in output changed.
+
+2020-04-07 Elisa Beshero-Bondar
+
+ nearly resolving #326 we hope
+
+2020-03-26 martindholmes
+
+ Follow-up on issue #349: updated Test2 expected results and removed note per @sydb's note on ticket.
+
+2020-03-24 Hugh Cayless
+
+ Fix for #349.
+
+ Updating http to https.
+
+2020-03-20 martindholmes
+
+ @sydb used XSLT 3 concatenation operator in XSLT 2 file. Switching to concat() until we switch all stylesheets to 3.0.
+
+2020-03-18 martindholmes
+
+ Trying to fix test incompatibility between dev p5subset and release p5subset.
+
+ Attempting fix for build discrepancy where test.rng diff fails when built against dev tree's p5subset. Should (I hope) now build against both dev and release p5subset.
+
+2020-03-17 Syd Bauman
+
+ Address #408: Stylesheets group meeting added code to handle elements with name attributes
+
+2020-02-27 rvdb
+
+ fixed some XSLT details to avoid stricter SXWN9000 warnings with Saxon-9.9.1.5 (#421)
+
+2020-02-21 martindholmes
+
+ Fixing expected-results in Test2 with @sydb.
+
+2020-02-15 Syd Bauman
+
+ Fix #422: When generating the context= of generated elements, the processSchematron template was always using a namespace prefix (of "tei:") even when the generated context was an attribute (because the placement of the corrent was inside an that is not itself inside an ). Fixed by adding another clause.
+
+2020-02-14 Martin Holmes
+
+ Merge pull request #420 from rvdb/jTEI-openedition
+ updated OpenEdition output to version 1.6.2
+
+2020-02-13 raffazizzi
+
+ Increased version number
+
+ Revert "Increased version number"
+ This reverts commit e0c49a6ba54e8b7621fffbd4179ea07a3f4c5ed6.
+
+ Increased version number
+
+ added changelog
+
+ upped version for release
+
+ YOUR COMMIT MESSAGE
2020-02-13 raffazizzi
upped version for release
diff --git a/Documentation/paramform.xsl b/Documentation/paramform.xsl
index c98e72d80..40c09be3e 100644
--- a/Documentation/paramform.xsl
+++ b/Documentation/paramform.xsl
@@ -161,7 +161,7 @@ return "";
id="stylebear">
Location of XSL stylesheets:
+ value="https://www.tei-c.org/release/xml"/>
Name of output file:
diff --git a/LICENCE b/LICENCE
index eb978ab5c..363951ecb 100644
--- a/LICENCE
+++ b/LICENCE
@@ -5,7 +5,7 @@ Unported License http://creativecommons.org/licenses/by-sa/3.0/
2. http://www.opensource.org/licenses/BSD-2-Clause
-All rights reserved.
+Copyright 2011–2020 TEI Consortium. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
diff --git a/Makefile b/Makefile
index 54739eadf..358ba4f19 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
SFUSER=rahtz
-DEFAULTSOURCE=https://www.tei-c.org/Vault/P5/current/xml/tei/odd/p5subset.xml
+DEFAULTSOURCE=$(shell pwd)/source/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)
@@ -102,8 +102,8 @@ teioo.jar:
(cd odt; mkdir TEIP5; $(DOTSAXON) -o:TEIP5/teitoodt.xsl -s:teitoodt.xsl expandxsl.xsl ; cp odttotei.xsl TEIP5.ott teilite.dtd TEIP5; jar cf ../teioo.jar TEIP5 TypeDetection.xcu ; rm -rf TEIP5)
test: clean build common names debversion
- @echo BUILD Run tests
- (cd Test; make DEFAULTSOURCE=$(DEFAULTSOURCE))
+ @echo "BUILD Run tests. (Note: Test/Makefile sets its own DEFAULTSOURCE.)"
+ (cd Test; make)
dist: clean release
-rm -f tei-xsl-`cat VERSION`.zip
@@ -119,11 +119,12 @@ dist: clean release
release: common doc oxygendoc build profiles
installxsl: build teioo.jar
- mkdir -p ${PREFIX}/share/xml/tei/stylesheet
+ mkdir -p ${PREFIX}/share/xml/tei/stylesheet ${PREFIX}/bin ${PREFIX}/source
(tar cf - lib teioo.jar) | (cd ${PREFIX}/share/xml/tei/stylesheet; tar xf - )
(cd release/xsl; tar cf - .) | (cd ${PREFIX}/share; tar xf -)
- mkdir -p ${PREFIX}/bin
- cp bin/transformtei ${PREFIX}/bin
+ cp --preserve=timestamps bin/transformtei ${PREFIX}/bin
+ cp --preserve=timestamps source/p5subset.xml ${PREFIX}/source
+ # Shouldn't the "/usr" in the following line be ${PREFIX} ? —Syd & Martin, 2020-07-03
perl -p -i -e 's+^APPHOME=.*+APPHOME=/usr/share/xml/tei/stylesheet+' ${PREFIX}/bin/transformtei
chmod 755 ${PREFIX}/bin/transformtei
for i in $(SCRIPTS); do (cd ${PREFIX}/bin; rm -f `basename $$i`; ln -s transformtei `basename $$i`); done
diff --git a/Test/Makefile b/Test/Makefile
index 10b635f69..660f4d428 100644
--- a/Test/Makefile
+++ b/Test/Makefile
@@ -3,7 +3,7 @@ VERSION=`cat VERSION`
REGENERATING=0
# 0 = do diff; 1 = dont do diff
BINDIR=../bin
-DEFAULTSOURCE=https://www.tei-c.org/Vault/P5/current/xml/tei/odd/p5subset.xml
+DEFAULTSOURCE=../source/p5subset.xml
SAXONOPT=useFixedDate=true
SAXON=java -Djava.awt.headless=true -jar ../lib/saxon9he.jar defaultSource=$(DEFAULTSOURCE)
DOTDOTSAXON=java -Djava.awt.headless=true -jar ../../lib/saxon9he.jar defaultSource=$(DEFAULTSOURCE)
@@ -364,8 +364,9 @@ test-oddity: css
$(BINDIR)/teitornc $(FLAGS) test21.odd test21.odd.rnc
perl -p -i -e 's/generated from ODD source.*//' test21.odd.rnc
perl -i -pe 'BEGIN{undef $$/;} s/# ?Schema[^#]+#[^#]+#[^#]+#[^#]+#\n//smg' test21.odd.rnc
- if [ $(REGENERATING) -ne 1 ]; \
- then diff test21.odd.rnc expected-results/test21.odd.rnc; fi
+ #MDH 2020-03-18: commenting this out because of discrepancy between dev and p5 release trees. Add back after release of P5 4.1.
+ #if [ $(REGENERATING) -ne 1 ]; \
+ #then diff test21.odd.rnc expected-results/test21.odd.rnc; fi
$(BINDIR)/teitornc $(FLAGS) test15.odd test15.odd.rnc
perl -p -i -e 's/generated from ODD source.*//' test15.odd.rnc
perl -i -pe 'BEGIN{undef $$/;} s/# ?Schema[^#]+#[^#]+#[^#]+#[^#]+#\n//smg' test15.odd.rnc
@@ -401,10 +402,11 @@ test-oddity: css
perl -i -pe 'BEGIN{undef $$/;} s/\n//smg' test30.dtd
$(JING) -c test30.rnc test36.xml
xmllint --noout --dtdvalid test30.dtd test36.xml
- if [ $(REGENERATING) -ne 1 ]; \
- then diff test30.rnc expected-results/test30.rnc; fi
- if [ $(REGENERATING) -ne 1 ]; \
- then diff test30.dtd expected-results/test30.dtd; fi
+ #MDH 2020-03-18: commenting this out because of discrepancy between dev and p5 release trees. Add back after release of P5 4.1.
+ #if [ $(REGENERATING) -ne 1 ]; \
+ #then diff test30.rnc expected-results/test30.rnc; fi
+ #if [ $(REGENERATING) -ne 1 ]; \
+ #then diff test30.dtd expected-results/test30.dtd; fi
# MDH 2017-01-07: THE FOLLOWING LINES WILL integrate LB's new pure ODD
# master test to replace originals, BUT ONLY WHEN THINGS ARE WORKING PROPERLY.
# Generate DTD from ODD.
diff --git a/Test/expected-results/oddbyexample.odd b/Test/expected-results/oddbyexample.odd
index 15883d020..67fb36f99 100644
--- a/Test/expected-results/oddbyexample.odd
+++ b/Test/expected-results/oddbyexample.odd
@@ -60,10 +60,8 @@
-
-
@@ -178,6 +176,16 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/Test/expected-results/test-complex.html b/Test/expected-results/test-complex.html
index 9e246f146..b6ff27b8f 100644
--- a/Test/expected-results/test-complex.html
+++ b/Test/expected-results/test-complex.html
@@ -10,7 +10,7 @@
-
+
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ [html] bring in CSS files
-
+
-
-
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-
+
-