diff --git a/LICENCE b/LICENCE index 363951ecb..a2768338f 100644 --- a/LICENCE +++ b/LICENCE @@ -29,3 +29,4 @@ data, or profits; or business interruption) however caused and on any theory of liability, whether in contract, strict liability, or tort (including negligence or otherwise) arising in any way out of the use of this software, even if advised of the possibility of such damage. + diff --git a/Test/Makefile b/Test/Makefile index 660f4d428..7b5ca67ca 100644 --- a/Test/Makefile +++ b/Test/Makefile @@ -1,16 +1,58 @@ -#added REGERATION option (LB 2015-12-16) -VERSION=`cat VERSION` -REGENERATING=0 -# 0 = do diff; 1 = dont do diff +# +# TEI Stylesheets repo original Test system +# + + +################################ +# global variable declarations # +################################ + +# Do we perform comparisons between the actual outputs and expected +# outputs now (and thus fail as soon as there is a difference), or +# not (in which case user is expected to compare them after we're +# done building them here)? +DIFFNOW=1 # 1 = do diff now; 0 = don't do diffs now + +# Directories for holding outputs and expected outputs +# (NB—no ending slashes): +AR=actual-results +ER=expected-results + +# The directory in whch the various `teitoXXX` and `XXXtotei` commands can +# be found: BINDIR=../bin + +# Path to the version of P5 source to use by default +# (Note this is the p5subset used to solve circularity -- see +# ???https://pointer.to.tei/doc/on/circularity/solution???): DEFAULTSOURCE=../source/p5subset.xml + +# Several XSLT programs have a parameter that allow the routine to output +# fixed date (and possibly version) information just to make comparison +# easier. At the time of this writing, those programs are: +# ../common/functions.xsl, +# ../docx/to/teitodocx.xsl, +# ../odt/teitoodt.xsl, and +# ../rdf/make-acdc.xsl. 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) -JING=java -Djava.awt.headless=true -jar ../lib/lib/jing-20120724.0.0.jar + +# Establish commands for `saxon` and `jing`. (Note: at present UP1SAXON is +# unused, just here to show the pattern). +JAVAPRE=java -Djava.awt.headless=true -jar +SAXON=$(JAVAPRE) ../lib/saxon9he.jar defaultSource=$(DEFAULTSOURCE) +UP1SAXON=$(JAVAPRE) ../../lib/saxon9he.jar defaultSource=$(DEFAULTSOURCE) +UP2SAXON=$(JAVAPRE) ../../../lib/saxon9he.jar defaultSource=$(DEFAULTSOURCE) +JING=$(JAVAPRE) ../lib/lib/jing-20120724.0.0.jar + # flags used for the commands running from $(BINDIR), e.g. `bin/teitorelaxng` FLAGS=--localsource=$(DEFAULTSOURCE) + +# Location of oXygen. Only used in the test-pureant target, which is not run +# by any other target. OXY=/usr/share/oxygen + +# Lists of programs (in the $(BINDIR) directory) executed by the +# test-scripts target. SCRIPTS=teitobibtex \ teitodocbook \ teitodocx \ @@ -25,388 +67,496 @@ SCRIPTS=teitobibtex \ teitopdf \ teitordf \ teitotxt - SCHEMASCRIPTS=teitornc \ teitorelaxng \ teitoxsd \ teitodtd -default: test.rng test-to-html test-p4top5 test-oddity test-scripts test-namespaces test-from-html test-latex test-fo test-to-docx test-from-docx test-xlsx test-rdf test-text test-odt test-markdown test-cocoa test-epub -test.rng: +############################### +# First target is the default # +# (no matter what its name). # +############################### + +default: actual test.rng test-to-html test-p4top5 test-oddity test-scripts test-namespaces test-from-html test-latex test-fo test-to-docx test-from-docx test-xlsx test-rdf test-text test-odt test-markdown test-cocoa test-epub + + +################### +# rest of targets # +################### + +help: + @echo "Runs TEI Stylesheets repo original tests; for new and improved tests, see the" + @echo "Test2/ directory." + @echo "" + @echo "Only the main 'default' target is briefly documented here." + @echo "" + @echo "Lots of tests are run by default. For the majority of them, the test generates" + @echo "some output (put into $(AR)/) which is to be compared to the expected" + @echo "output of that test (stored in $(ER)/). If the parameter DIFFNOW is" + @echo "set to 1 (the default), the results of each test are compared to the expected" + @echo "result immediately, and the process fails and stops if a difference is found." + @echo "If the parameter DIFFNOW is set to 0 (or anything not '1', really), then the" + @echo "comparison is deferred. This allows the user to compare them all at once after" + @echo "the entire test has run. This DIFFNOW=0 is often easier for interactive use," + @echo "but DIFFNOW=1 better for running from another process that needs to know if" + @echo "there is a failure." + @echo "" + @echo "Suggested sequence for interactive use is:" + @echo "$$ make clean" + @echo "$$ make DIFFNOW=0" + @echo "$$ diff -C0 -r $(AR)/ $(ER)/ | perl -pe 's,^diff -C0," '\\n\\n#########\\ndiff' " -C0,;'" + @echo "$$ # note: ignore differences in files ending in '.listing'; if there are any use:" + @echo '$$ for f in $(AR)/*.listing ; do diff -C0 <(sort $$f) <(sort $(ER)/$$(basename $$f)); done' + @echo "$$ # as the sort order is apparently inconsequential." + @echo "" + @echo "When the diff of the two directories is performed, the following files are" + @echo "expected to be in only $(AR)/, not $(ER)/. (Listed here" + @echo "in the likely order in which they will be listed by diff.)" + @echo " Only in $(AR)/: oddbyexample.dtd" + @echo " Only in $(AR)/: oddbyexample.rnc" + @echo " Only in $(AR)/: oddbyexample.xsd" + @echo " Only in $(AR)/: Pictures" + @echo " Only in $(AR)/: test34.combined.odd" + @echo " Only in $(AR)/: test_3.epub" + @echo " Only in $(AR)/: test3.html" + @echo " Only in $(AR)/: test4.html" + @echo " Only in $(AR)/: testoucscoursesp5.xml" + @echo " Only in $(AR)/: testoucscourses.xml.docx" + @echo " Only in $(AR)/: test-pages.epub" + @echo " Only in $(AR)/: test.processedodd" + @echo " Only in $(AR)/: xml.tmp" + +actual: + mkdir -p $(AR) + +test.rng: actual $(BINDIR)/teitorelaxng $(FLAGS) --odd test.odd test.rng - perl -i -p -e 's/generated from ODD source.*//' test.rng - xmllint --format test.rng > temp; mv temp test.rng - perl -i -pe 'BEGIN{undef $$/;} s/\n//smg' test30.dtd - $(JING) -c test30.rnc test36.xml - xmllint --noout --dtdvalid test30.dtd test36.xml - #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 + + $(BINDIR)/teitohtml5 $(FLAGS) --summaryDoc --odd test.odd $(AR)/test.odd.html + xmllint --encode utf-8 --format $(AR)/test.odd.html | perl cleanup.pl> test.temp ; mv test.temp $(AR)/test.odd.html + if [ $(DIFFNOW) -eq 1 ]; \ + then diff $(AR)/test.odd.html $(ER)/test.odd.html; fi + + $(BINDIR)/teitoodd $(FLAGS) test.odd $(AR)/test.processedodd + $(SAXON) $(AR)/test.processedodd ../odds/extract-isosch.xsl > $(AR)/test.isosch + perl -i -p -e 's/This file generated [0-9T:Z-]+ by .extract-isosch.xsl./DELETED TIMESTAMP/' $(AR)/test.isosch + if [ $(DIFFNOW) -eq 1 ]; \ + then diff $(AR)/test.isosch $(ER)/test.isosch; fi + + $(BINDIR)/teitornc $(FLAGS) test21.odd $(AR)/test21.odd.rnc + perl -p -i -e 's/generated from ODD source .*//' $(AR)/test21.odd.rnc + perl -i -pe 'BEGIN{undef $$/;} s/# ?Schema[^#]+#[^#]+#[^#]+#[^#]+#\n//smg' $(AR)/test21.odd.rnc + if [ $(DIFFNOW) -eq 1 ]; \ + then diff $(AR)/test21.odd.rnc $(ER)/test21.odd.rnc; fi + + $(BINDIR)/teitornc $(FLAGS) test15.odd $(AR)/test15.odd.rnc + perl -p -i -e 's/generated from ODD source .*//' $(AR)/test15.odd.rnc + perl -i -pe 'BEGIN{undef $$/;} s/# ?Schema[^#]+#[^#]+#[^#]+#[^#]+#\n//smg' $(AR)/test15.odd.rnc + if [ $(DIFFNOW) -eq 1 ]; \ + then diff $(AR)/test15.odd.rnc $(ER)/test15.odd.rnc; fi + + $(BINDIR)/teitohtml5 $(FLAGS) --summaryDoc --lang=es --profile=tei --odd test15.odd $(AR)/test15.odd.html + xmllint --encode utf-8 --format $(AR)/test15.odd.html | perl cleanup.pl> test.temp ; mv test.temp $(AR)/test15.odd.html + if [ $(DIFFNOW) -eq 1 ]; \ + then diff $(AR)/test15.odd.html $(ER)/test15.odd.html; fi + + $(SAXON) -it:main -xsl:../tools/oddbyexample.xsl corpus=`pwd`/bare | sed 's/

Derived from.*//' > $(AR)/oddbyexample.odd + if [ $(DIFFNOW) -eq 1 ]; \ + then diff $(AR)/oddbyexample.odd $(ER)/oddbyexample.odd; fi + $(BINDIR)/teitoxsd $(FLAGS) $(AR)/oddbyexample.odd $(AR)/oddbyexample.xsd + $(BINDIR)/teitornc $(FLAGS) $(AR)/oddbyexample.odd $(AR)/oddbyexample.rnc + $(BINDIR)/teitodtd $(FLAGS) $(AR)/oddbyexample.odd $(AR)/oddbyexample.dtd + $(JING) -c $(AR)/oddbyexample.rnc bare/test2.xml + $(JING) $(AR)/oddbyexample.xsd bare/test2.xml + xmllint --noout --dtdvalid $(AR)/oddbyexample.dtd bare/test2.xml + $(JING) -c $(AR)/oddbyexample.rnc bare/test.xml + $(JING) $(AR)/oddbyexample.xsd bare/test.xml + xmllint --noout --dtdvalid $(AR)/oddbyexample.dtd bare/test.xml + + $(SAXON) -s:testdrama.odd -xsl:../odds/odd2odd.xsl -o:$(AR)/testdrama.compiled.xml + perl -p -i -e 's+ xml:base=".*testdrama.odd"++' $(AR)/testdrama.compiled.xml + perl -i -pe 'BEGIN{undef $$/;} s/<\?TEIVERSION[^?]+\?>//smg' $(AR)/testdrama.compiled.xml + perl -i -pe 's+(schemaSpec.*source=")$(DEFAULTSOURCE)+$$1https://www.tei-c.org/Vault/P5/current/xml/tei/odd/p5subset.xml+' $(AR)/testdrama.compiled.xml + if [ $(DIFFNOW) -eq 1 ]; \ + then diff $(AR)/testdrama.compiled.xml $(ER)/testdrama.compiled.xml; fi + + $(BINDIR)/teitornc $(FLAGS) test30.odd $(AR)/test30.rnc + $(BINDIR)/teitodtd $(FLAGS) test30.odd $(AR)/test30.dtd + perl -p -i -e 's/generated from ODD source .*//' $(AR)/test30.rnc + perl -i -pe 'BEGIN{undef $$/;} s/# ?Schema[^#]+#[^#]+#[^#]+#[^#]+#\n//smg' $(AR)/test30.rnc + perl -p -i -e 's/generated from ODD source .*//' $(AR)/test30.dtd + perl -i -pe 'BEGIN{undef $$/;} s/\n//smg' $(AR)/test30.dtd + $(JING) -c $(AR)/test30.rnc test36.xml + xmllint --noout --dtdvalid $(AR)/test30.dtd test36.xml + if [ $(DIFFNOW) -eq 1 ]; \ + then diff $(AR)/test30.rnc $(ER)/test30.rnc; fi + if [ $(DIFFNOW) -eq 1 ]; \ + then diff $(AR)/test30.dtd $(ER)/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. @@ -419,98 +569,102 @@ test-oddity: css # perl -p -i -e 's/generated from ODD source .*//' testODD.rnc # perl -i -pe 'BEGIN{undef $$/;} s/# ?Schema[^#]+#[^#]+#[^#]+#[^#]+#\n//smg' testODD.rnc # diff against expected results. -# if [ $(REGENERATING) -ne 1 ]; \ -# then diff testODD.dtd expected-results/testODD.dtd; fi -# if [ $(REGENERATING) -ne 1 ]; \ -# then diff testODD.rnc expected-results/testODD.rnc; fi +# if [ $(DIFFNOW) -eq 1 ]; \ +# then diff testODD.dtd $(ER)/testODD.dtd; fi +# if [ $(DIFFNOW) -eq 1 ]; \ +# then diff testODD.rnc $(ER)/testODD.rnc; fi # NOTE: THERE SHOULD BE VALIDATION OF AN INSTANCE FILE AGAINST THE DTD HERE. # OLD ORIGINAL CODE STILL BEING USED FOR THE MOMENT. - $(BINDIR)/teitodtd $(FLAGS) test-pure.odd test-pure.dtd - $(BINDIR)/teitornc $(FLAGS) test-pure.odd test-pure.rnc - xmllint --noout --dtdvalid test-pure.dtd test-pure.xml - perl -p -i -e 's/generated from ODD source .*//' test-pure.dtd - perl -i -pe 'BEGIN{undef $$/;} s/\n//smg' test-pure.dtd - perl -p -i -e 's/generated from ODD source .*//' test-pure.rnc - perl -i -pe 'BEGIN{undef $$/;} s/# ?Schema[^#]+#[^#]+#[^#]+#[^#]+#\n//smg' test-pure.rnc - if [ $(REGENERATING) -ne 1 ]; \ - then diff test-pure.rnc expected-results/test-pure.rnc; fi - if [ $(REGENERATING) -ne 1 ]; \ - then diff test-pure.dtd expected-results/test-pure.dtd; fi - $(BINDIR)/teitohtml $(FLAGS) --odd test-pure.odd test-pure.odd.html - xmllint --encode utf-8 --format test-pure.odd.html | perl cleanup.pl> test.temp ; mv test.temp test-pure.odd.html - if [ $(REGENERATING) -ne 1 ]; \ - then diff test-pure.odd.html expected-results/test-pure.odd.html; fi - $(BINDIR)/teitodtd $(FLAGS) test-pure2.odd test-pure2.dtd - $(BINDIR)/teitornc $(FLAGS) test-pure2.odd test-pure2.rnc - $(BINDIR)/teitohtml $(FLAGS) --odd test-pure2.odd test-pure2.odd.html - xmllint --noout --dtdvalid test-pure2.dtd test-pure2.xml - xmllint --encode utf-8 --format test-pure2.odd.html | perl cleanup.pl> test.temp ; mv test.temp test-pure2.odd.html - perl -p -i -e 's/generated from ODD source .*//' test-pure2.dtd - perl -i -pe 'BEGIN{undef $$/;} s/\n//smg' test-pure2.dtd - perl -p -i -e 's/generated from ODD source .*//' test-pure2.rnc - perl -i -pe 'BEGIN{undef $$/;} s/# ?Schema[^#]+#[^#]+#[^#]+#[^#]+#\n//smg' test-pure2.rnc - if [ $(REGENERATING) -ne 1 ]; \ - then diff test-pure2.rnc expected-results/test-pure2.rnc; fi - if [ $(REGENERATING) -ne 1 ]; \ - then diff test-pure2.dtd expected-results/test-pure2.dtd; fi - if [ $(REGENERATING) -ne 1 ]; \ - then diff test-pure2.odd.html expected-results/test-pure2.odd.html; fi - $(SAXON) test.odd ../odds/odd2odd.xsl > test.odd2odd - $(SAXON) test.odd2odd ../odds/odd2dtd.xsl > test.odd2dtd - $(SAXON) test.odd2odd ../odds/odd2html.xsl > test.odd2html - $(SAXON) test.odd2odd ../odds/odd2json.xsl > test.odd2json - $(SAXON) test.odd2odd ../odds/odd2lite.xsl > test.odd2lite - $(SAXON) test.odd2odd ../odds/odd2relax.xsl > test.odd2relax - $(SAXON) test.odd2odd ../odds/odd2xslstripspace.xsl > test.odd2xslstripspace - rm test.odd2odd - rm test.odd2dtd - rm test.odd2html - rm test.odd2json - rm test.odd2lite - rm test.odd2relax - rm test.odd2xslstripspace - -moreoddity: - $(BINDIR)/teitoxsd $(FLAGS) test.odd test.xsd - $(BINDIR)/teitodtd $(FLAGS) test.odd test.dtd - $(BINDIR)/teitornc $(FLAGS) test.odd test.rnc - -test-namespaces: + $(BINDIR)/teitodtd $(FLAGS) test-pure.odd $(AR)/test-pure.dtd + $(BINDIR)/teitornc $(FLAGS) test-pure.odd $(AR)/test-pure.rnc + xmllint --noout --dtdvalid $(AR)/test-pure.dtd test-pure.xml + perl -p -i -e 's/generated from ODD source .*//' $(AR)/test-pure.dtd + perl -i -pe 'BEGIN{undef $$/;} s/\n//smg' $(AR)/test-pure.dtd + perl -p -i -e 's/generated from ODD source .*//' $(AR)/test-pure.rnc + perl -i -pe 'BEGIN{undef $$/;} s/# ?Schema[^#]+#[^#]+#[^#]+#[^#]+#\n//smg' $(AR)/test-pure.rnc + if [ $(DIFFNOW) -eq 1 ]; \ + then diff $(AR)/test-pure.rnc $(ER)/test-pure.rnc; fi + if [ $(DIFFNOW) -eq 1 ]; \ + then diff $(AR)/test-pure.dtd $(ER)/test-pure.dtd; fi + $(BINDIR)/teitohtml $(FLAGS) --odd test-pure.odd $(AR)/test-pure.odd.html + xmllint --encode utf-8 --format $(AR)/test-pure.odd.html | perl cleanup.pl> test.temp ; mv test.temp $(AR)/test-pure.odd.html + if [ $(DIFFNOW) -eq 1 ]; \ + then diff $(AR)/test-pure.odd.html $(ER)/test-pure.odd.html; fi + + $(BINDIR)/teitodtd $(FLAGS) test-pure2.odd $(AR)/test-pure2.dtd + $(BINDIR)/teitornc $(FLAGS) test-pure2.odd $(AR)/test-pure2.rnc + $(BINDIR)/teitohtml $(FLAGS) --odd test-pure2.odd $(AR)/test-pure2.odd.html + xmllint --noout --dtdvalid $(AR)/test-pure2.dtd test-pure2.xml + xmllint --encode utf-8 --format $(AR)/test-pure2.odd.html | perl cleanup.pl> test.temp ; mv test.temp $(AR)/test-pure2.odd.html + perl -p -i -e 's/generated from ODD source .*//' $(AR)/test-pure2.dtd + perl -i -pe 'BEGIN{undef $$/;} s/\n//smg' $(AR)/test-pure2.dtd + perl -p -i -e 's/generated from ODD source .*//' $(AR)/test-pure2.rnc + perl -i -pe 'BEGIN{undef $$/;} s/# ?Schema[^#]+#[^#]+#[^#]+#[^#]+#\n//smg' $(AR)/test-pure2.rnc + if [ $(DIFFNOW) -eq 1 ]; \ + then diff $(AR)/test-pure2.rnc $(ER)/test-pure2.rnc; fi + if [ $(DIFFNOW) -eq 1 ]; \ + then diff $(AR)/test-pure2.dtd $(ER)/test-pure2.dtd; fi + if [ $(DIFFNOW) -eq 1 ]; \ + then diff $(AR)/test-pure2.odd.html $(ER)/test-pure2.odd.html; fi + + $(SAXON) test.odd ../odds/odd2odd.xsl > $(AR)/test.odd2odd + $(SAXON) $(AR)/test.odd2odd ../odds/odd2dtd.xsl > $(AR)/test.odd2dtd + $(SAXON) $(AR)/test.odd2odd ../odds/odd2html.xsl > $(AR)/test.odd2html + $(SAXON) $(AR)/test.odd2odd ../odds/odd2json.xsl > $(AR)/test.odd2json + $(SAXON) $(AR)/test.odd2odd ../odds/odd2lite.xsl > $(AR)/test.odd2lite + $(SAXON) $(AR)/test.odd2odd ../odds/odd2relax.xsl > $(AR)/test.odd2relax + $(SAXON) $(AR)/test.odd2odd ../odds/odd2xslstripspace.xsl > $(AR)/test.odd2xslstripspace + rm $(AR)/test.odd2odd + rm $(AR)/test.odd2dtd + rm $(AR)/test.odd2html + rm $(AR)/test.odd2json + rm $(AR)/test.odd2lite + rm $(AR)/test.odd2relax + rm $(AR)/test.odd2xslstripspace + +moreoddity: actual + $(BINDIR)/teitoxsd $(FLAGS) test.odd $(AR)/test.xsd + $(BINDIR)/teitodtd $(FLAGS) test.odd $(AR)/test.dtd + $(BINDIR)/teitornc $(FLAGS) test.odd $(AR)/test.rnc + +test-namespaces: actual @echo BUILD: testing namespaces # This test checks the rnc files so that to make sure we are testing # what we think we are testing. - $(BINDIR)/teitornc $(FLAGS) test33.odd test33.rnc - perl -p -i -e 's/generated from ODD source .*//' test33.rnc - perl -i -pe 'BEGIN{undef $$/;} s/# ?Schema[^#]+#[^#]+#[^#]+#[^#]+#\n//smg' test33.rnc - 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 - if [ $(REGENERATING) -ne 1 ]; \ - then diff test33.json expected-results/test33.json; fi - $(BINDIR)/teitornc $(FLAGS) test34.odd test34.rnc - perl -p -i -e 's/generated from ODD source .*//' test34.rnc - perl -i -pe 'BEGIN{undef $$/;} s/# ?Schema[^#]+#[^#]+#[^#]+#[^#]+#\n//smg' test34.rnc - 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 - 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 - if [ $(REGENERATING) -ne 1 ]; \ - then diff test34.combined.json expected-results/test34.combined.json; fi - $(BINDIR)/teitohtml $(FLAGS) --odd --summaryDoc test34.odd test34.odd.html - xmllint --encode utf-8 --format test34.odd.html | perl cleanup.pl> test.temp ; mv test.temp test34.odd.html - if [ $(REGENERATING) -ne 1 ]; \ - then diff test34.odd.html expected-results/test34.odd.html; fi - $(BINDIR)/teitornc $(FLAGS) test35.odd test35.rnc - perl -p -i -e 's/generated from ODD source .*//' test35.rnc - perl -i -pe 'BEGIN{undef $$/;} s/# ?Schema[^#]+#[^#]+#[^#]+#[^#]+#\n//smg' test35.rnc - if [ $(REGENERATING) -ne 1 ]; \ - then diff test35.rnc expected-results/test35.rnc; fi + $(BINDIR)/teitornc $(FLAGS) test33.odd $(AR)/test33.rnc + perl -p -i -e 's/generated from ODD source .*//' $(AR)/test33.rnc + perl -i -pe 'BEGIN{undef $$/;} s/# ?Schema[^#]+#[^#]+#[^#]+#[^#]+#\n//smg' $(AR)/test33.rnc + if [ $(DIFFNOW) -eq 1 ]; \ + then diff $(AR)/test33.rnc $(ER)/test33.rnc; fi + $(SAXON) test33.odd ../odds/odd2json.xsl > $(AR)/test33.json + perl -p -i -e 's/"date" : "\d+-\d+\-\d+T\d+:\d+:\d+Z",//' $(AR)/test33.json + if [ $(DIFFNOW) -eq 1 ]; \ + then diff $(AR)/test33.json $(ER)/test33.json; fi + + $(BINDIR)/teitornc $(FLAGS) test34.odd $(AR)/test34.rnc + perl -p -i -e 's/generated from ODD source .*//' $(AR)/test34.rnc + perl -i -pe 'BEGIN{undef $$/;} s/# ?Schema[^#]+#[^#]+#[^#]+#[^#]+#\n//smg' $(AR)/test34.rnc + if [ $(DIFFNOW) -eq 1 ]; \ + then diff $(AR)/test34.rnc $(ER)/test34.rnc; fi + $(SAXON) test34.odd ../odds/odd2json.xsl > $(AR)/test34.json + perl -p -i -e 's/"date" : "\d+-\d+\-\d+T\d+:\d+:\d+Z",//' $(AR)/test34.json + if [ $(DIFFNOW) -eq 1 ]; \ + then diff $(AR)/test34.json $(ER)/test34.json; fi + $(SAXON) test34.odd ../odds/odd2odd.xsl > $(AR)/test34.combined.odd + $(SAXON) $(AR)/test34.combined.odd ../odds/odd2json.xsl > $(AR)/test34.combined.json + perl -p -i -e 's/"date" : "\d+-\d+\-\d+T\d+:\d+:\d+Z",//' $(AR)/test34.combined.json + if [ $(DIFFNOW) -eq 1 ]; \ + then diff $(AR)/test34.combined.json $(ER)/test34.combined.json; fi + $(BINDIR)/teitohtml $(FLAGS) --odd --summaryDoc test34.odd $(AR)/test34.odd.html + xmllint --encode utf-8 --format $(AR)/test34.odd.html | perl cleanup.pl> test.temp ; mv test.temp $(AR)/test34.odd.html + if [ $(DIFFNOW) -eq 1 ]; \ + then diff $(AR)/test34.odd.html $(ER)/test34.odd.html; fi + + $(BINDIR)/teitornc $(FLAGS) test35.odd $(AR)/test35.rnc + perl -p -i -e 's/generated from ODD source .*//' $(AR)/test35.rnc + perl -i -pe 'BEGIN{undef $$/;} s/# ?Schema[^#]+#[^#]+#[^#]+#[^#]+#\n//smg' $(AR)/test35.rnc + if [ $(DIFFNOW) -eq 1 ]; \ + then diff $(AR)/test35.rnc $(ER)/test35.rnc; fi test-scripts: for i in $(SCRIPTS); do $(BINDIR)/$$i $(FLAGS) maria.xml $$i.result && rm $$i.result; done @@ -554,26 +708,10 @@ profile: clean: (cd ..; for i in css/*; do rm -f `basename $$i`;done) - rm -f test*.odd.rnc test*epub test*pdf test*rdf test*text test*.xml.docx test*.xml.odt test*.tex test*.fo *.html *.xhtml *~ dummy* test.html test3.html test4.html *aux *vrb *out *log *nav *ent *snm *toc *.end *.1 *.2 test.xsd test.zip test*.dtd test-indexes.xml test37.xml test38.xml test39.xml test40.xml - rm -f test*.rnc test*.json test*.rnc test*.combined.odd test*listing* test*.tei test*.rng test*.html5 test*.processedodd *.isosch - rm -f oddbyexample.* index*div*html - rm -f testdrama.compiled.xml - rm -f test5.odt test7.xml test18.xml test19.xml test-index.xml test7.zip test11.xml test11a.xml test9.docx test9.odt content.xml.odt.listing content.xml.odt test.xml.docx.core test7.docx hyperlinktest.xml - rm -f A54031.xml dcr.result test-rtf2tei.xml test29.xml dcr.tmp xml.tmp - rm -f xml.result - rm -rf charts/ embeddings/ media/ _rels/ \[Content_Types\].xml - rm -rf temp-dir-for-ant Pictures OEBPS META-INF mimetype files - rm -f test.xlsx.xml *.result.tex *.result.pdf _slidelogo.png - rm -f content.xml - rm -f cocoatest*.xml + rm -f teitopdf.result.* test*.xml.docx *~ + rm -f dcr.tmp xml.tmp + rm -fr $(AR)/ charts/ embeddings/ media/ Pictures/ oddtree: $(SAXON) -s:http://www.tei-c.org/release/xml/tei/odd/p5subset.xml -xsl:../tools/odd-to-tree.xsl -o:oddtree.xml ../bin/teitohtml --profile=oxford oddtree.xml oddtree.html - -regenerate: - mkdir new-expected-results - cd expected-results - for f in *; do echo $f; cp ../$f ../new-expected-results; done - cd .. - diff new-expected-results expected-results diff --git a/Test/expected-results/content.xml.odt b/Test/expected-results/content.xml.odt deleted file mode 100644 index 7fbac9e74..000000000 --- a/Test/expected-results/content.xml.odt +++ /dev/null @@ -1,760 +0,0 @@ - - - - - - - - - - - - - - - - - - - - (half title note) - The Original Edition of A CHRISTMAS CAROL has been out of print for many years, and this Edition is a reprint from the stereotype plates of that Edition. - A Christmas carol. in prose. - being A Ghost Story of Christmas - by Charles Dickens. - With illustrations by John Leech - London: Chapman and Hall, Ltd. 1893. - PREFACE - I have endeavoured in this Ghostly little book, to raise the Ghost of an Idea, which shall not put my readers out of humour with themselves, with each other, with the season, or with me. May it haunt their houses pleasantly, and no one wish to lay it. - Their faithful Friend and Servant, C.D. December, 1843. - Contents. - Stave I - Marley's ghost 1 - Stave II - The first of the three spirits - Stave III - The second of the three spirits - Stave IV - The last of the spirits - Stave V - The end of it - (Bits of) A CHRISTMAS CAROL, and other things - Simple rendition tests - Who-e debel you? — he at last said — you no speak-e, damme, I kill-e. And so saying, the lighted tomahawk began flourishing about me in the dark. - Who-e debel you? — he at last said — you no speak-e, damme, I kill-e. And so saying, the lighted tomahawk began flourishing about me in the dark. - - - - - - - Effect - - - Example - - - - - - hi - - - This is hi rend="special" tag - - - - - emph - - - This is emph tag - - - - - hi - - - This is hi tag - - - - - typewriter - - - This is typewriter effect - - - - - bold - - - This is bold effect - - - - - normalweight - - - This is normalweight effect - - - - - smallcaps - - - This is smallcaps effect - - - - - capsall - - - This is capsall effect - - - - - strikethrough - - - This is strikethrough effect - - - - - strikedoublethrough - - - This is strikedoublethrough effect - - - - - color(red) - - - This is color(red) effect - - - - - underline - - - This is underline effect - - - - - underwavyline - - - This is underwavyline effect - - - - - underdoubleline - - - This is underdoubleline effect - - - - - subscript - - - This is subscript effect - - - - - superscript - - - This is superscript effect - - - - - bold italic red, done separately - - - - - - rend test 1 - - - - - - - - bold italic smallcaps - - - - rend test 1 - - 1 - - Cairns 2003: 11. My work is Muellner 1996. - - - - - - - Quotations - A paragraph with a footnote containing a block-level object2We start with a quotation:This is the way the world endsThis is the way the world endsThis is the way the world endsNot with a bang but a whimper.which is from TS Eliot's Hollow men - Consider quotations: ‘This is a quote which is run on within the text and will have quote marks of some kind around it.’ - Another quotation: - This is a block quote set off as such from the rest of the text - Here, by contrast is an ‘inline quotation’. Another strange thing about quotes is this: - You can put line breaksto determine where the line breaksInside a block! - Use of xml:lang - He used a French radiateur. - Languages: Deutsch; Italiano; Español; Français; Portugues; Russian; Svenska; 日本語; 中文. - del, gap, add, unclear etc - [...]. The interest & — affor [...] the amount over so small the interest afforded compared with cash, [...] by the Annuity note paper to those who tutor think it, or keep it, with a view to circulation, will, when compared with cash be it ever so small be so much profit: compared with a the preceding higher rate of interest, the reduced rate afforded by the Annuity note paper, to those who, tutor if they tutor it, will, have to depend upon to the extent of their respective capitals so invested, have nothing else to depend upon for their respective incomes, will, [...] by the amount of the difference, foremost itself as so much less. - Drama - Roderigo - Where shall we meet i' the morning? - Iago - At my lodging. - Roderigo - I'll be with thee betimes. - Iago - Go to; farewell. Do you hear, Roderigo? - Roderigo - What say you? - Iago - No more of drowning, do you hear? - Roderigo - I am changed: I'll go sell all my land. - Footnotes - 1 Zur Entstehung der Philosophischen Untersuchungen3Zu Textauszeichnungen und Siglen siehe die Legende. - Iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod 4Zu Textauszeichnungen und Siglen siehe die Legende. Iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod - emph and links - The <emph> element is used for linguistic emphasis. ‘highlighting’ (<soCalled>) nor with shouting (<mentioned>), transmogrification, (a technical <term>), for which the <gloss> tag might be used to supply a technical definition). - Now for some links! We will start by cross-referring to a later section. - Here is a simple <ptr> to it: 9. Lists. Here is a simple <ref>, a reference to it. - An external link as ref and as ptr: http://www.bbc.co.uk. - Tables - Tables may have cells that span multiple columns and rows. - - - - - - - - Image - - - Description - - - Camera direction - - - - - - SVG, JPEG, GIF or PNG format - - - - - - All pictures were taken on Jun 27, 2007 - - - - - - - - - - - - - - Mountain flowers. - - - north - - - - - - - - - - - - Sunset over a secondary ridge. - - - north-east - - - - - - - - - - - - Glacier lake at 2100m altitude. - - - east - - - - Pictures from Fagaras mountains - - - - - - - - - - Spans Horizontally - - - - Header 3 - - - Spans Horizontally - - - - - - - Spans Vertically - - - a - - - b - - - c - - - d - - - - - e - - - Spans both - - - - f - - - - - g - - - g - - - - - i - - - j - - - Spans Horizontally - - - - - - k - - - l - - - m - - - n - - - o - - - - - TEI Span Sample - - Lists - Various sorts of list are legal within paragraphs, and you can reference items in lists... - - - Dogs - - - Zebras - - - Birds - - - Cats - - - - 100 - first item - 200 - second item - 300 - third item - The preceding lists was between paragraphs. - - This untyped list has a heading and a nested glosslist - - - first item - - - 25 - first item - 35 - second item - 45 - third item - - - third item - - - - Pictures - - - - - - - - - - - - - - - - width="2.5in" - - - - - - - - - - - - width=".5in" - - - - - - - - - - - - scale=".5" - - - - - - - - - - - - width="1in" - - - - - - - - - - - - width="1in" style="border:solid green 2pt" - - - - - - - - - - - - height="1in" - - - - - - - - - - - - height="1in" width="2in" - - - - - - - - - - - - height="2in" width="1in" - - - - - - - - - - - - width="10%" - - - - - - - - - - - - height="10%" width="10%" - - - - - - - - - - - MS catalogue - - Identification - - where is it, repository name, identifier - Extended prose: MARLEY'S GHOST - - Marley was dead: to begin with. There is no doubt whatever about that. The register of his burial was signed by the clergyman, the clerk, the undertaker, and the chief mourner. Scrooge signed it. And Scrooge's name was good upon 'Change, for anything he chose to put his hand to. Old Marley was as dead as a door-nail. - Mind! I don't mean to say that I know, of my own knowledge, what there is particularly dead about a door-nail. I might have been inclined, myself, to regard a coffin-nail as the deadest piece of ironmongery in the trade. But the wisdom of our ancestors is in the simile; and my unhallowed - - hands shall not disturb it, or the Country's done for. You will therefore permit me to repeat, emphatically, that Marley was as dead as a door-nail. - Scrooge knew he was dead? Of course he did. How could it be otherwise? Scrooge and he were partners for I don't know how many years. Scrooge was his sole executor, his sole administrator, his sole assign, his sole residuary legatee, his sole friend, and sole mourner. And even Scrooge was not so dreadfully cut up by the sad event, but that he was an excellent man of business on the very day of the funeral, and solemnised it with an undoubted bargain. - The mention of Marley's funeral brings me back to the point I started from. There is no doubt that Marley was dead. This must be distinctly understood, or nothing wonderful can come of the story I am going to relate. If we were not perfectly convinced that Hamlet's Father died before the play began, there would be nothing more remarkable in his taking a stroll at night, in an easterly wind, upon his own ramparts, than there - - would be in any other middle-aged gentleman rashly turning out after dark in a breezy spot — say Saint Paul's Churchyard for instance — literally to astonish his son's weak mind. - Scrooge never painted out Old Marley's name. There it stood, years afterwards, above the ware-house door: Scrooge and Marley. The firm was known as Scrooge and Marley. Sometimes people new to the business called Scrooge Scrooge, and sometimes Marley, but he answered to both names. It was all the same to him. - Oh! But he was a tight-fisted hand at the grindstone, Scrooge! a squeezing, wrenching, grasping, scraping, clutching, covetous old sinner! Hard and sharp as flint, from which no steel had ever struck out generous fire; secret, and self-contained, and solitary as an oyster. The cold within him froze his old features, nipped his pointed nose, shrivelled his cheek, stiffened his gait; made his eyes red, his thin lips blue; and spoke out shrewdly in his grating voice. A frosty rime was on his head, and on his eyebrows, and his wiry chin. He - - carried his own low temperature always about with him; he iced his office in the dog-days; and didn't thaw it one degree at Christmas. - External heat and cold had little influence on Scrooge. No warmth could warm, no wintry weather chill him. No wind that blew was bitterer than he, no falling snow was more intent upon its purpose, no pelting rain less open to entreaty. Foul weather didn't know where to have him. The heaviest rain, and snow, and hail, and sleet, could boast of the advantage over him in only one respect. They often ‘came down’ handsomely, and Scrooge never did. - Nobody ever stopped him in the street to say, with gladsome looks, My dear Scrooge, how are you. When will you come to see me. No beggars implored him to bestow a trifle, no children asked him what it was o'clock, no man or woman ever once in all his life inquired the way to such and such a place, of Scrooge. Even the blindmen's dogs appeared to know him; and when they saw him coming on, would tug their owners into doorways - - and up courts; and then would wag their tails as though they said, No eye at all is better than an evil eye, dark master! - But what did Scrooge care! It was the very thing he liked. To edge his way along the crowded paths of life, warning all human sympathy to keep its distance, was what the knowing ones call ‘nuts’ to Scrooge. - Once upon a time — of all the good days in the year, on Christmas Eve — old Scrooge sat busy in his counting-house. It was cold, bleak, biting weather: foggy withal: and he could hear the people in the court outside, go wheezing up and down, beating their hands upon their breasts, and stamping their feet upon the pavement stones to warm them. The city clocks had only just gone three, but it was quite dark already: it had not been light all day: and candles were flaring in the windows of the neighbouring offices, like ruddy smears upon the palpable brown air. The fog came pouring in at every chink and keyhole, and was so dense without, that although the court was of the - - narrowest, the houses opposite were mere phantoms. To see the dingy cloud come drooping down, obscuring everything, one might have thought that Nature lived hard by, and was brewing on a large scale. - The door of Scrooge's counting-house was open that he might keep his eye upon his clerk, who in a dismal little cell beyond, a sort of tank, was copying letters. Scrooge had a very small fire, but the clerk's fire was so very much smaller that it looked like one coal. But he couldn't replenish it, for Scrooge kept the coal-box in his own room; and so surely as the clerk came in with the shovel, the master predicted that it would be necessary for them to part. Wherefore the clerk put on his white comforter, and tried to warm himself at the candle; in which effort, not being a man of a strong imagination, he failed. - A merry Christmas, uncle! God save you! cried a cheerful voice. It was the voice of Scrooge's nephew, who came upon him so quickly that this was the first intimation he had of his approach. - - - Bah! said Scrooge, Humbug! - He had so heated himself with rapid walking in the fog and frost, this nephew of Scrooge's, that he was all in a glow; his face was ruddy and handsome; his eyes sparkled, and his breath smoked again. - Christmas a humbug, uncle! said Scrooge's nephew. You don't mean that, I am sure. - I do, said Scrooge. Merry Christmas! What right have you to be merry? what reason have you to be merry? You're poor enough. - Come, then, returned the nephew gaily. What right have you to be dismal? what reason have you to be morose? You're rich enough. - Scrooge having no better answer ready on the spur of the moment, said, Bah! again; and followed it up with Humbug. - Don't be cross, uncle, said the nephew. - What else can I be, returned the uncle, when I live in such a world of fools as this Merry Christmas! Out upon merry Christmas. What's Christmas time to you but a time for paying bills without money; a time for finding yourself a year older, but not an hour richer; a time for balancing your books and having every item in 'em through a round dozen of months presented dead against you? If I could work my will, said Scrooge indignantly, every idiot who goes about with Merry Christmas on his lips, should be boiled with his own pudding, and buried with a stake of holly through his heart. He should! - Uncle! pleaded the nephew. - Nephew! returned the uncle, sternly, keep Christmas in your own way, and let me keep it in mine. - Keep it! repeated Scrooge's nephew. But you don't keep it. - Let me leave it alone, then, said Scrooge. Much good may it do you! Much good it has ever done you! - There are many things from which I might have derived good, by which I have not profited, I dare say, returned the nephew: Christmas among the rest. But I am sure I have always thought of Christmas time, when it has come round — apart from the veneration due to its sacred name and origin, if anything belonging to it can be apart from that — as a good time: a kind, forgiving, charitable, pleasant time: the only time I know of, in the long calendar of the year, when men and women seem by one consent to open their shut-up hearts freely, and to think of people below them as if they really were fellow-passengers to the grave, and not another race of creatures bound on other journeys. And therefore, uncle, though it has never put a scrap of gold or silver in my pocket, I believe that it has done me good, and will do me good; and I say, God bless it! - The clerk in the tank involuntarily applauded. Becoming immediately sensible of the impropriety, he poked the fire, and extinguished the last frail spark for ever. - Let me hear another sound from you, said Scrooge, and you'll keep your Christmas by losing your situation. You're quite a powerful speaker, sir, he added, turning to his nephew. I wonder you don't go into Parliament. - - - Don't be angry, uncle. Come! Dine with us to-morrow. - Scrooge said that he would see him — yes, indeed he did. He went the whole length of the expression, and said that he would see him in that extremity first. - But why? cried Scrooge's nephew. Why? - Why did you get married? said Scrooge. - Because I fell in love. - Because you fell in love! growled Scrooge, as if that were the only one thing in the world more ridiculous than a merry Christmas. Good afternoon! - Nay, uncle, but you never came to see me before that happened. Why give it as a reason for not coming now? - Good afternoon, said Scrooge. - I want nothing from you; I ask nothing of you; why cannot we be friends? - Good afternoon, said Scrooge. - I am sorry, with all my heart, to find you so resolute. We have never had any quarrel, to which I have been a party. But I have made the trial in homage to Christmas, and I'll keep my Christmas humour to the last. So A Merry Christmas, uncle! - Good afternoon! said Scrooge. - And A Happy New Year! - Good afternoon! said Scrooge. - His nephew left the room without an angry word, notwithstanding. He stopped at the outer door to bestow the greeting of the season on the clerk, who, cold as he was, was warmer than Scrooge; for he returned them cordially. - There's another fellow, muttered Scrooge; who overheard him: my clerk, with fifteen shillings a week, and a wife and family, talking about a merry Christmas. I'll retire to Bedlam. - This lunatic, in letting Scrooge's nephew out, had let two other people in. They were portly gentlemen, pleasant to behold, and now stood, with their hats off, in Scrooge's office. They had books and papers in their hands, and bowed to him. - Scrooge and Marley's, I believe, said one of the - - gentlemen, referring to his list. Have I the pleasure of addressing Mr Scrooge, or Mr Marley? - Mr Marley has been dead these seven years, Scrooge replied. He died seven years ago, this very night. - We have no doubt his liberality is well represented by his surviving partner, said the gentleman, presenting his credentials. - It certainly was; for they had been two kindred spirits. At the ominous word liberality, Scrooge frowned, and shook his head, and handed the credentials back. - At this festive season of the year, Mr Scrooge, said the gentleman, taking up a pen, it is more than usually desirable that we should make some slight provision for the Poor and destitute, who suffer greatly at the present time. Many thousands are in want of common necessaries; hundreds of thousands are in want of common comforts, sir. - Are there no prisons? asked Scrooge. - Plenty of prisons, said the gentleman, laying down the pen again. - - - And the Union workhouses? demanded Scrooge. Are they still in operation? - They are. Still, returned the gentleman, I wish I could say they were not. - The Treadmill and the Poor Law are in full vigour, then? said Scrooge. - Both very busy, sir. - Oh! I was afraid, from what you said at first, that something had occurred to stop them in their useful course, said Scrooge. I'm very glad to hear it. - Under the impression that they scarcely furnish Christian cheer of mind or body to the multitude, returned the gentleman, a few of us are endeavouring to raise a fund to buy the Poor some meat and drink, and means of warmth. We choose this time, because it is a time, of all others, when Want is keenly felt, and Abundance rejoices. What shall I put you down for? - Nothing! Scrooge replied. - You wish to be anonymous? - I wish to be left alone, said Scrooge. Since you ask me what I wish, gentlemen, that is my answer. I don't make merry myself at Christmas and I can't afford to make idle people merry. I help to support the establishments I have mentioned: they cost enough: and those who are badly off must go there. - Many can't go there; and many would rather die. - If they would rather die, said Scrooge, they had better do it, and decrease the surplus population. Besides — excuse me — I don't know that. - But you might know it, observed the gentleman. - It's not my business, Scrooge returned. It's enough for a man to understand his own business, and not to interfere with other people's. Mine occupies me constantly. Good afternoon, gentlemen! - Seeing clearly that it would be useless to pursue their point, the gentlemen withdrew. Scrooge resumed his labours with an improved opinion of himself, and in a more facetious temper than was usual with him. - - - Foggier yet, and colder! Piercing, searching, biting cold. If the good Saint Dunstan had but nipped the Evil Spirit's nose with a touch of such weather as that, [Note: test of a note] instead of using his familiar weapons, then indeed he would have roared to lusty purpose. The owner of one scant young nose, gnawed and mumbled by the hungry cold as bones are gnawed by dogs, stooped down at Scrooge's keyhole to regale him with a Christmas carol: but at the first sound of - God bless you, merry gentleman! - May nothing you dismay! - Scrooge seized the ruler with such energy of action - - that the singer fled in terror, leaving the keyhole to the fog and even more congenial frost. - Linking - - http://www.bbc.co.uk - - - https://staff.oucs.ox.ac.uk - - foo - - Fred - - - Jones 76 - - Testing preservation of ID - Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet. With references to - - - Quotation - - - Citation - - - Paragraph - - - Reference - - - Anchor - - - Title - - - - I wonder what are the xml-ids preserved in a transformation to XHTML, in particular in the case of quotations. So, let’s try : - Something longer. Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet. - In Somewhere. - Choice, sic, corr, reg, orig - voro þav sammędd syskin in heilagri olafr konvngr ok fyrnefnd [gvnnhilldr]. - Lastly, That, upon his solemn oath to observe all the above articles, the said man-mountain shall have a daily allowance of meat and drink sufficient for the support of [1728] of our subjects, with free access to our royal person, and other marks of our favor. - Verbatim - an egXML in a list: - - - <div xml:id="test99" rend="whatever"> -  <head>Choice, sic, corr, reg, orig</head> -  <p>v<ex>oro</ex> þav sam<ex>m</ex>ędd syskin in -    hei<ex>lagr</ex>i <lb/> ol<ex>afr</ex> k<ex>onvng</ex>r -  <ex>ok</ex> fyrnefnd -  <choice> -    <sic>gvn<ex>n</ex>hillde</sic> -    <corr>gvn<ex>n</ex>hilldr</corr> -   </choice>.</p> - </div> - - - - - - diff --git a/Test/expected-results/mdtest1.md.xml b/Test/expected-results/mdtest1.md.xml deleted file mode 100644 index 34a759a03..000000000 --- a/Test/expected-results/mdtest1.md.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - </titleStmt> - <publicationStmt> - <p>from markdown</p> - </publicationStmt> - <sourceDesc> - <p>new born</p> - </sourceDesc> - </fileDesc> - </teiHeader> - <text> - <body> - <p>Paragraphs are separated by a blank line.</p> - <p>2nd paragraph. <hi rend="italic">Italic</hi>, <hi rend="bold">bold</hi>, <code>monospace</code>, <del>deleted</del>. Itemized lists</p> - <p>look like:</p> - <list type="unordered"> - <item>this one</item> - <item>that one</item> - <item>the other one</item> - </list> - <p>3rd paragraph. <hi rend="italic">Italic</hi>, <hi rend="bold">bold</hi>, <code>monospace</code>. Itemized lists</p> - <p>Note that --- not considering the asterisk --- the actual text</p> - <p>content starts at 4-columns in.</p> - <q> - <p> Block quotes are</p> - <p> written like so.</p> - <p> They can span multiple paragraphs,</p> - <p> if you like.</p> - </q> - <eg> - <l>Block of code indented</l> - <l>written like so.</l> - <l>They can span multiple paragraphs,</l> - <l>End of indented code</l> - </eg> - <eg> - <p>Blocks of FENCED code</p> - <p>written like so.</p> - <p>End of of fenced code</p> - </eg> - <p>http://github.org</p> - <div> - <head>An h2 header</head> - </div> - <div> - <head>Another h2 header</head> - <div> - <head>Another h3 header</head> - <p>Note again how the actual text starts at 4 columns in (4 characters</p> - <p>from the left side). Here's a code sample:</p> - <eg> - <l># Let me re-iterate ...</l> - <l>for i in 1 .. 10 { do-something(i) }</l> - </eg> - <p>As you probably guessed, indented 4 spaces. By the way, instead of</p> - <p>Indenting the block, you can use delimited blocks see link <ref target="www.github.com">Visit GitHub!</ref> , if you like.</p> - <p>Done.</p> - </div> - </div> - </body> - </text> -</TEI> diff --git a/Test/expected-results/mdtest1.tei b/Test/expected-results/mdtest1.tei deleted file mode 100644 index 34a759a03..000000000 --- a/Test/expected-results/mdtest1.tei +++ /dev/null @@ -1,66 +0,0 @@ -<TEI xmlns="http://www.tei-c.org/ns/1.0"> - <teiHeader> - <fileDesc> - <titleStmt> - <title/> - </titleStmt> - <publicationStmt> - <p>from markdown</p> - </publicationStmt> - <sourceDesc> - <p>new born</p> - </sourceDesc> - </fileDesc> - </teiHeader> - <text> - <body> - <p>Paragraphs are separated by a blank line.</p> - <p>2nd paragraph. <hi rend="italic">Italic</hi>, <hi rend="bold">bold</hi>, <code>monospace</code>, <del>deleted</del>. Itemized lists</p> - <p>look like:</p> - <list type="unordered"> - <item>this one</item> - <item>that one</item> - <item>the other one</item> - </list> - <p>3rd paragraph. <hi rend="italic">Italic</hi>, <hi rend="bold">bold</hi>, <code>monospace</code>. Itemized lists</p> - <p>Note that --- not considering the asterisk --- the actual text</p> - <p>content starts at 4-columns in.</p> - <q> - <p> Block quotes are</p> - <p> written like so.</p> - <p> They can span multiple paragraphs,</p> - <p> if you like.</p> - </q> - <eg> - <l>Block of code indented</l> - <l>written like so.</l> - <l>They can span multiple paragraphs,</l> - <l>End of indented code</l> - </eg> - <eg> - <p>Blocks of FENCED code</p> - <p>written like so.</p> - <p>End of of fenced code</p> - </eg> - <p>http://github.org</p> - <div> - <head>An h2 header</head> - </div> - <div> - <head>Another h2 header</head> - <div> - <head>Another h3 header</head> - <p>Note again how the actual text starts at 4 columns in (4 characters</p> - <p>from the left side). Here's a code sample:</p> - <eg> - <l># Let me re-iterate ...</l> - <l>for i in 1 .. 10 { do-something(i) }</l> - </eg> - <p>As you probably guessed, indented 4 spaces. By the way, instead of</p> - <p>Indenting the block, you can use delimited blocks see link <ref target="www.github.com">Visit GitHub!</ref> , if you like.</p> - <p>Done.</p> - </div> - </div> - </body> - </text> -</TEI> diff --git a/Test/expected-results/test-pure.odd.html b/Test/expected-results/test-pure.odd.html index 9fcb23e12..e37c5c2c6 100644 --- a/Test/expected-results/test-pure.odd.html +++ b/Test/expected-results/test-pure.odd.html @@ -172,14 +172,14 @@ <h3> <span lang="en" class="label">Content model</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg cdata"> + <pre id="index.xml-eg-d30e104" class="pre_eg cdata"> <content>  <alternate minOccurs="1" maxOccurs="1">   <textNode/>   <elementRef key="bob" maxOccurs="1"/>  </alternate> </content> - </pre> + <a href="#index.xml-eg-d30e104" class="anchorlink">⚓</a></pre> </td> </tr> <tr> @@ -187,8 +187,8 @@ <h3> <span lang="en" class="label">Schema Declaration</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg"> -element bit { text | <a class="link_ref" href="#TEI.bob" title="<bob>">bob</a> }</pre> + <pre id="index.xml-eg-d30e111" class="pre_eg"> +element bit { text | <a class="link_ref" href="#TEI.bob" title="<bob>">bob</a> }<a href="#index.xml-eg-d30e111" class="anchorlink">⚓</a></pre> </td> </tr> </table> @@ -287,9 +287,9 @@ <h3> <span lang="en" class="label">Content model</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg cdata"> + <pre id="index.xml-eg-d30e221" class="pre_eg cdata"> <content/> - </pre> + <a href="#index.xml-eg-d30e221" class="anchorlink">⚓</a></pre> </td> </tr> <tr> @@ -297,8 +297,8 @@ <h3> <span lang="en" class="label">Schema Declaration</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg cdata"> -element bob { attribute href { xsd:anyURI }?, empty }</pre> + <pre id="index.xml-eg-d30e228" class="pre_eg cdata"> +element bob { attribute href { xsd:anyURI }?, empty }<a href="#index.xml-eg-d30e228" class="anchorlink">⚓</a></pre> </td> </tr> </table> @@ -354,9 +354,9 @@ <h3> <span lang="en" class="label">Content model</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg cdata"> + <pre id="index.xml-eg-d30e278" class="pre_eg cdata"> <content/> - </pre> + <a href="#index.xml-eg-d30e278" class="anchorlink">⚓</a></pre> </td> </tr> <tr> @@ -364,8 +364,8 @@ <h3> <span lang="en" class="label">Schema Declaration</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg cdata"> -element choice { empty }</pre> + <pre id="index.xml-eg-d30e285" class="pre_eg cdata"> +element choice { empty }<a href="#index.xml-eg-d30e285" class="anchorlink">⚓</a></pre> </td> </tr> </table> @@ -421,9 +421,9 @@ <h3> <span lang="en" class="label">Content model</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg cdata"> + <pre id="index.xml-eg-d30e335" class="pre_eg cdata"> <content/> - </pre> + <a href="#index.xml-eg-d30e335" class="anchorlink">⚓</a></pre> </td> </tr> <tr> @@ -431,8 +431,8 @@ <h3> <span lang="en" class="label">Schema Declaration</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg cdata"> -element orgName { empty }</pre> + <pre id="index.xml-eg-d30e342" class="pre_eg cdata"> +element orgName { empty }<a href="#index.xml-eg-d30e342" class="anchorlink">⚓</a></pre> </td> </tr> </table> @@ -488,9 +488,9 @@ <h3> <span lang="en" class="label">Content model</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg cdata"> + <pre id="index.xml-eg-d30e392" class="pre_eg cdata"> <content/> - </pre> + <a href="#index.xml-eg-d30e392" class="anchorlink">⚓</a></pre> </td> </tr> <tr> @@ -498,8 +498,8 @@ <h3> <span lang="en" class="label">Schema Declaration</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg cdata"> -element persName { empty }</pre> + <pre id="index.xml-eg-d30e399" class="pre_eg cdata"> +element persName { empty }<a href="#index.xml-eg-d30e399" class="anchorlink">⚓</a></pre> </td> </tr> </table> @@ -555,9 +555,9 @@ <h3> <span lang="en" class="label">Content model</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg cdata"> + <pre id="index.xml-eg-d30e449" class="pre_eg cdata"> <content/> - </pre> + <a href="#index.xml-eg-d30e449" class="anchorlink">⚓</a></pre> </td> </tr> <tr> @@ -565,8 +565,8 @@ <h3> <span lang="en" class="label">Schema Declaration</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg cdata"> -element seg { empty }</pre> + <pre id="index.xml-eg-d30e456" class="pre_eg cdata"> +element seg { empty }<a href="#index.xml-eg-d30e456" class="anchorlink">⚓</a></pre> </td> </tr> </table> @@ -621,7 +621,7 @@ <h3> <span lang="en" class="label">Content model</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg cdata"> + <pre id="index.xml-eg-d30e509" class="pre_eg cdata"> <content>  <alternate minOccurs="1"   maxOccurs="unbounded"> @@ -630,7 +630,7 @@ <h3>   <elementRef key="thingummy"/>  </alternate> </content> - </pre> + <a href="#index.xml-eg-d30e509" class="anchorlink">⚓</a></pre> </td> </tr> <tr> @@ -638,8 +638,8 @@ <h3> <span lang="en" class="label">Schema Declaration</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg"> -element stuff { ( <a class="link_ref" href="#TEI.bit" title="<bit>">bit</a> | <a class="link_ref" href="#TEI.bob" title="<bob>">bob</a> | <a class="link_ref" href="#TEI.thingummy" title="<thingummy>">thingummy</a> )+ }</pre> + <pre id="index.xml-eg-d30e516" class="pre_eg"> +element stuff { ( <a class="link_ref" href="#TEI.bit" title="<bit>">bit</a> | <a class="link_ref" href="#TEI.bob" title="<bob>">bob</a> | <a class="link_ref" href="#TEI.thingummy" title="<thingummy>">thingummy</a> )+ }<a href="#index.xml-eg-d30e516" class="anchorlink">⚓</a></pre> </td> </tr> </table> @@ -705,7 +705,7 @@ <h3> <span lang="en" class="label">Content model</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg cdata"> + <pre id="index.xml-eg-d30e590" class="pre_eg cdata"> <content>  <alternate minOccurs="1" maxOccurs="1">   <textNode/> @@ -714,7 +714,7 @@ <h3>   <elementRef key="t1"/>  </alternate> </content> - </pre> + <a href="#index.xml-eg-d30e590" class="anchorlink">⚓</a></pre> </td> </tr> <tr> @@ -722,8 +722,8 @@ <h3> <span lang="en" class="label">Schema Declaration</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg"> -element t1 { text | <a class="link_ref" href="#TEI.bit" title="<bit>">bit</a> | <a class="link_ref" href="#TEI.bob" title="<bob>">bob</a> | <a class="link_ref" href="#TEI.t1" title="<t1>">t1</a> }</pre> + <pre id="index.xml-eg-d30e597" class="pre_eg"> +element t1 { text | <a class="link_ref" href="#TEI.bit" title="<bit>">bit</a> | <a class="link_ref" href="#TEI.bob" title="<bob>">bob</a> | <a class="link_ref" href="#TEI.t1" title="<t1>">t1</a> }<a href="#index.xml-eg-d30e597" class="anchorlink">⚓</a></pre> </td> </tr> </table> @@ -778,7 +778,7 @@ <h3> <span lang="en" class="label">Content model</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg cdata"> + <pre id="index.xml-eg-d30e657" class="pre_eg cdata"> <content>  <alternate minOccurs="0"   maxOccurs="unbounded"> @@ -787,7 +787,7 @@ <h3>   <elementRef key="bob"/>  </alternate> </content> - </pre> + <a href="#index.xml-eg-d30e657" class="anchorlink">⚓</a></pre> </td> </tr> <tr> @@ -795,8 +795,8 @@ <h3> <span lang="en" class="label">Schema Declaration</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg"> -element t2 { ( text | <a class="link_ref" href="#TEI.bit" title="<bit>">bit</a> | <a class="link_ref" href="#TEI.bob" title="<bob>">bob</a> )* }</pre> + <pre id="index.xml-eg-d30e664" class="pre_eg"> +element t2 { ( text | <a class="link_ref" href="#TEI.bit" title="<bit>">bit</a> | <a class="link_ref" href="#TEI.bob" title="<bob>">bob</a> )* }<a href="#index.xml-eg-d30e664" class="anchorlink">⚓</a></pre> </td> </tr> </table> @@ -851,7 +851,7 @@ <h3> <span lang="en" class="label">Content model</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg cdata"> + <pre id="index.xml-eg-d30e721" class="pre_eg cdata"> <content>  <alternate minOccurs="0" maxOccurs="1">   <textNode/> @@ -859,7 +859,7 @@ <h3>   <elementRef key="bob"/>  </alternate> </content> - </pre> + <a href="#index.xml-eg-d30e721" class="anchorlink">⚓</a></pre> </td> </tr> <tr> @@ -867,8 +867,8 @@ <h3> <span lang="en" class="label">Schema Declaration</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg"> -element t3 { ( text | <a class="link_ref" href="#TEI.bit" title="<bit>">bit</a> | <a class="link_ref" href="#TEI.bob" title="<bob>">bob</a> )? }</pre> + <pre id="index.xml-eg-d30e728" class="pre_eg"> +element t3 { ( text | <a class="link_ref" href="#TEI.bit" title="<bit>">bit</a> | <a class="link_ref" href="#TEI.bob" title="<bob>">bob</a> )? }<a href="#index.xml-eg-d30e728" class="anchorlink">⚓</a></pre> </td> </tr> </table> @@ -924,7 +924,7 @@ <h3> <span lang="en" class="label">Content model</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg cdata"> + <pre id="index.xml-eg-d30e790" class="pre_eg cdata"> <content>  <alternate minOccurs="1"   maxOccurs="unbounded"> @@ -934,7 +934,7 @@ <h3>   <elementRef key="t1"/>  </alternate> </content> - </pre> + <a href="#index.xml-eg-d30e790" class="anchorlink">⚓</a></pre> </td> </tr> <tr> @@ -942,8 +942,8 @@ <h3> <span lang="en" class="label">Schema Declaration</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg"> -element t4 { ( text | <a class="link_ref" href="#TEI.bit" title="<bit>">bit</a> | <a class="link_ref" href="#TEI.bob" title="<bob>">bob</a> | <a class="link_ref" href="#TEI.t1" title="<t1>">t1</a> )+ }</pre> + <pre id="index.xml-eg-d30e797" class="pre_eg"> +element t4 { ( text | <a class="link_ref" href="#TEI.bit" title="<bit>">bit</a> | <a class="link_ref" href="#TEI.bob" title="<bob>">bob</a> | <a class="link_ref" href="#TEI.t1" title="<t1>">t1</a> )+ }<a href="#index.xml-eg-d30e797" class="anchorlink">⚓</a></pre> </td> </tr> </table> @@ -998,7 +998,7 @@ <h3> <span lang="en" class="label">Content model</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg cdata"> + <pre id="index.xml-eg-d30e857" class="pre_eg cdata"> <content>  <alternate minOccurs="1" maxOccurs="1">   <textNode/> @@ -1009,7 +1009,7 @@ <h3>   </sequence>  </alternate> </content> - </pre> + <a href="#index.xml-eg-d30e857" class="anchorlink">⚓</a></pre> </td> </tr> <tr> @@ -1017,8 +1017,8 @@ <h3> <span lang="en" class="label">Schema Declaration</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg"> -element t5 { text | ( <a class="link_ref" href="#TEI.bit" title="<bit>">bit</a>, <a class="link_ref" href="#TEI.bob" title="<bob>">bob</a> )+ }</pre> + <pre id="index.xml-eg-d30e864" class="pre_eg"> +element t5 { text | ( <a class="link_ref" href="#TEI.bit" title="<bit>">bit</a>, <a class="link_ref" href="#TEI.bob" title="<bob>">bob</a> )+ }<a href="#index.xml-eg-d30e864" class="anchorlink">⚓</a></pre> </td> </tr> </table> @@ -1073,7 +1073,7 @@ <h3> <span lang="en" class="label">Content model</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg cdata"> + <pre id="index.xml-eg-d30e921" class="pre_eg cdata"> <content>  <sequence minOccurs="0" maxOccurs="1">   <textNode/> @@ -1081,7 +1081,7 @@ <h3>   <elementRef key="bob"/>  </sequence> </content> - </pre> + <a href="#index.xml-eg-d30e921" class="anchorlink">⚓</a></pre> </td> </tr> <tr> @@ -1089,8 +1089,8 @@ <h3> <span lang="en" class="label">Schema Declaration</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg"> -element t6 { ( text, <a class="link_ref" href="#TEI.bit" title="<bit>">bit</a>, <a class="link_ref" href="#TEI.bob" title="<bob>">bob</a> )? }</pre> + <pre id="index.xml-eg-d30e928" class="pre_eg"> +element t6 { ( text, <a class="link_ref" href="#TEI.bit" title="<bit>">bit</a>, <a class="link_ref" href="#TEI.bob" title="<bob>">bob</a> )? }<a href="#index.xml-eg-d30e928" class="anchorlink">⚓</a></pre> </td> </tr> </table> @@ -1147,7 +1147,7 @@ <h3> <span lang="en" class="label">Content model</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg cdata"> + <pre id="index.xml-eg-d30e995" class="pre_eg cdata"> <content>  <sequence minOccurs="1" maxOccurs="1">   <elementRef key="orgName" minOccurs="0"/> @@ -1157,7 +1157,7 @@ <h3>   <elementRef key="trait" minOccurs="0"/>  </sequence> </content> - </pre> + <a href="#index.xml-eg-d30e995" class="anchorlink">⚓</a></pre> </td> </tr> <tr> @@ -1165,8 +1165,8 @@ <h3> <span lang="en" class="label">Schema Declaration</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg"> -element t7 { <a class="link_ref" href="#TEI.orgName" title="<orgName>">orgName</a>?, <a class="link_ref" href="#TEI.persName" title="<persName>">persName</a>?, <a class="link_ref" href="#TEI.choice" title="<choice>">choice</a>?, <a class="link_ref" href="#TEI.seg" title="<seg>">seg</a>?, <a class="link_ref" href="#TEI.trait" title="<trait>">trait</a>? }</pre> + <pre id="index.xml-eg-d30e1002" class="pre_eg"> +element t7 { <a class="link_ref" href="#TEI.orgName" title="<orgName>">orgName</a>?, <a class="link_ref" href="#TEI.persName" title="<persName>">persName</a>?, <a class="link_ref" href="#TEI.choice" title="<choice>">choice</a>?, <a class="link_ref" href="#TEI.seg" title="<seg>">seg</a>?, <a class="link_ref" href="#TEI.trait" title="<trait>">trait</a>? }<a href="#index.xml-eg-d30e1002" class="anchorlink">⚓</a></pre> </td> </tr> </table> @@ -1224,7 +1224,7 @@ <h3> <span lang="en" class="label">Content model</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg cdata"> + <pre id="index.xml-eg-d30e1080" class="pre_eg cdata"> <content>  <sequence minOccurs="1" maxOccurs="1">   <textNode/> @@ -1235,7 +1235,7 @@ <h3>   <elementRef key="trait" minOccurs="0"/>  </sequence> </content> - </pre> + <a href="#index.xml-eg-d30e1080" class="anchorlink">⚓</a></pre> </td> </tr> <tr> @@ -1243,8 +1243,8 @@ <h3> <span lang="en" class="label">Schema Declaration</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg"> -element t8 { text, <a class="link_ref" href="#TEI.orgName" title="<orgName>">orgName</a>?, <a class="link_ref" href="#TEI.persName" title="<persName>">persName</a>?, <a class="link_ref" href="#TEI.choice" title="<choice>">choice</a>?, <a class="link_ref" href="#TEI.seg" title="<seg>">seg</a>?, <a class="link_ref" href="#TEI.trait" title="<trait>">trait</a>? }</pre> + <pre id="index.xml-eg-d30e1087" class="pre_eg"> +element t8 { text, <a class="link_ref" href="#TEI.orgName" title="<orgName>">orgName</a>?, <a class="link_ref" href="#TEI.persName" title="<persName>">persName</a>?, <a class="link_ref" href="#TEI.choice" title="<choice>">choice</a>?, <a class="link_ref" href="#TEI.seg" title="<seg>">seg</a>?, <a class="link_ref" href="#TEI.trait" title="<trait>">trait</a>? }<a href="#index.xml-eg-d30e1087" class="anchorlink">⚓</a></pre> </td> </tr> </table> @@ -1299,11 +1299,11 @@ <h3> <span lang="en" class="label">Content model</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg cdata"> + <pre id="index.xml-eg-d30e1148" class="pre_eg cdata"> <content>  <textNode/> </content> - </pre> + <a href="#index.xml-eg-d30e1148" class="anchorlink">⚓</a></pre> </td> </tr> <tr> @@ -1311,8 +1311,8 @@ <h3> <span lang="en" class="label">Schema Declaration</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg cdata"> -element thingummy { text }</pre> + <pre id="index.xml-eg-d30e1155" class="pre_eg cdata"> +element thingummy { text }<a href="#index.xml-eg-d30e1155" class="anchorlink">⚓</a></pre> </td> </tr> </table> @@ -1368,9 +1368,9 @@ <h3> <span lang="en" class="label">Content model</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg cdata"> + <pre id="index.xml-eg-d30e1205" class="pre_eg cdata"> <content/> - </pre> + <a href="#index.xml-eg-d30e1205" class="anchorlink">⚓</a></pre> </td> </tr> <tr> @@ -1378,8 +1378,8 @@ <h3> <span lang="en" class="label">Schema Declaration</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg cdata"> -element trait { empty }</pre> + <pre id="index.xml-eg-d30e1212" class="pre_eg cdata"> +element trait { empty }<a href="#index.xml-eg-d30e1212" class="anchorlink">⚓</a></pre> </td> </tr> </table> diff --git a/Test/expected-results/test-pure2.odd.html b/Test/expected-results/test-pure2.odd.html index 3639c039a..6978348e3 100644 --- a/Test/expected-results/test-pure2.odd.html +++ b/Test/expected-results/test-pure2.odd.html @@ -136,7 +136,7 @@ <h3> <span lang="en" class="label">Content model</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg cdata"> + <pre id="index.xml-eg-d30e92" class="pre_eg cdata"> <content>  <alternate minOccurs="0"   maxOccurs="unbounded"> @@ -144,7 +144,7 @@ <h3>   <elementRef key="bob"/>  </alternate> </content> - </pre> + <a href="#index.xml-eg-d30e92" class="anchorlink">⚓</a></pre> </td> </tr> <tr> @@ -152,8 +152,8 @@ <h3> <span lang="en" class="label">Schema Declaration</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg"> -element bit { ( text | <a class="link_ref" href="#TEI.bob" title="<bob>">bob</a> )* }</pre> + <pre id="index.xml-eg-d30e99" class="pre_eg"> +element bit { ( text | <a class="link_ref" href="#TEI.bob" title="<bob>">bob</a> )* }<a href="#index.xml-eg-d30e99" class="anchorlink">⚓</a></pre> </td> </tr> </table> @@ -259,9 +259,9 @@ <h3> <span lang="en" class="label">Content model</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg cdata"> + <pre id="index.xml-eg-d30e204" class="pre_eg cdata"> <content/> - </pre> + <a href="#index.xml-eg-d30e204" class="anchorlink">⚓</a></pre> </td> </tr> <tr> @@ -269,8 +269,8 @@ <h3> <span lang="en" class="label">Schema Declaration</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg cdata"> -element bob { attribute uri { xsd:anyURI }?, empty }</pre> + <pre id="index.xml-eg-d30e211" class="pre_eg cdata"> +element bob { attribute uri { xsd:anyURI }?, empty }<a href="#index.xml-eg-d30e211" class="anchorlink">⚓</a></pre> </td> </tr> </table> @@ -324,13 +324,13 @@ <h3> <span lang="en" class="label">Content model</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg cdata"> + <pre id="index.xml-eg-d30e260" class="pre_eg cdata"> <content>  <classRef key="stuffPart"   maxOccurs="unbounded">  </classRef> </content> - </pre> + <a href="#index.xml-eg-d30e260" class="anchorlink">⚓</a></pre> </td> </tr> <tr> @@ -338,8 +338,8 @@ <h3> <span lang="en" class="label">Schema Declaration</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg"> -element stuff { <a class="link_ref" href="#TEI.stuffPart" title="stuffPart">stuffPart</a>+ }</pre> + <pre id="index.xml-eg-d30e267" class="pre_eg"> +element stuff { <a class="link_ref" href="#TEI.stuffPart" title="stuffPart">stuffPart</a>+ }<a href="#index.xml-eg-d30e267" class="anchorlink">⚓</a></pre> </td> </tr> </table> @@ -393,13 +393,13 @@ <h3> <span lang="en" class="label">Content model</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg cdata"> + <pre id="index.xml-eg-d30e319" class="pre_eg cdata"> <content>  <classRef key="stuffPart" maxOccurs="1"   expand="sequence">  </classRef> </content> - </pre> + <a href="#index.xml-eg-d30e319" class="anchorlink">⚓</a></pre> </td> </tr> <tr> @@ -407,8 +407,8 @@ <h3> <span lang="en" class="label">Schema Declaration</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg"> -element stuffSeq { <a class="link_ref" href="#TEI.bob" title="<bob>">bob</a>, <a class="link_ref" href="#TEI.bit" title="<bit>">bit</a> }</pre> + <pre id="index.xml-eg-d30e326" class="pre_eg"> +element stuffSeq { <a class="link_ref" href="#TEI.bob" title="<bob>">bob</a>, <a class="link_ref" href="#TEI.bit" title="<bit>">bit</a> }<a href="#index.xml-eg-d30e326" class="anchorlink">⚓</a></pre> </td> </tr> </table> @@ -462,13 +462,13 @@ <h3> <span lang="en" class="label">Content model</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg cdata"> + <pre id="index.xml-eg-d30e381" class="pre_eg cdata"> <content>  <classRef key="stuffPart" maxOccurs="1"   expand="sequenceOptional">  </classRef> </content> - </pre> + <a href="#index.xml-eg-d30e381" class="anchorlink">⚓</a></pre> </td> </tr> <tr> @@ -476,8 +476,8 @@ <h3> <span lang="en" class="label">Schema Declaration</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg"> -element stuffSeqOpt { <a class="link_ref" href="#TEI.bob" title="<bob>">bob</a>?, <a class="link_ref" href="#TEI.bit" title="<bit>">bit</a>? }</pre> + <pre id="index.xml-eg-d30e388" class="pre_eg"> +element stuffSeqOpt { <a class="link_ref" href="#TEI.bob" title="<bob>">bob</a>?, <a class="link_ref" href="#TEI.bit" title="<bit>">bit</a>? }<a href="#index.xml-eg-d30e388" class="anchorlink">⚓</a></pre> </td> </tr> </table> @@ -531,13 +531,13 @@ <h3> <span lang="en" class="label">Content model</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg cdata"> + <pre id="index.xml-eg-d30e443" class="pre_eg cdata"> <content>  <classRef key="stuffPart" maxOccurs="1"   expand="sequenceRepeatable">  </classRef> </content> - </pre> + <a href="#index.xml-eg-d30e443" class="anchorlink">⚓</a></pre> </td> </tr> <tr> @@ -545,8 +545,8 @@ <h3> <span lang="en" class="label">Schema Declaration</span> </td> <td class="wovenodd-col2"> - <pre class="pre_eg"> -element stuffSeqRep { <a class="link_ref" href="#TEI.bob" title="<bob>">bob</a>+, <a class="link_ref" href="#TEI.bit" title="<bit>">bit</a>+ }</pre> + <pre id="index.xml-eg-d30e450" class="pre_eg"> +element stuffSeqRep { <a class="link_ref" href="#TEI.bob" title="<bob>">bob</a>+, <a class="link_ref" href="#TEI.bit" title="<bit>">bit</a>+ }<a href="#index.xml-eg-d30e450" class="anchorlink">⚓</a></pre> </td> </tr> </table> diff --git a/Test/expected-results/test-rtf2tei.xml b/Test/expected-results/test-rtf2tei.xml index 8dc92b7bb..50d9d231c 100644 --- a/Test/expected-results/test-rtf2tei.xml +++ b/Test/expected-results/test-rtf2tei.xml @@ -36,12 +36,12 @@ </teiHeader> <text> <body> - <p style="text-align:center;"> + <p style="text-align: center;"> <hi rend="bold" style="font-size:18pt">Pretvorba RTF v TEI P5</hi> <lb/> <hi rend="bold" style="font-size:18pt">Navodila in testno besedilo</hi> </p> - <p style="text-align:center;"> + <p style="text-align: center;"> <hi style="font-size:14pt">Tomaž Erjavec</hi> <lb/> <hi style="font-size:14pt">Odsek za tehnologije znanja</hi> @@ -52,7 +52,7 @@ <hi style="font-size:14pt">tomaz.erjavec@ijs.si</hi> </ref> </p> - <p style="text-align:center;"> + <p style="text-align: center;"> <hi style="font-size:14pt">2013-01-14</hi> </p> <p>Na <ref target="http://nl.ijs.si/e-zrc/rtf2tei/">http://nl.ijs.si/e-zrc/rtf2tei/</ref> najdete servis za pretvorbo Word datotek v <ref target="http://www.tei-c.org/Guidelines/P5/">TEI P5</ref>. Spletna stran vsebuje tudi navodila za uporabo same spletnega servisa, pričujoče besedilo pa vsebuje navodila za oblikovanje Word datotek za servis in obenem služi kot testno besedilo, ki ga lahko pošljete servisu, da vam vrne ustrezno stavljen rezultat v XML oz. HTML. </p> @@ -170,18 +170,18 @@ <p>Primer tabele:</p> <table rend="rules"> <row> - <cell rend="left">Prva vrstica</cell> - <cell rend="left">1. stolpec</cell> - <cell rend="left">2. stolpec</cell> - <cell rend="left">3. stolpec</cell> - <cell rend="left">4. stolpec</cell> + <cell style="text-align: left;">Prva vrstica</cell> + <cell style="text-align: left;">1. stolpec</cell> + <cell style="text-align: left;">2. stolpec</cell> + <cell style="text-align: left;">3. stolpec</cell> + <cell style="text-align: left;">4. stolpec</cell> </row> <row> - <cell rend="left">Druga vrstica</cell> - <cell rend="left">1. stolpec</cell> - <cell rend="left">2. stolpec</cell> - <cell rend="left">3. stolpec</cell> - <cell rend="left">4. stolpec</cell> + <cell style="text-align: left;">Druga vrstica</cell> + <cell style="text-align: left;">1. stolpec</cell> + <cell style="text-align: left;">2. stolpec</cell> + <cell style="text-align: left;">3. stolpec</cell> + <cell style="text-align: left;">4. stolpec</cell> </row> </table> <div> diff --git a/Test/expected-results/test.epub b/Test/expected-results/test.epub index 9a1ea3386..82419ac9f 100644 Binary files a/Test/expected-results/test.epub and b/Test/expected-results/test.epub differ diff --git a/Test/expected-results/test.epub.listing b/Test/expected-results/test.epub.listing index fdb433988..849e5ceb2 100644 --- a/Test/expected-results/test.epub.listing +++ b/Test/expected-results/test.epub.listing @@ -1,4 +1,4 @@ -Archive: test.epub +Archive: actual-results/test.epub testing: mimetype OK testing: META-INF/ OK testing: META-INF/container.xml OK @@ -48,4 +48,4 @@ Archive: test.epub testing: OPS/titlepage1.html OK testing: OPS/titlepageback.html OK testing: OPS/toc.ncx OK -No errors detected in compressed data of test.epub. +No errors detected in compressed data of actual-results/test.epub. diff --git a/Test/expected-results/test.epub.listing2 b/Test/expected-results/test.epub.listing2 index ee38cd824..1e2ae8d92 100644 --- a/Test/expected-results/test.epub.listing2 +++ b/Test/expected-results/test.epub.listing2 @@ -1,4 +1,4 @@ -Archive: test-pages.epub +Archive: actual-results/test-pages.epub testing: mimetype OK testing: META-INF/ OK testing: META-INF/com.apple.ibooks.display-options.xml OK @@ -43,4 +43,4 @@ Archive: test-pages.epub testing: OPS/titlepageback.html OK testing: OPS/titlepageverso.html OK testing: OPS/toc.ncx OK -No errors detected in compressed data of test-pages.epub. +No errors detected in compressed data of actual-results/test-pages.epub. diff --git a/Test/expected-results/test.isosch b/Test/expected-results/test.isosch index 37906bbc6..12786db73 100644 --- a/Test/expected-results/test.isosch +++ b/Test/expected-results/test.isosch @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <schema xmlns="http://purl.oclc.org/dsdl/schematron" queryBinding="xslt2"> <title>ISO Schematron rules - + diff --git a/Test/expected-results/test.tex b/Test/expected-results/test.tex index 844563649..8670196e3 100644 --- a/Test/expected-results/test.tex +++ b/Test/expected-results/test.tex @@ -389,7 +389,7 @@ \section*{Contents.}\begin{description} Here, by contrast is an ‘inline quotation’. Another strange thing about quotes is this: \begin{quote}You can put line breaks{\hskip1pt}\\{}to determine where the line breaks{\hskip1pt}\\{}Inside a block!\end{quote} \section[{Use of xml:lang}]{Use of xml:lang}\par He used a French \textit{radiateur}.\par -Languages: \textit{Deutsch}; \textit{Italiano}; \textit{Español}; \textit{Français}; \textit{Portugues}; \textit{Russian}; \textit{Svenska}; \textit{日本語}; \textit{中文}. +Languages: \textit{Deutsch}; \textit{Italiano}; \textit{Español}; \textit{Français}; \textit{Portugues}; \textit{Russian}; \textit{Svenska}; {\textJapanese 日本語}; {\textChinese 中文}. \section[{del, gap, add, unclear etc}]{del, gap, add, unclear etc}\par \sout{. The interest \& — affor the amount over so small} the interest afforded ⟨\textit{compared with cash,}⟩ by the Annuity{\hskip1pt}\\{} note paper to those who \textit{tutor}[?] ⟨\textit{think}⟩ it, ⟨\textit{or keep it,}⟩ with a view {\hskip1pt}\\{} to circulation, will, \sout{when compared with cash} ⟨\textit{be it ever so small}⟩ be {\hskip1pt}\\{} so much \uline{profit}: compared with \sout{a} ⟨\textit{the}⟩ preceding higher {\hskip1pt}\\{} rate of interest, the ⟨\textit{reduced}⟩ rate afforded by the Annuity {\hskip1pt}\\{} note paper, to those who, \textit{tutor}[?] if they \textit{tutor}[?] it, {\hskip1pt}\\{} will, \sout{have to depend upon} to the extent of their {\hskip1pt}\\{} respective capitals so invested, have nothing else {\hskip1pt}\\{} to depend upon for their ⟨\textit{respective}⟩ incomes, will, \sout{} ⟨\textit{by}⟩ the {\hskip1pt}\\{} amount of the difference, \textit{foremost}[?] itself as so {\hskip1pt}\\{} much less. \section[{Drama}]{Drama} \begin{description} \item[Roderigo] diff --git a/Test/expected-results/test.xml.docx b/Test/expected-results/test.xml.docx deleted file mode 100644 index 145f4a86a..000000000 Binary files a/Test/expected-results/test.xml.docx and /dev/null differ diff --git a/Test/expected-results/test.xml.docx.list b/Test/expected-results/test.xml.docx.list deleted file mode 100644 index d9b4b483e..000000000 --- a/Test/expected-results/test.xml.docx.list +++ /dev/null @@ -1,25 +0,0 @@ - testing: [Content_Types].xml OK - testing: docProps/ OK - testing: docProps/app.xml OK - testing: docProps/core.xml OK - testing: docProps/custom.xml OK - testing: _rels/ OK - testing: _rels/.rels OK - testing: word/ OK - testing: word/document.xml OK - testing: word/endnotes.xml OK - testing: word/fontTable.xml OK - testing: word/footer1.xml OK - testing: word/footer2.xml OK - testing: word/footer3.xml OK - testing: word/footnotes.xml OK - testing: word/header1.xml OK - testing: word/header2.xml OK - testing: word/header3.xml OK - testing: word/media/ OK - testing: word/numbering.xml OK - testing: word/_rels/ OK - testing: word/_rels/document.xml.rels OK - testing: word/settings.xml OK - testing: word/stylesWithEffects.xml OK - testing: word/styles.xml OK diff --git a/Test/expected-results/test.xml.docx.listing b/Test/expected-results/test.xml.docx.listing deleted file mode 100644 index fa498facc..000000000 --- a/Test/expected-results/test.xml.docx.listing +++ /dev/null @@ -1,31 +0,0 @@ -Archive: test.xml.docx - testing: _rels/ OK - testing: docProps/ OK - testing: word/ OK - testing: word/_rels/ OK - testing: word/media/ OK - testing: [Content_Types].xml OK - testing: _rels/.rels OK - testing: docProps/app.xml OK - testing: docProps/core.xml OK - testing: docProps/custom.xml OK - testing: word/_rels/document.xml.rels OK - testing: word/document.xml OK - testing: word/endnotes.xml OK - testing: word/fontTable.xml OK - testing: word/footer1.xml OK - testing: word/footer2.xml OK - testing: word/footer3.xml OK - testing: word/footnotes.xml OK - testing: word/header1.xml OK - testing: word/header2.xml OK - testing: word/header3.xml OK - testing: word/media/pageimage3.jpg OK - testing: word/media/resource1.jpg OK - testing: word/media/resource2.jpg OK - testing: word/media/resource3.jpg OK - testing: word/numbering.xml OK - testing: word/settings.xml OK - testing: word/styles.xml OK - testing: word/stylesWithEffects.xml OK -No errors detected in compressed data of test.xml.docx. diff --git a/Test/expected-results/test.xml.docx.core b/Test/expected-results/test.xml.docx_core.xml similarity index 100% rename from Test/expected-results/test.xml.docx.core rename to Test/expected-results/test.xml.docx_core.xml diff --git a/Test/expected-results/test.xml.docx.document b/Test/expected-results/test.xml.docx_document.xml similarity index 100% rename from Test/expected-results/test.xml.docx.document rename to Test/expected-results/test.xml.docx_document.xml diff --git a/Test/expected-results/test.xml.epub.list b/Test/expected-results/test.xml.epub.list deleted file mode 100644 index 891ddfc07..000000000 --- a/Test/expected-results/test.xml.epub.list +++ /dev/null @@ -1,16 +0,0 @@ - testing: META-INF/container.xml OK - testing: OEBPS/S1.html OK - testing: OEBPS/content.opf OK - testing: OEBPS/index-body.1_div1.1.html OK - testing: OEBPS/index-front.1_div.1.html OK - testing: OEBPS/index-front.1_div.2.html OK - testing: OEBPS/index-front.1_div.3.html OK - testing: OEBPS/index.html OK - testing: OEBPS/page-template.xpgt OK - testing: OEBPS/print.css OK - testing: OEBPS/stylesheet.css OK - testing: OEBPS/titlepage1.html OK - testing: OEBPS/titlepageback.html OK - testing: OEBPS/titlepage.html OK - testing: OEBPS/toc.ncx OK - testing: mimetype OK diff --git a/Test/expected-results/test.xml.odt b/Test/expected-results/test.xml.odt index 3e8a139b8..aefbe5bcb 100644 Binary files a/Test/expected-results/test.xml.odt and b/Test/expected-results/test.xml.odt differ diff --git a/Test/expected-results/test.xml.odt.list b/Test/expected-results/test.xml.odt.list deleted file mode 100644 index d150d7a6b..000000000 --- a/Test/expected-results/test.xml.odt.list +++ /dev/null @@ -1,21 +0,0 @@ - testing: Configurations2/ OK - testing: Configurations2/accelerator/ OK - testing: Configurations2/accelerator/current.xml OK - testing: Configurations2/floater/ OK - testing: Configurations2/images/ OK - testing: Configurations2/images/Bitmaps/ OK - testing: Configurations2/menubar/ OK - testing: Configurations2/popupmenu/ OK - testing: Configurations2/progressbar/ OK - testing: Configurations2/statusbar/ OK - testing: Configurations2/toolbar/ OK - testing: META-INF/ OK - testing: META-INF/manifest.xml OK - testing: Thumbnails/ OK - testing: Thumbnails/thumbnail.png OK - testing: content.xml OK - testing: manifest.rdf OK - testing: meta.xml OK - testing: mimetype OK - testing: settings.xml OK - testing: styles.xml OK diff --git a/Test/expected-results/test.xml.odt.listing b/Test/expected-results/test.xml.odt.listing index c564d96a0..2322da737 100644 --- a/Test/expected-results/test.xml.odt.listing +++ b/Test/expected-results/test.xml.odt.listing @@ -1,25 +1,31 @@ - testing: Configurations2/ OK - testing: Configurations2/accelerator/ OK +Archive: actual-results/test.xml.odt +No errors detected in compressed data of actual-results/test.xml.odt. testing: Configurations2/accelerator/current.xml OK + testing: Configurations2/accelerator/ OK testing: Configurations2/floater/ OK - testing: Configurations2/images/ OK testing: Configurations2/images/Bitmaps/ OK + testing: Configurations2/images/ OK testing: Configurations2/menubar/ OK + testing: Configurations2/ OK testing: Configurations2/popupmenu/ OK testing: Configurations2/progressbar/ OK testing: Configurations2/statusbar/ OK testing: Configurations2/toolbar/ OK testing: Configurations2/toolpanel/ OK - testing: META-INF/ OK + testing: content.xml OK + testing: manifest.rdf OK testing: META-INF/manifest.xml OK + testing: META-INF/ OK + testing: meta.xml OK + testing: mimetype OK testing: Pictures/ OK testing: Pictures/pageimage1.jpg OK - testing: Pictures/resource1.jpg OK testing: Pictures/resource10.jpg OK testing: Pictures/resource11.jpg OK testing: Pictures/resource12.jpg OK testing: Pictures/resource13.jpg OK testing: Pictures/resource14.jpg OK + testing: Pictures/resource1.jpg OK testing: Pictures/resource2.jpg OK testing: Pictures/resource3.jpg OK testing: Pictures/resource4.jpg OK @@ -28,13 +34,7 @@ testing: Pictures/resource7.jpg OK testing: Pictures/resource8.jpg OK testing: Pictures/resource9.jpg OK - testing: Thumbnails/ OK - testing: Thumbnails/thumbnail.png OK - testing: content.xml OK - testing: manifest.rdf OK - testing: meta.xml OK - testing: mimetype OK testing: settings.xml OK testing: styles.xml OK -Archive: test.xml.odt -No errors detected in compressed data of test.xml.odt. + testing: Thumbnails/ OK + testing: Thumbnails/thumbnail.png OK diff --git a/Test/expected-results/content.xml.odt.listing b/Test/expected-results/test.xml.odt_content.xml similarity index 100% rename from Test/expected-results/content.xml.odt.listing rename to Test/expected-results/test.xml.odt_content.xml diff --git a/Test/expected-results/test10.xml.odt.listing b/Test/expected-results/test10.xml.odt.listing deleted file mode 100644 index 522e04e44..000000000 --- a/Test/expected-results/test10.xml.odt.listing +++ /dev/null @@ -1,28 +0,0 @@ -Archive: test10.xml.odt - testing: Configurations2/ OK - testing: Configurations2/accelerator/ OK - testing: Configurations2/floater/ OK - testing: Configurations2/images/ OK - testing: Configurations2/images/Bitmaps/ OK - testing: Configurations2/menubar/ OK - testing: Configurations2/popupmenu/ OK - testing: Configurations2/progressbar/ OK - testing: Configurations2/statusbar/ OK - testing: Configurations2/toolbar/ OK - testing: Configurations2/toolpanel/ OK - testing: META-INF/ OK - testing: Pictures/ OK - testing: Thumbnails/ OK - testing: Configurations2/accelerator/current.xml OK - testing: META-INF/manifest.xml OK - testing: Pictures/resource1.jpg OK - testing: Pictures/resource2.jpg OK - testing: Pictures/resource3.jpg OK - testing: Thumbnails/thumbnail.png OK - testing: content.xml OK - testing: manifest.rdf OK - testing: meta.xml OK - testing: mimetype OK - testing: settings.xml OK - testing: styles.xml OK -No errors detected in compressed data of test10.xml.odt. diff --git a/Test/expected-results/test15.odd.html b/Test/expected-results/test15.odd.html index f71edbb4e..c3ff1be9e 100644 --- a/Test/expected-results/test15.odd.html +++ b/Test/expected-results/test15.odd.html @@ -402,7 +402,7 @@

Content model - 
+                  
 <content>
  <sequence minOccurs="1" maxOccurs="1">
   <alternate minOccurs="0"
@@ -449,7 +449,7 @@ 

   </sequence>
  </sequence>
 </content>
-    

+    ⚓
@@ -457,7 +457,7 @@

Declaración - 
+                  
 element div
 {
    att.global.attributes,
@@ -479,7 +479,7 @@ 

          ( model.divBottom, model.global* )*
       )?
    )
-}

+}⚓
@@ -756,11 +756,11 @@

Content model - 
+                  
 <content>
  <macroRef key="macro.paraContent"/>
 </content>
-    

+    ⚓
@@ -768,7 +768,7 @@

Declaración - 
+                  
 element para
 {
    att.global.attributes,
@@ -776,7 +776,7 @@ 

    att.fragmentable.attributes,
    att.written.attributes,
    macro.paraContent
-}

+}⚓
@@ -1087,11 +1087,11 @@

Content model - 
+                  
 <content>
  <macroRef key="macro.specialPara"/>
 </content>
-    

+    ⚓
@@ -1099,7 +1099,7 @@

Declaración - 
+                  
 element q
 {
    att.global.attributes,
@@ -1117,7 +1117,7 @@ 

     | "mentioned"
    }?,
    macro.specialPara
-}

+}⚓
@@ -1192,11 +1192,11 @@

Content model - 
+                  
 <content>
  <dataRef key="teidata.word"/>
 </content>
-    

+    ⚓
@@ -1204,8 +1204,8 @@

Declaración - 
-teidata.enumerated = teidata.word
+ 
+teidata.enumerated = teidata.word⚓
diff --git a/Test/expected-results/test18.xml b/Test/expected-results/test18.xml index 0c2a14891..149409ea5 100644 --- a/Test/expected-results/test18.xml +++ b/Test/expected-results/test18.xml @@ -36,8 +36,8 @@ -

securitizationNew European Security TheoryKopenhagener SchuledesecuritizationMehrere sicherheitspolitische Akteure können aus verschiedenen Gründen nach der Kopenhagener Schule einen „Sicherheitskomplex“ bilden. „A security complex is defined as a set of states whose major security perceptions and concerns are so interlinked that their national security problems cannot reasonably be analysed or resolved apart from one another. The formative dynamics and structure of a security complex are generated by the states within that complex – by their security perceptions of, and interactions with, each other. Individual security complexes are durable but not permanent features of the international system. The theory posits that in a geographically diverse, anarchic international system, security complexes are a normal and expected feature […].”

Buzan/Wæver/Wilde, Security. A new Framework for Analysis, S. 12.

Mit Thesen zu Sicherheitskomplexen betont die Kopenhagener Schule die Regionalität der Sicherheit. Trotz weltweiter Vernetzung und Globalisierung seien nur die wenigsten Akteure an allen sicherheitspolitischen Entwicklungen weltweit und zu jeder Zeit interessiert. Die meisten Sicherheitsangelegenheiten sind nach Überzeugung der Kopenhagener Schule regional, häufig innerhalb eines Staates oder in direkter Nachbarschaft angelegt, da sich potenzielle Bedrohungen in vielen Fällen schneller über kurze als über lange Entfernungen ausbreiten.

Hier zeigt sich erneut ein Unterschied zum Realismus, der von Wissenschaftlern in den USA vertreten wird. Die USA werden dort als eine globale Macht mit weltweiten sicherheitspolitischen Interessen gesehen, was sich unter anderem an Diskursen zeigt, die nach dem Kalten Krieg geführt wurden und bis heute werden, sei es zu „Kampf der Kulturen“, „Unipolarität“, „Krieg gegen den Terrorismus“ oder „Globalisierung“.

-

SicherheitskomplexeKopenhagener SchuleSicherheitsgemeinschaftenSicherheitskomplexeNew European Security TheoryKopenhagener SchuleSicherheitskomplexeDie Pariser Schule, deren zentrale Vertreter Didier Bigo

Vgl. exemplarisch: Bigo, Polices en résaux; Bigo, L’Europe de la sécurité intérieure, in: Gloannec (Hrsg.), Entre Union et Nations, S. 55–90; Bigo, When two become one, in: Kelstrup/Williams (Hrsg.), International Relations Theory and the Politics of European Integration, S. 171–204.

und Jef Huysmans

Vgl. exemplarisch: Huysmans, Revisiting Copenhagen; Noxolo/Huysmans (Hrsg.), Community, citizenship, and the ‘war on terror’; Aradau/Huysmans, Mobilising (global) democracy; Squire/Huysmans, Migration and Security, in: Dunn Cavelty/Mauer (Hrsg.), Handbook of Security Studies.

sind, ist stärker soziologisch und empirisch geprägt als die Waliser und Kopenhagener Schulen. Im Fokus der Untersuchungen stehen Sicherheitsexperten von Polizei, Militär, Zoll und Regierungsstellen, aber auch Vertreter von Forschungsinstituten oder Stiftungen. Die Analysen der Pariser Schule konzentrieren sich zunächst einmal darauf, wer eine – zumindest weitgehend anerkannte – Expertenrolle im Bereich Sicherheit einnimmt. Weiterhin werden Funktionen und Handlungsabläufe der Sicherheitsexperten untersucht. Experten nehmen deshalb die zentrale Stelle bei diesen Untersuchungen ein, weil Vertreter der Pariser Schule davon ausgehen, dass sie zum Beispiel Bedrohungen identifizieren, Sicherheitsstrategien entwickeln und mögliche Gegenmaßnahmen einleiten. Damit seien sie entscheidende Akteure in der sicherheitspolitischen Praxis, deren Rolle und Verhalten vornehmlich zu beleuchten sei.

+

securitizationNew European Security TheoryKopenhagener SchuledesecuritizationMehrere sicherheitspolitische Akteure können aus verschiedenen Gründen nach der Kopenhagener Schule einen „Sicherheitskomplex“ bilden. „A security complex is defined as a set of states whose major security perceptions and concerns are so interlinked that their national security problems cannot reasonably be analysed or resolved apart from one another. The formative dynamics and structure of a security complex are generated by the states within that complex – by their security perceptions of, and interactions with, each other. Individual security complexes are durable but not permanent features of the international system. The theory posits that in a geographically diverse, anarchic international system, security complexes are a normal and expected feature […].”

Buzan/Wæver/Wilde, Security. A new Framework for Analysis, S. 12.

Mit Thesen zu Sicherheitskomplexen betont die Kopenhagener Schule die Regionalität der Sicherheit. Trotz weltweiter Vernetzung und Globalisierung seien nur die wenigsten Akteure an allen sicherheitspolitischen Entwicklungen weltweit und zu jeder Zeit interessiert. Die meisten Sicherheitsangelegenheiten sind nach Überzeugung der Kopenhagener Schule regional, häufig innerhalb eines Staates oder in direkter Nachbarschaft angelegt, da sich potenzielle Bedrohungen in vielen Fällen schneller über kurze als über lange Entfernungen ausbreiten.

Hier zeigt sich erneut ein Unterschied zum Realismus, der von Wissenschaftlern in den USA vertreten wird. Die USA werden dort als eine globale Macht mit weltweiten sicherheitspolitischen Interessen gesehen, was sich unter anderem an Diskursen zeigt, die nach dem Kalten Krieg geführt wurden und bis heute werden, sei es zu „Kampf der Kulturen“, „Unipolarität“, „Krieg gegen den Terrorismus“ oder „Globalisierung“.

+

SicherheitskomplexeKopenhagener SchuleSicherheitsgemeinschaftenSicherheitskomplexeNew European Security TheoryKopenhagener SchuleSicherheitskomplexeDie Pariser Schule, deren zentrale Vertreter Didier Bigo

Vgl. exemplarisch: Bigo, Polices en résaux; Bigo, L’Europe de la sécurité intérieure, in: Gloannec (Hrsg.), Entre Union et Nations, S. 55–90; Bigo, When two become one, in: Kelstrup/Williams (Hrsg.), International Relations Theory and the Politics of European Integration, S. 171–204.

und Jef Huysmans

Vgl. exemplarisch: Huysmans, Revisiting Copenhagen; Noxolo/Huysmans (Hrsg.), Community, citizenship, and the ‘war on terror’; Aradau/Huysmans, Mobilising (global) democracy; Squire/Huysmans, Migration and Security, in: Dunn Cavelty/Mauer (Hrsg.), Handbook of Security Studies.

sind, ist stärker soziologisch und empirisch geprägt als die Waliser und Kopenhagener Schulen. Im Fokus der Untersuchungen stehen Sicherheitsexperten von Polizei, Militär, Zoll und Regierungsstellen, aber auch Vertreter von Forschungsinstituten oder Stiftungen. Die Analysen der Pariser Schule konzentrieren sich zunächst einmal darauf, wer eine – zumindest weitgehend anerkannte – Expertenrolle im Bereich Sicherheit einnimmt. Weiterhin werden Funktionen und Handlungsabläufe der Sicherheitsexperten untersucht. Experten nehmen deshalb die zentrale Stelle bei diesen Untersuchungen ein, weil Vertreter der Pariser Schule davon ausgehen, dass sie zum Beispiel Bedrohungen identifizieren, Sicherheitsstrategien entwickeln und mögliche Gegenmaßnahmen einleiten. Damit seien sie entscheidende Akteure in der sicherheitspolitischen Praxis, deren Rolle und Verhalten vornehmlich zu beleuchten sei.

 diff --git a/Test/expected-results/test19.xml b/Test/expected-results/test19.xml index 13bfbb954..3116a090d 100644 --- a/Test/expected-results/test19.xml +++ b/Test/expected-results/test19.xml @@ -98,18 +98,18 @@ - A - B - C - D - E + A + B + C + D + E - 1 - 2 - 3 - 4 - 5 + 1 + 2 + 3 + 4 + 5
diff --git a/Test/expected-results/test21.odd.rnc b/Test/expected-results/test21.odd.rnc index a28e13527..b0fdf39ee 100644 --- a/Test/expected-results/test21.odd.rnc +++ b/Test/expected-results/test21.odd.rnc @@ -20,7 +20,11 @@ macro.paraContent = | model.lLike)* macro.limitedContent = (text | model.limitedPhrase | model.inter)* macro.phraseSeq = - (text | model.gLike | model.qLike | model.phrase | model.global)* + (text + | model.gLike + | model.attributable + | model.phrase + | model.global)* macro.phraseSeq.limited = (text | model.limitedPhrase | model.global)* macro.specialPara = (text @@ -1293,12 +1297,12 @@ model.nameLike.agent_sequenceOptionalRepeatable = name*, orgName*, persName* model.nameLike.agent_sequenceRepeatable = name+, orgName+, persName+ model.segLike = seg -model.hiLike = hi -model.hiLike_alternation = hi -model.hiLike_sequence = hi -model.hiLike_sequenceOptional = hi? -model.hiLike_sequenceOptionalRepeatable = hi* -model.hiLike_sequenceRepeatable = hi+ +model.hiLike = hi | q +model.hiLike_alternation = hi | q +model.hiLike_sequence = hi, q +model.hiLike_sequenceOptional = hi?, q? +model.hiLike_sequenceOptionalRepeatable = hi*, q* +model.hiLike_sequenceRepeatable = hi+, q+ model.emphLike = foreign | emph @@ -1792,15 +1796,15 @@ model.quoteLike_sequence = quote, cit model.quoteLike_sequenceOptional = quote?, cit? model.quoteLike_sequenceOptionalRepeatable = quote*, cit* model.quoteLike_sequenceRepeatable = quote+, cit+ -model.qLike = model.quoteLike | said | q -model.qLike_alternation = model.quoteLike_alternation | said | q -model.qLike_sequence = model.quoteLike_sequence, said, q -model.qLike_sequenceOptional = - model.quoteLike_sequenceOptional?, said?, q? -model.qLike_sequenceOptionalRepeatable = - model.quoteLike_sequenceOptionalRepeatable*, said*, q* -model.qLike_sequenceRepeatable = - model.quoteLike_sequenceRepeatable+, said+, q+ +model.attributable = model.quoteLike | said +model.attributable_alternation = model.quoteLike_alternation | said +model.attributable_sequence = model.quoteLike_sequence, said +model.attributable_sequenceOptional = + model.quoteLike_sequenceOptional?, said? +model.attributable_sequenceOptionalRepeatable = + model.quoteLike_sequenceOptionalRepeatable*, said* +model.attributable_sequenceRepeatable = + model.quoteLike_sequenceRepeatable+, said+ model.respLike = author | editor | respStmt | meeting | sponsor | funder | principal model.divWrapper = @@ -1959,8 +1963,8 @@ model.inter = | model.labelLike | model.listLike | model.stageLike - | model.qLike -model.common = model.divPart | model.inter + | model.attributable +model.common = model.divPart | model.inter | q model.phrase = model.segLike | model.highlighted @@ -1989,6 +1993,8 @@ model.div4Like = div4 model.div5Like = div5 model.div6Like = div6 model.div7Like = div7 +model.annotationLike = note | annotation +model.annotationPart.body = ptr | ref | note model.applicationLike = application model.teiHeaderPart = encodingDesc | profileDesc | xenoData model.sourceDescPart = notAllowed @@ -2027,8 +2033,10 @@ model.standOffPart = model.global.meta | model.biblLike | model.listLike + | model.annotationLike | listChange | seg + | listAnnotation | zone att.formula.attributes = att.formula.attribute.formula att.formula.attribute.formula = @@ -2334,12 +2342,14 @@ cit = ## (citation) citation provenant d'un autre document comprenant la référence bibliographique de sa source. Dans un dictionnaire il peut contenir un exemple avec au moins une occurrence du mot employé dans l’acception qui est décrite, ou une traduction du mot-clé, ou un exemple. [3.3.3. Quotation 4.3.1. Grouped Texts 9.3.5.1. Examples] element cit { - (model.qLike + (model.biblLike | model.egLike - | model.biblLike - | model.ptrLike + | model.entryPart | model.global - | model.entryPart)+, + | model.graphicLike + | model.ptrLike + | model.attributable + | q)+, att.global.attributes, att.typed.attributes, empty @@ -2774,12 +2784,12 @@ ptr = "\x{a}" ~ " " ], + att.cReferencing.attributes, + att.declaring.attributes, att.global.attributes, - att.pointing.attributes, att.internetMedia.attributes, + att.pointing.attributes, att.typed.attribute.subtype, - att.declaring.attributes, - att.cReferencing.attributes, ## caractérise l'élément en utilisant n'importe quel système ou typologie de classification approprié. attribute type { @@ -2819,12 +2829,12 @@ ref = "\x{a}" ~ " " ], + att.cReferencing.attributes, + att.declaring.attributes, att.global.attributes, - att.pointing.attributes, att.internetMedia.attributes, + att.pointing.attributes, att.typed.attributes, - att.declaring.attributes, - att.cReferencing.attributes, empty } \list = @@ -3475,8 +3485,8 @@ sp = | model.pLike | model.listLike | model.stageLike - | model.qLike), - model.global*)+), + | model.attributable), + (model.global* | q))+), att.global.attributes, att.ascribed.directed.attributes, empty @@ -4800,7 +4810,7 @@ fileDesc = editionStmt?, extent?, publicationStmt, - seriesStmt?, + seriesStmt*, notesStmt?), sourceDesc+), att.global.attributes, @@ -4969,6 +4979,7 @@ seriesStmt = (model.pLike+ | (title+, (editor | respStmt)*, (idno | biblScope)*)), att.global.attributes, + att.declarable.attributes, empty } notesStmt = @@ -4995,7 +5006,7 @@ biblFull = editionStmt?, extent?, publicationStmt, - seriesStmt?, + seriesStmt*, notesStmt?), sourceDesc*) | (fileDesc, profileDesc)), @@ -5339,7 +5350,7 @@ cRefPattern = } prefixDef = - ## (prefix definition) defines a prefixing scheme used in data.pointer values, showing how abbreviated URIs using the scheme may be expanded into full URIs. [16.2.3. Using Abbreviated Pointers] + ## (prefix definition) defines a prefixing scheme used in teidata.pointer values, showing how abbreviated URIs using the scheme may be expanded into full URIs. [16.2.3. Using Abbreviated Pointers] element prefixDef { model.pLike*, att.global.attributes, @@ -5353,7 +5364,7 @@ prefixDef = } listPrefixDef = - ## (list of prefix definitions) contains a list of definitions of prefixing schemes used in data.pointer values, showing how abbreviated URIs using each scheme may be expanded into full URIs. [16.2.3. Using Abbreviated Pointers] + ## (list of prefix definitions) contains a list of definitions of prefixing schemes used in teidata.pointer values, showing how abbreviated URIs using each scheme may be expanded into full URIs. [16.2.3. Using Abbreviated Pointers] element listPrefixDef { (desc*, (prefixDef | listPrefixDef)+), att.global.attributes, @@ -5707,7 +5718,7 @@ revisionDesc = } change = - ## résume une modification ou une correction apportée à une version particulière d’un texte électronique partagé entre plusieurs chercheurs. [2.6. The Revision Description 2.4.1. Creation 11.7. Identifying Changes and Revisions] + ## résume une modification ou une correction apportée à une version particulière d’un texte électronique partagé entre plusieurs chercheurs. [2.6. The Revision Description 2.4.1. Creation 11.6. Identifying Changes and Revisions] element change { macro.specialPara, att.ascribed.attributes, @@ -5733,7 +5744,7 @@ scriptNote = } listChange = - ## groups a number of change descriptions associated with either the creation of a source text or the revision of an encoded text. [2.6. The Revision Description 11.7. Identifying Changes and Revisions] + ## groups a number of change descriptions associated with either the creation of a source text or the revision of an encoded text. [2.6. The Revision Description 11.6. Identifying Changes and Revisions] element listChange { (desc*, (listChange | change)+), att.global.attributes, @@ -6239,6 +6250,120 @@ standOff = att.declaring.attributes, empty } +listAnnotation = + [ + a:documentation [ + "contains a list of annotations, typically encoded as " + ns1:code [ "" ] + ", " + ns1:code [ "" ] + ", or " + ns1:code [ "" ] + ", possibly organized with nested " + ns1:code [ "" ] + " elements. [16.10. The standOff Container]" + ] + ] + element listAnnotation { + (model.headLike*, + model.labelLike*, + (model.annotationLike | listAnnotation)+), + att.global.attributes, + att.typed.attributes, + att.notated.attributes, + att.declaring.attributes, + empty + } +annotation = + [ + a:documentation [ + "represents an annotation following the " + ns1:a [ + href = "#WADM" + "Web\x{a}" ~ + " Annotation Data Model" + ] + ". [16.10. The standOff Container]" + ] + ] + element annotation { + (respStmt*, revisionDesc*, licence*, model.annotationPart.body*), + att.global.attribute.xmllang, + att.global.attribute.xmlbase, + att.global.attribute.xmlspace, + att.global.rendition.attribute.rend, + att.global.rendition.attribute.style, + att.global.rendition.attribute.rendition, + att.global.linking.attribute.corresp, + att.global.linking.attribute.synch, + att.global.linking.attribute.sameAs, + att.global.linking.attribute.copyOf, + att.global.linking.attribute.next, + att.global.linking.attribute.prev, + att.global.linking.attribute.exclude, + att.global.linking.attribute.select, + att.global.facs.attribute.facs, + att.global.change.attribute.change, + att.global.responsibility.attribute.cert, + att.global.responsibility.attribute.resp, + att.global.source.attribute.source, + att.pointing.attribute.targetLang, + att.pointing.attribute.evaluate, + + ## (identifiant) fournit un identifiant unique pour l'élément qui porte l'attribut + attribute xml:id { xsd:ID }, + + ## précise la cible de la référence en donnant une ou plusieurs références URI + attribute target { + list { xsd:anyURI+ } + }, + + ## + attribute motivation { + list { + ( + ## intent is to assess the target resource in some way, rather than simply make a comment about it + "assessing" + | + ## intent is to create a bookmark to the target or part thereof + "bookmarking" + | + ## intent is to classify the target in some way + "classifying" + | + ## intent is to comment about the target + "commenting" + | + ## intent is to describe the target, rather than (for example) comment on it + "describing" + | + ## intent is to request an edit or a change to the target resource + "editing" + | + ## intent is to highlight the target resource or a segment thereof + "highlighting" + | + ## intent is to assign an identity to the target + "identifying" + | + ## intent is to link to a resource related to the target + "linking" + | + ## intent is to assign some value or quality to the target + "moderating" + | + ## intent is to ask a question about the target + "questioning" + | + ## intent is to reply to a previous statement, either an annotation or another resource + "replying" + | + ## intent is to associate a tag with the target + "tagging")+ + } + }?, + empty + } att.msExcerpt.attributes = att.msExcerpt.attribute.defective att.msExcerpt.attribute.defective = @@ -7572,7 +7697,7 @@ ex = } fw = - ## (élément de mise en page) permet d'encoder un titre courant (en haut ou en bas de la page), une réclame ou une autre information comparable, qui apparaît sur la page courante. [11.6. Headers, Footers, and Similar Matter] + ## (élément de mise en page) permet d'encoder un titre courant (en haut ou en bas de la page), une réclame ou une autre information comparable, qui apparaît sur la page courante. [11.5. Headers, Footers, and Similar Matter] element fw { macro.phraseSeq, att.global.attributes, @@ -7635,7 +7760,7 @@ restore = } space = - ## (espace) permet de situer un espace significatif dans le texte édité. [11.5.1. Space] + ## (espace) permet de situer un espace significatif dans le texte édité. [11.4.1. Space] element space { (model.descLike | model.certLike)*, att.global.attribute.xmlid, @@ -7680,7 +7805,7 @@ subst = ## ( substitution) regroupe une ou plusieurs parties de texte supprimées et une ou plusieurs parties de texte ajoutées, lorsque cette combinaison peut être considérée comme une intervention unique sur le texte. [11.3.1.5. Substitutions] element subst { - ((add | del | model.milestoneLike)+) + ((add | surplus | del | model.milestoneLike)+) >> sch:pattern [ id = "test21-subst-substContents1-constraint-assert-24" "\x{a}" ~ @@ -7690,11 +7815,12 @@ subst = "\x{a}" ~ " " sch:assert [ - test = "child::tei:add and child::tei:del" + test = + "child::tei:add and (child::tei:del or child::tei:surplus)" "\x{a}" ~ " " sch:name [ ] - " must have at least one child add and at least one child del" + " must have at least one child add and at least one child del or surplus" ] "\x{a}" ~ " " @@ -7709,7 +7835,7 @@ subst = } substJoin = - ## (jointure de substitution) identifies a series of possibly fragmented additions, deletions or other revisions on a manuscript that combine to make up a single intervention in the text [11.3.1.5. Substitutions] + ## (jointure de substitution) identifies a series of possibly fragmented additions, deletions, or other revisions on a manuscript that combine to make up a single intervention in the text [11.3.1.5. Substitutions] element substJoin { (model.descLike | model.certLike)*, att.global.attributes, diff --git a/Test/expected-results/test23.tex b/Test/expected-results/test23.tex index df0c9c8a8..3a6ade998 100644 --- a/Test/expected-results/test23.tex +++ b/Test/expected-results/test23.tex @@ -340,7 +340,7 @@ \par Figure links: \ref{testfig} and \hyperref[testfig]{Lessing pic}\par {\persName Edward George Bulwer-Lytton, Baron Lytton of {\placeName Knebworth}} via Marsala 24 40126 {\name Bologna} {\name Italy}\par -Languages: \textit{Deutsch}; \textit{Italiano}; \textit{Español}; \textit{Français}; \textit{Portugues}; \textit{Russian}; \textit{Svenska}; \textit{日本語}; \textit{中文}.\par +Languages: \textit{Deutsch}; \textit{Italiano}; \textit{Español}; \textit{Français}; \textit{Portugues}; \textit{Russian}; \textit{Svenska}; {\textJapanese 日本語}; {\textChinese 中文}.\par Here is a simple \texttt{} to the next section: \textit{\hyperref[P1]{1. Tests}}. Here is a simple \texttt{}, a \hyperref[P1]{reference to it}. \par \begin{longtable}{P{0.11724137931034483\textwidth}P{0.7327586206896551\textwidth}} emph\tabcellsep This is \textit{emph} tag\end{longtable} \par diff --git a/Test/expected-results/test26.fo b/Test/expected-results/test26.fo deleted file mode 100644 index 68bdcd67d..000000000 --- a/Test/expected-results/test26.fo +++ /dev/null @@ -1 +0,0 @@ -Identificationwhere is it, repository name, identifier \ No newline at end of file diff --git a/Test/expected-results/test26.html b/Test/expected-results/test26.html deleted file mode 100644 index df2fb4168..000000000 --- a/Test/expected-results/test26.html +++ /dev/null @@ -1,4 +0,0 @@ -Title

A TEI Project

Title

Identification

where is it, repository name, identifier
Parent Institution | TEI| Search | Feedback
Date: 1970-01-01
\ No newline at end of file diff --git a/Test/expected-results/test26.tex b/Test/expected-results/test26.tex deleted file mode 100644 index 088220ac6..000000000 --- a/Test/expected-results/test26.tex +++ /dev/null @@ -1,322 +0,0 @@ -\documentclass[11pt,twoside]{article}\makeatletter - -\IfFileExists{xcolor.sty}% - {\RequirePackage{xcolor}}% - {\RequirePackage{color}} -\usepackage{colortbl} - -\IfFileExists{utf8x.def}% - {\usepackage[utf8x]{inputenc} - \PrerenderUnicode{–} - }% - {\usepackage[utf8]{inputenc}} - - -\usepackage[english]{babel} - -\usepackage[T1]{fontenc} -\usepackage{float} -\usepackage[]{ucs} -\uc@dclc{8421}{default}{\textbackslash } -\uc@dclc{10100}{default}{\{} -\uc@dclc{10101}{default}{\}} -\uc@dclc{8491}{default}{\AA{}} -\uc@dclc{8239}{default}{\,} -\uc@dclc{20154}{default}{ } -\uc@dclc{10148}{default}{>} -\def\textschwa{\rotatebox{-90}{e}} -\def\textJapanese{} -\def\textChinese{} - -\DeclareTextSymbol{\textpi}{OML}{25} -\usepackage{relsize} -\def\textsubscript#1{% - \@textsubscript{\selectfont#1}} -\def\@textsubscript#1{% - {\m@th\ensuremath{_{\mbox{\fontsize\sf@size\z@#1}}}}} -\def\textquoted#1{‘#1’} -\def\textsmall#1{{\small #1}} -\def\textlarge#1{{\large #1}} -\def\textoverbar#1{\ensuremath{\overline{#1}}} -\def\textgothic#1{{\fontspec{Lucida Blackletter}#1}} -\def\textcal#1{{\fontspec{Lucida Calligraphy}#1}} -\RequirePackage{array} -\def\@testpach{\@chclass - \ifnum \@lastchclass=6 \@ne \@chnum \@ne \else - \ifnum \@lastchclass=7 5 \else - \ifnum \@lastchclass=8 \tw@ \else - \ifnum \@lastchclass=9 \thr@@ - \else \z@ - \ifnum \@lastchclass = 10 \else - \edef\@nextchar{\expandafter\string\@nextchar}% - \@chnum - \if \@nextchar c\z@ \else - \if \@nextchar l\@ne \else - \if \@nextchar r\tw@ \else - \z@ \@chclass - \if\@nextchar |\@ne \else - \if \@nextchar !6 \else - \if \@nextchar @7 \else - \if \@nextchar (8 \else - \if \@nextchar )9 \else - 10 - \@chnum - \if \@nextchar m\thr@@\else - \if \@nextchar p4 \else - \if \@nextchar b5 \else - \z@ \@chclass \z@ \@preamerr \z@ \fi \fi \fi \fi - \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi \fi} - -\gdef\arraybackslash{\let\\=\@arraycr} -\def\textxi{\ensuremath{\xi}} -\def\Panel#1#2#3#4{\multicolumn{#3}{){\columncolor{#2}}#4}{#1}} - -\newcolumntype{L}[1]{){\raggedright\arraybackslash}p{#1}} -\newcolumntype{C}[1]{){\centering\arraybackslash}p{#1}} -\newcolumntype{R}[1]{){\raggedleft\arraybackslash}p{#1}} -\newcolumntype{P}[1]{){\arraybackslash}p{#1}} -\newcolumntype{B}[1]{){\arraybackslash}b{#1}} -\newcolumntype{M}[1]{){\arraybackslash}m{#1}} -\definecolor{label}{gray}{0.75} -\def\unusedattribute#1{\sout{\textcolor{label}{#1}}} -\DeclareRobustCommand*{\xref}{\hyper@normalise\xref@} -\def\xref@#1#2{\hyper@linkurl{#2}{#1}} -\def\Div[#1]#2{\section*{#2}} -\begingroup -\catcode`\_=\active -\gdef_#1{\ensuremath{\sb{\mathrm{#1}}}} -\endgroup -\mathcode`\_=\string"8000 -\catcode`\_=12\relax - -\usepackage[a4paper,twoside,lmargin=1in,rmargin=1in,tmargin=1in,bmargin=1in]{geometry} -\usepackage{framed} - -\definecolor{shadecolor}{gray}{0.95} -\usepackage{longtable} -\usepackage[normalem]{ulem} -\usepackage{fancyvrb} -\usepackage{fancyhdr} -\usepackage{marginnote} -\renewcommand*{\marginfont}{\itshape\footnotesize} -\setlength\marginparwidth{.75in} -\usepackage{graphicx} - -\def\Gin@extensions{.pdf,.png,.jpg,.mps,.tif} - -\IfFileExists{tipa.sty}{\usepackage{tipa}}{} -\usepackage{times} - - \pagestyle{fancy} - -\usepackage[pdftitle={Title}, - pdfauthor={}]{hyperref} -\hyperbaseurl{} - - \paperwidth210mm - \paperheight297mm - -\def\@pnumwidth{1.55em} -\def\@tocrmarg {2.55em} -\def\@dotsep{4.5} -\setcounter{tocdepth}{3} -\clubpenalty=8000 -\emergencystretch 3em -\hbadness=4000 -\hyphenpenalty=400 -\pretolerance=750 -\tolerance=2000 -\vbadness=4000 -\widowpenalty=10000 - -\renewcommand\section{\@startsection {section}{1}{\z@}% - {-1.75ex \@plus -0.5ex \@minus -.2ex}% - {0.5ex \@plus .2ex}% - {\reset@font\Large\bfseries\sffamily}} -\renewcommand\subsection{\@startsection{subsection}{2}{\z@}% - {-1.75ex\@plus -0.5ex \@minus- .2ex}% - {0.5ex \@plus .2ex}% - {\reset@font\Large\sffamily}} -\renewcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}% - {-1.5ex\@plus -0.35ex \@minus -.2ex}% - {0.5ex \@plus .2ex}% - {\reset@font\large\sffamily}} -\renewcommand\paragraph{\@startsection{paragraph}{4}{\z@}% - {-1ex \@plus-0.35ex \@minus -0.2ex}% - {0.5ex \@plus .2ex}% - {\reset@font\normalsize\sffamily}} -\renewcommand\subparagraph{\@startsection{subparagraph}{5}{\parindent}% - {1.5ex \@plus1ex \@minus .2ex}% - {-1em}% - {\reset@font\normalsize\bfseries}} - - -\def\l@section#1#2{\addpenalty{\@secpenalty} \addvspace{1.0em plus 1pt} - \@tempdima 1.5em \begingroup - \parindent \z@ \rightskip \@pnumwidth - \parfillskip -\@pnumwidth - \bfseries \leavevmode #1\hfil \hbox to\@pnumwidth{\hss #2}\par - \endgroup} -\def\l@subsection{\@dottedtocline{2}{1.5em}{2.3em}} -\def\l@subsubsection{\@dottedtocline{3}{3.8em}{3.2em}} -\def\l@paragraph{\@dottedtocline{4}{7.0em}{4.1em}} -\def\l@subparagraph{\@dottedtocline{5}{10em}{5em}} -\@ifundefined{c@section}{\newcounter{section}}{} -\@ifundefined{c@chapter}{\newcounter{chapter}}{} -\newif\if@mainmatter -\@mainmattertrue -\def\chaptername{Chapter} -\def\frontmatter{% - \pagenumbering{roman} - \def\thechapter{\@roman\c@chapter} - \def\theHchapter{\alph{chapter}} - \def\@chapapp{}% -} -\def\mainmatter{% - \cleardoublepage - \def\thechapter{\@arabic\c@chapter} - \setcounter{chapter}{0} - \setcounter{section}{0} - \pagenumbering{arabic} - \setcounter{secnumdepth}{6} - \def\@chapapp{\chaptername}% - \def\theHchapter{\arabic{chapter}} -} -\def\backmatter{% - \cleardoublepage - \setcounter{chapter}{0} - \setcounter{section}{0} - \setcounter{secnumdepth}{0} - \def\@chapapp{\appendixname}% - \def\thechapter{\@Alph\c@chapter} - \def\theHchapter{\Alph{chapter}} - \appendix -} -\newenvironment{bibitemlist}[1]{% - \list{\@biblabel{\@arabic\c@enumiv}}% - {\settowidth\labelwidth{\@biblabel{#1}}% - \leftmargin\labelwidth - \advance\leftmargin\labelsep - \@openbib@code - \usecounter{enumiv}% - \let\p@enumiv\@empty - \renewcommand\theenumiv{\@arabic\c@enumiv}% - }% - \sloppy - \clubpenalty4000 - \@clubpenalty \clubpenalty - \widowpenalty4000% - \sfcode`\.\@m}% - {\def\@noitemerr - {\@latex@warning{Empty `bibitemlist' environment}}% - \endlist} - -\def\tableofcontents{\section*{\contentsname}\@starttoc{toc}} -\parskip0pt -\parindent1em -\def\Panel#1#2#3#4{\multicolumn{#3}{){\columncolor{#2}}#4}{#1}} -\newenvironment{reflist}{% - \begin{raggedright}\begin{list}{} - {% - \setlength{\topsep}{0pt}% - \setlength{\rightmargin}{0.25in}% - \setlength{\itemsep}{0pt}% - \setlength{\itemindent}{0pt}% - \setlength{\parskip}{0pt}% - \setlength{\parsep}{2pt}% - \def\makelabel##1{\itshape ##1}}% - } - {\end{list}\end{raggedright}} -\newenvironment{sansreflist}{% - \begin{raggedright}\begin{list}{} - {% - \setlength{\topsep}{0pt}% - \setlength{\rightmargin}{0.25in}% - \setlength{\itemindent}{0pt}% - \setlength{\parskip}{0pt}% - \setlength{\itemsep}{0pt}% - \setlength{\parsep}{2pt}% - \def\makelabel##1{\upshape\sffamily ##1}}% - } - {\end{list}\end{raggedright}} -\newenvironment{specHead}[2]% - {\vspace{20pt}\hrule\vspace{10pt}% - \hypertarget{#1}{}% - \markright{#2}% - - \pdfbookmark[2]{#2}{#1}% - \hspace{-0.75in}{\bfseries\fontsize{16pt}{18pt}\selectfont#2}% - }{} - -\@ifundefined{chapter}{% - \def\DivI{\section} - \def\DivII{\subsection} - \def\DivIII{\subsubsection} - \def\DivIV{\paragraph} - \def\DivV{\subparagraph} - \def\DivIStar[#1]#2{\section*{#2}} - \def\DivIIStar[#1]#2{\subsection*{#2}} - \def\DivIIIStar[#1]#2{\subsubsection*{#2}} - \def\DivIVStar[#1]#2{\paragraph*{#2}} - \def\DivVStar[#1]#2{\subparagraph*{#2}} -}{% - \def\DivI{\chapter} - \def\DivII{\section} - \def\DivIII{\subsection} - \def\DivIV{\subsubsection} - \def\DivV{\paragraph} - \def\DivIStar[#1]#2{\chapter*{#2}} - \def\DivIIStar[#1]#2{\section*{#2}} - \def\DivIIIStar[#1]#2{\subsection*{#2}} - \def\DivIVStar[#1]#2{\subsubsection*{#2}} - \def\DivVStar[#1]#2{\paragraph*{#2}} -} -\def\TheFullDate{1970-01-01} -\def\TheID{\makeatother } -\def\TheDate{1970-01-01} -\title{Title} -\author{}\let\tabcellsep& - \catcode`\&=12\relax \makeatletter -\makeatletter -\thispagestyle{empty} -\markright{\@title}\markboth{\@title}{\@author} -\renewcommand\small{\@setfontsize\small{9pt}{11pt}\abovedisplayskip 8.5\p@ plus3\p@ minus4\p@ -\belowdisplayskip \abovedisplayskip -\abovedisplayshortskip \z@ plus2\p@ -\belowdisplayshortskip 4\p@ plus2\p@ minus2\p@ -\def\@listi{\leftmargin\leftmargini - \topsep 2\p@ plus1\p@ minus1\p@ - \parsep 2\p@ plus\p@ minus\p@ - \itemsep 1pt} -} -\makeatother -\fvset{frame=single,numberblanklines=false,xleftmargin=5mm,xrightmargin=5mm} -\fancyhf{} -\setlength{\headheight}{14pt} -\fancyhead[LE]{\bfseries\leftmark} -\fancyhead[RO]{\bfseries\rightmark} -\fancyfoot[RO]{} -\fancyfoot[CO]{\thepage} -\fancyfoot[LO]{\TheID} -\fancyfoot[LE]{} -\fancyfoot[CE]{\thepage} -\fancyfoot[RE]{\TheID} -\hypersetup{citebordercolor=0.75 0.75 0.75,linkbordercolor=0.75 0.75 0.75,urlbordercolor=0.75 0.75 0.75,bookmarksnumbered=true} -\fancypagestyle{plain}{\fancyhead{}\renewcommand{\headrulewidth}{0pt}}\makeatother -\begin{document} - -\makeatletter -\noindent\parbox[b]{.75\textwidth}{\fontsize{14pt}{16pt}\bfseries\raggedright\sffamily\selectfont \@title} -\vskip20pt -\par\noindent{\fontsize{11pt}{13pt}\sffamily\itshape\raggedright\selectfont\@author\hfill\TheDate} -\vspace{18pt} -\makeatother - -\catcode`\$=12\relax -\catcode`\^=12\relax -\catcode`\#=12\relax -\catcode`\%=12\relax - -\section{Identification} -where is it, repository name, identifier -\end{document} diff --git a/Test/expected-results/test29.xml b/Test/expected-results/test29.xml index 5154cdf14..3e3d630a2 100644 --- a/Test/expected-results/test29.xml +++ b/Test/expected-results/test29.xml @@ -70,8 +70,12 @@

Notes 4

-

Indexes 4

-

Bibliography 4

+

+ Indexes 4 +

+

+ Bibliography 4 +

Page breaks 4

@@ -164,10 +168,8 @@ Figures and Tables

Here we reference Figure 1 as well as Table 1: Overview and Table 2.

- - - - + + Figure 1: An included image
@@ -179,138 +181,142 @@

Figure 2. An embedded .xslx graph, doesn’t work yet.
- - - - - Lendava - - - Murska Sobota - - - Beltinci - - - okoliške vasi - - - skupaj - - - - - 1778 - - - 14 - - - 0 - - - 0 - - - 0 - - - 14 - - - - - 1793 - - - 19 - - - 14 - - - 21 - - - 6 - - - 60 - - - - - 1812 - - - 23 - - - 13 - - - 40 - - - 0 - - - 76 - - +
+
+ + + + Lendava + + + Murska Sobota + + + Beltinci + + + okoliške vasi + + + skupaj + + + + + 1778 + + + 14 + + + 0 + + + 0 + + + 0 + + + 14 + + + + + 1793 + + + 19 + + + 14 + + + 21 + + + 6 + + + 60 + + + + + 1812 + + + 23 + + + 13 + + + 40 + + + 0 + + + 76 + + +
Table 1 A Simple table - - - - - SLOVENSKE DEŽELE - - - - - - 144 - - - 192 - - - 182 - - - - - - 96 - - - 89 - - - 145 - - - - - Ljubljana - - - (74) - - - (76) - - - (95) - - - - - Sodni okraji z ozemlja današnje slovenske Primorske - - + +
+
+ + + SLOVENSKE DEŽELE + + + + + + 144 + + + 192 + + + 182 + + + + + + 96 + + + 89 + + + 145 + + + + + Ljubljana + + + (74) + + + (76) + + + (95) + + + + + Sodni okraji z ozemlja današnje slovenske Primorske + + +
Table 2 A bit more Complex table - +
Other features @@ -398,18 +404,15 @@ Auto-generated sections
Index -

bugs

+

bugs

horrible bugs. See bugs

error, 4

formatting, 4

Range

-

Subrange, 7

+

Subrange, 7

Web, 4

Web app, 4

Web service, 4

-

- -

List of Figures diff --git a/Test/expected-results/test30.dtd b/Test/expected-results/test30.dtd index cfc3e469a..9810cda8d 100644 --- a/Test/expected-results/test30.dtd +++ b/Test/expected-results/test30.dtd @@ -557,11 +557,11 @@ to %teidata.word; #IMPLIED'> - - - - - + + + + + @@ -787,11 +787,11 @@ to %teidata.word; #IMPLIED'> - - - - - + + + + + @@ -892,16 +892,16 @@ to %teidata.word; #IMPLIED'> - - - - - - - - - - + + + + + + + + + + @@ -927,6 +927,16 @@ to %teidata.word; #IMPLIED'> + + + + + + + + + + @@ -957,11 +967,11 @@ to %teidata.word; #IMPLIED'> - - - - - + + + + + - + @@ -1298,6 +1308,30 @@ mode (excl|incl) "excl" > + + + + @@ -1352,7 +1386,7 @@ status (free|unknown|restricted) #IMPLIED > %Tatt.sortable.attributes; %Tatt.docStatus.attributes; > - + - + - + %Tatt.typed.attributes; %Tatt.written.attributes; > - + @@ -1873,7 +1907,7 @@ type %teidata.enumerated; #IMPLIED > - + %Tatt.sortable.attributes; %Tatt.typed.attribute.subtype; type %teidata.enumerated; #IMPLIED > + + + + @@ -2183,7 +2225,7 @@ type %teidata.enumerated; #IMPLIED > %Tatt.sortable.attributes; %Tatt.declarable.attributes; %Tatt.typed.attributes; > - + %Tatt.typed.attributes; %Tatt.declarable.attributes; %Tatt.sortable.attributes; > - + %Tatt.typed.attributes; %Tatt.editLike.attributes; %Tatt.sortable.attributes; -role CDATA #IMPLIED > +role NMTOKENS #IMPLIED > @@ -2608,7 +2650,7 @@ bill CDATA #IMPLIED > - + + %Tatt.pointing.attributes; + %Tatt.typed.attributes; > @@ -2701,12 +2743,12 @@ target CDATA #IMPLIED > + %Tatt.pointing.attributes; + %Tatt.typed.attributes; > @@ -2898,7 +2940,8 @@ reason CDATA #IMPLIED > + %Tatt.global.attributes; + %Tatt.declarable.attributes; > @@ -2970,12 +3013,12 @@ code %teidata.pointer; #IMPLIED > %Tatt.global.attributes; %Tatt.declaring.attributes; > - + - + %Tatt.global.attributes; %Tatt.declarable.attributes; %Tatt.styleDef.attributes; > - - + + - + > sch:pattern [ id = "testbasic-subst-substContents1-constraint-assert-17" "\x{a}" ~ @@ -6231,11 +6239,12 @@ Tsubst = "\x{a}" ~ " " sch:assert [ - test = "child::tei:add and child::tei:del" + test = + "child::tei:add and (child::tei:del or child::tei:surplus)" "\x{a}" ~ " " sch:name [ ] - " must have at least one child add and at least one child del" + " must have at least one child add and at least one child del or surplus" ] "\x{a}" ~ " " @@ -6250,7 +6259,7 @@ Tsubst = } TsubstJoin = - ## (substitution join) identifies a series of possibly fragmented additions, deletions or other revisions on a manuscript that combine to make up a single intervention in the text [11.3.1.5. Substitutions] + ## (substitution join) identifies a series of possibly fragmented additions, deletions, or other revisions on a manuscript that combine to make up a single intervention in the text [11.3.1.5. Substitutions] element substJoin { (Tmodel.descLike | Tmodel.certLike)*, Tatt.global.attributes, @@ -6666,7 +6675,7 @@ Twhen = | xsd:token { pattern = "[^\p{C}\p{Z}]+" } }?, - ## specifies a time interval either as a number or as one of the keywords defined by the datatype data.interval + ## specifies a time interval either as a number or as one of the keywords defined by the datatype teidata.interval attribute interval { xsd:float | ( @@ -6919,6 +6928,119 @@ TstandOff = Tatt.declaring.attributes, empty } +TlistAnnotation = + [ + a:documentation [ + "contains a list of annotations, typically encoded as " + ns1:code [ "" ] + ", " + ns1:code [ "" ] + ", or " + ns1:code [ "" ] + ", possibly organized with nested " + ns1:code [ "" ] + " elements. [16.10. The standOff Container]" + ] + ] + element listAnnotation { + (Tmodel.headLike*, + Tmodel.labelLike*, + (Tmodel.annotationLike | TlistAnnotation)+), + Tatt.global.attributes, + Tatt.typed.attributes, + Tatt.notated.attributes, + Tatt.declaring.attributes, + empty + } +Tannotation = + [ + a:documentation [ + "represents an annotation following the " + ns1:a [ + href = "#WADM" + "Web\x{a}" ~ + " Annotation Data Model" + ] + ". [16.10. The standOff Container]" + ] + ] + element annotation { + (TrespStmt*, + TrevisionDesc*, + Tlicence*, + Tmodel.annotationPart.body*), + Tatt.global.attribute.xmllang, + Tatt.global.attribute.xmlbase, + Tatt.global.attribute.xmlspace, + Tatt.global.rendition.attribute.rend, + Tatt.global.rendition.attribute.style, + Tatt.global.rendition.attribute.rendition, + Tatt.global.linking.attribute.sameAs, + Tatt.global.linking.attribute.copyOf, + Tatt.global.linking.attribute.exclude, + Tatt.global.linking.attribute.select, + Tatt.global.facs.attribute.facs, + Tatt.global.change.attribute.change, + Tatt.global.responsibility.attribute.cert, + Tatt.global.responsibility.attribute.resp, + Tatt.global.source.attribute.source, + Tatt.pointing.attribute.targetLang, + Tatt.pointing.attribute.evaluate, + + ## (identifier) provides a unique identifier for the element bearing the attribute. + attribute xml:id { xsd:ID }, + + ## specifies the destination of the reference by supplying one or more URI References + attribute target { + list { xsd:anyURI+ } + }, + + ## + attribute motivation { + list { + ( + ## intent is to assess the target resource in some way, rather than simply make a comment about it + "assessing" + | + ## intent is to create a bookmark to the target or part thereof + "bookmarking" + | + ## intent is to classify the target in some way + "classifying" + | + ## intent is to comment about the target + "commenting" + | + ## intent is to describe the target, rather than (for example) comment on it + "describing" + | + ## intent is to request an edit or a change to the target resource + "editing" + | + ## intent is to highlight the target resource or a segment thereof + "highlighting" + | + ## intent is to assign an identity to the target + "identifying" + | + ## intent is to link to a resource related to the target + "linking" + | + ## intent is to assign some value or quality to the target + "moderating" + | + ## intent is to ask a question about the target + "questioning" + | + ## intent is to reply to a previous statement, either an annotation or another resource + "replying" + | + ## intent is to associate a tag with the target + "tagging")+ + } + }?, + empty + } TTEI = [ a:documentation [ diff --git a/Test/expected-results/test34.odd.html b/Test/expected-results/test34.odd.html index a5773dbdc..fbff7814d 100644 --- a/Test/expected-results/test34.odd.html +++ b/Test/expected-results/test34.odd.html @@ -315,10 +315,10 @@

Content model - 
+                
 <content>
 </content>
-    

+    ⚓
@@ -326,8 +326,8 @@

Schema Declaration - 
-element cit { tei_ref, macro.specialPara+, text }
+ 
+element cit { tei_ref, macro.specialPara+, text }⚓
@@ -601,10 +601,10 @@

Content model - 
+                
 <content>
 </content>
-    

+    ⚓
@@ -612,8 +612,8 @@

Schema Declaration - 
-element cit { tei_ref, macro.specialPara+, text }
+ 
+element cit { tei_ref, macro.specialPara+, text }⚓
@@ -887,10 +887,10 @@

Content model - 
+                
 <content>
 </content>
-    

+    ⚓
@@ -898,8 +898,8 @@

Schema Declaration - 
-element q { tei_ref, macro.specialPara+, text }
+ 
+element q { tei_ref, macro.specialPara+, text }⚓
diff --git a/Test/expected-results/test37.xml b/Test/expected-results/test37.xml index 3056cddbd..d4ba53ae2 100644 --- a/Test/expected-results/test37.xml +++ b/Test/expected-results/test37.xml @@ -37,7 +37,7 @@
-

+

Docx To TEI

diff --git a/Test/expected-results/test39.xml b/Test/expected-results/test39.xml index 42d2a8c2d..8e707238c 100644 --- a/Test/expected-results/test39.xml +++ b/Test/expected-results/test39.xml @@ -183,10 +183,19 @@

It is possible to have two images in one figure (i.e. with one Caption). As shown in Figure 2 they can be side by side or they can be side by side i.e. separated by a paragraph mark , c.f. Figure 3.

+ + Figure 2 Two images, side by side
- +
+ + + +
+
+ +
Figure 3 Two images one above the other

Figures in Word can also be embedded Excel graphs, as is the case with Figure 4. However, this conversion currently does not work.

@@ -207,138 +216,142 @@
Tables

Tables, even somewhat more complicated ones (e.g. Table 2) can also be converted to TEI. However, the details of their layout and formatting will not be preserved. As with Figures, it is currently not possible to convert embedded Excel spreadsheets.

- - - - - Lendava - - - Murska Sobota - - - Beltinci - - - okoliške vasi - - - skupaj - - - - - 1778 - - - 14 - - - 0 - - - 0 - - - 0 - - - 14 - - - - - 1793 - - - 19 - - - 14 - - - 21 - - - 6 - - - 60 - - - - - 1812 - - - 23 - - - 13 - - - 40 - - - 0 - - - 76 - - +
+
+ + + + Lendava + + + Murska Sobota + + + Beltinci + + + okoliške vasi + + + skupaj + + + + + 1778 + + + 14 + + + 0 + + + 0 + + + 0 + + + 14 + + + + + 1793 + + + 19 + + + 14 + + + 21 + + + 6 + + + 60 + + + + + 1812 + + + 23 + + + 13 + + + 40 + + + 0 + + + 76 + + +
Table 1 A Simple table - - - - - SLOVENSKE DEŽELE - - - - - - 144 - - - 192 - - - 182 - - - - - - 96 - - - 89 - - - 145 - - - - - Ljubljana - - - (74) - - - (76) - - - (95) - - - - - Sodni okraji z ozemlja današnje slovenske Primorske - - + +
+
+ + + SLOVENSKE DEŽELE + + + + + + 144 + + + 192 + + + 182 + + + + + + 96 + + + 89 + + + 145 + + + + + Ljubljana + + + (74) + + + (76) + + + (95) + + + + + Sodni okraji z ozemlja današnje slovenske Primorske + + +
Table 2 A more complex table with multi columns - +
Indexes diff --git a/Test/expected-results/test6.xml.docx.document b/Test/expected-results/test6.xml.docx_document.xml similarity index 100% rename from Test/expected-results/test6.xml.docx.document rename to Test/expected-results/test6.xml.docx_document.xml diff --git a/Test/expected-results/test8.epub.listing b/Test/expected-results/test8.epub.listing deleted file mode 100644 index dc36efd65..000000000 --- a/Test/expected-results/test8.epub.listing +++ /dev/null @@ -1,26 +0,0 @@ -Archive: test8.epub - testing: mimetype OK - testing: META-INF/ OK - testing: OPS/ OK - testing: OPS/media/ OK - testing: META-INF/container.xml OK - testing: OPS/content.opf OK - testing: OPS/index-body.1_div.1.html OK - testing: OPS/index-body.1_div.2.html OK - testing: OPS/index-body.1_div.3.html OK - testing: OPS/index.html OK - testing: OPS/media/resource1.jpg OK - testing: OPS/media/resource2.jpg OK - testing: OPS/media/resource3.jpg OK - testing: OPS/media/resource4.jpg OK - testing: OPS/media/resource5.jpg OK - testing: OPS/media/resource6.jpg OK - testing: OPS/media/resource7.jpg OK - testing: OPS/media/resource8.jpg OK - testing: OPS/page-template.xpgt OK - testing: OPS/print.css OK - testing: OPS/stylesheet.css OK - testing: OPS/titlepage.html OK - testing: OPS/titlepageback.html OK - testing: OPS/toc.ncx OK -No errors detected in compressed data of test8.epub. diff --git a/Test/expected-results/testnotes/index.html b/Test/expected-results/testnotes/index.html index 3cc1dd704..0952c773d 100644 --- a/Test/expected-results/testnotes/index.html +++ b/Test/expected-results/testnotes/index.html @@ -10,7 +10,7 @@ - + diff --git a/Test/expected-results/testnotes/one.html b/Test/expected-results/testnotes/one.html index 63a3baf11..4dc4d56ca 100644 --- a/Test/expected-results/testnotes/one.html +++ b/Test/expected-results/testnotes/one.html @@ -10,7 +10,7 @@ - + diff --git a/Test/expected-results/testnotes/three.html b/Test/expected-results/testnotes/three.html index 182b6a5e4..b956e5f02 100644 --- a/Test/expected-results/testnotes/three.html +++ b/Test/expected-results/testnotes/three.html @@ -10,7 +10,7 @@ - + diff --git a/Test/expected-results/testnotes/two.html b/Test/expected-results/testnotes/two.html index 205851d5f..a60854fab 100644 --- a/Test/expected-results/testnotes/two.html +++ b/Test/expected-results/testnotes/two.html @@ -10,7 +10,7 @@ - + diff --git a/Test/expected-results/testnotes1.xml.docx.document b/Test/expected-results/testnotes1.xml.docx_document.xml similarity index 100% rename from Test/expected-results/testnotes1.xml.docx.document rename to Test/expected-results/testnotes1.xml.docx_document.xml diff --git a/Test/expected-results/testnotes2/index.html b/Test/expected-results/testnotes2/index.html index 493159173..5b7ba7bc3 100644 --- a/Test/expected-results/testnotes2/index.html +++ b/Test/expected-results/testnotes2/index.html @@ -10,7 +10,7 @@ - + diff --git a/Test/expected-results/testnotes2/one.html b/Test/expected-results/testnotes2/one.html index 74cd8d0cf..c6adb5292 100644 --- a/Test/expected-results/testnotes2/one.html +++ b/Test/expected-results/testnotes2/one.html @@ -10,7 +10,7 @@ - + diff --git a/Test/expected-results/testnotes2/three.html b/Test/expected-results/testnotes2/three.html index 09f8b322f..5181b8384 100644 --- a/Test/expected-results/testnotes2/three.html +++ b/Test/expected-results/testnotes2/three.html @@ -10,7 +10,7 @@ - + diff --git a/Test/expected-results/testnotes3/index.html b/Test/expected-results/testnotes3/index.html index eed8b663e..ff0a8c2d9 100644 --- a/Test/expected-results/testnotes3/index.html +++ b/Test/expected-results/testnotes3/index.html @@ -10,7 +10,7 @@ - + diff --git a/Test/expected-results/testnotes3/one.html b/Test/expected-results/testnotes3/one.html index 21ee64f82..f11402fe0 100644 --- a/Test/expected-results/testnotes3/one.html +++ b/Test/expected-results/testnotes3/one.html @@ -10,7 +10,7 @@ - + diff --git a/Test/expected-results/testnotes3/three.html b/Test/expected-results/testnotes3/three.html index 09f8b322f..5181b8384 100644 --- a/Test/expected-results/testnotes3/three.html +++ b/Test/expected-results/testnotes3/three.html @@ -10,7 +10,7 @@ - + diff --git a/Test/expected-results/testnotes3/two.html b/Test/expected-results/testnotes3/two.html index c9fd99b94..91a8670e3 100644 --- a/Test/expected-results/testnotes3/two.html +++ b/Test/expected-results/testnotes3/two.html @@ -10,7 +10,7 @@ - + diff --git a/Test/test29.docx b/Test/test29.docx index bacf38c9d..44a9cb697 100644 Binary files a/Test/test29.docx and b/Test/test29.docx differ diff --git a/Test/test39.docx b/Test/test39.docx index 5bff555c5..95022b637 100644 Binary files a/Test/test39.docx and b/Test/test39.docx differ diff --git a/Test/xml.xsd b/Test/xml.xsd index 75e3eabde..275cb51e1 100644 --- a/Test/xml.xsd +++ b/Test/xml.xsd @@ -1,6 +1,7 @@ - + (identifier) provides a unique identifier for the element bearing the attribute. diff --git a/Test2/README.md b/Test2/README.md index 8434086da..07aec4a66 100644 --- a/Test2/README.md +++ b/Test2/README.md @@ -17,6 +17,18 @@ Example usages: `ant odt` runs only the odt tests. Similarly, `ant docx`, `ant fo`, `ant odd`, and others. +### How the tests are run + +Some tests are run by invoking the bin/thing2thing symlinks, which call the universal bin/transformtei script. Others are run by directly invoking Saxon to do an XSLT tranformation. The latter approach is faster and simpler for transformation which involve only XSLT transformation; where other processes are used (such as FO to PDF conversion) the bin script is more straightforward. Read the ant files for more info. + + +### Tests not included + +Note that the following tests that used to be run in Test are not [yet] covered in Test2: + + [TODO: @sydb and @martindholmes are working on this list.] + + diff --git a/Test2/build.xml b/Test2/build.xml index 39232ea3f..db5dcbd71 100644 --- a/Test2/build.xml +++ b/Test2/build.xml @@ -7,6 +7,9 @@ Stylesheets/Test2/build.xml ANT TEST FILE FOR THE TEI STYLESHEETS. + + FOR DETAILED USAGE INFORMATION, SEE THE README*.md FILES + IN THE Test2 DIRECTORY. MDH 2017: This is an EXPERIMENTAL build file which is attempting to wholly replace the Makefile in the Stylesheets/Test diff --git a/Test2/build_utilities.xml b/Test2/build_utilities.xml index 8c448325a..cc8402fac 100644 --- a/Test2/build_utilities.xml +++ b/Test2/build_utilities.xml @@ -33,6 +33,9 @@ expected results en masse. --> + + + @@ -236,14 +239,27 @@ + - + + + + + + + + + diff --git a/Test2/cleanForDiff.xsl b/Test2/cleanForDiff.xsl index f8581abd7..525545fc2 100644 --- a/Test2/cleanForDiff.xsl +++ b/Test2/cleanForDiff.xsl @@ -41,7 +41,7 @@ - + Error: no target for link diff --git a/Test2/expected-results/testDocxListsTables1.xml b/Test2/expected-results/testDocxListsTables1.xml index 786a133b1..961484a2d 100644 --- a/Test2/expected-results/testDocxListsTables1.xml +++ b/Test2/expected-results/testDocxListsTables1.xml @@ -105,18 +105,18 @@ - A - B - C - D - E + A + B + C + D + E - 1 - 2 - 3 - 4 - 5 + 1 + 2 + 3 + 4 + 5
diff --git a/Test2/expected-results/testNotes2.xml b/Test2/expected-results/testNotes2.xml index 8c29e17d3..0ae82ad69 100644 --- a/Test2/expected-results/testNotes2.xml +++ b/Test2/expected-results/testNotes2.xml @@ -49,12 +49,12 @@ Mehrere sicherheitspolitische Akteure können aus verschiedenen Gründen nach der Kopenhagener Schule einen „Sicherheitskomplex“ bilden. „A security complex is defined as a set of states whose major security perceptions and concerns are so interlinked that their national security problems cannot reasonably be analysed or resolved apart from one another. The formative dynamics and structure of a security complex are generated by the states within that complex – by their security perceptions of, and interactions with, each other. Individual security complexes are durable but not permanent features of the international system. The theory posits that in a geographically diverse, anarchic international system, security complexes are a normal and expected feature […].” -

+

Buzan/Wæver/Wilde, Security. A new Framework for Analysis, S. 12.

 Mit Thesen zu Sicherheitskomplexen betont die Kopenhagener Schule die Regionalität der Sicherheit. Trotz weltweiter Vernetzung und Globalisierung seien nur die wenigsten Akteure an allen sicherheitspolitischen Entwicklungen weltweit und zu jeder Zeit interessiert. Die meisten Sicherheitsangelegenheiten sind nach Überzeugung der Kopenhagener Schule regional, häufig innerhalb eines Staates oder in direkter Nachbarschaft angelegt, da sich potenzielle Bedrohungen in vielen Fällen schneller über kurze als über lange Entfernungen ausbreiten. -

Hier zeigt sich erneut ein Unterschied zum Realismus, der von Wissenschaftlern in den USA vertreten wird. Die USA werden dort als eine globale Macht mit weltweiten sicherheitspolitischen Interessen gesehen, was sich unter anderem an Diskursen zeigt, die nach dem Kalten Krieg geführt wurden und bis heute werden, sei es zu „Kampf der Kulturen“, „Unipolarität“, „Krieg gegen den Terrorismus“ oder „Globalisierung“.

+

Hier zeigt sich erneut ein Unterschied zum Realismus, der von Wissenschaftlern in den USA vertreten wird. Die USA werden dort als eine globale Macht mit weltweiten sicherheitspolitischen Interessen gesehen, was sich unter anderem an Diskursen zeigt, die nach dem Kalten Krieg geführt wurden und bis heute werden, sei es zu „Kampf der Kulturen“, „Unipolarität“, „Krieg gegen den Terrorismus“ oder „Globalisierung“.

@@ -81,11 +81,11 @@ Die Pariser Schule, deren zentrale Vertreter Didier Bigo -

Vgl. exemplarisch: Bigo, Polices en résaux; Bigo, L’Europe de la sécurité intérieure, in: Gloannec (Hrsg.), Entre Union et Nations, S. 55–90; Bigo, When two become one, in: Kelstrup/Williams (Hrsg.), International Relations Theory and the Politics of European Integration, S. 171–204.

+

Vgl. exemplarisch: Bigo, Polices en résaux; Bigo, L’Europe de la sécurité intérieure, in: Gloannec (Hrsg.), Entre Union et Nations, S. 55–90; Bigo, When two become one, in: Kelstrup/Williams (Hrsg.), International Relations Theory and the Politics of European Integration, S. 171–204.

 und Jef Huysmans -

Vgl. exemplarisch: Huysmans, Revisiting Copenhagen; Noxolo/Huysmans (Hrsg.), Community, citizenship, and the ‘war on terror’; Aradau/Huysmans, Mobilising (global) democracy; Squire/Huysmans, Migration and Security, in: Dunn Cavelty/Mauer (Hrsg.), Handbook of Security Studies.

+

Vgl. exemplarisch: Huysmans, Revisiting Copenhagen; Noxolo/Huysmans (Hrsg.), Community, citizenship, and the ‘war on terror’; Aradau/Huysmans, Mobilising (global) democracy; Squire/Huysmans, Migration and Security, in: Dunn Cavelty/Mauer (Hrsg.), Handbook of Security Studies.

sind, ist stärker soziologisch und empirisch geprägt als die Waliser und Kopenhagener Schulen. Im Fokus der Untersuchungen stehen Sicherheitsexperten von Polizei, Militär, Zoll und Regierungsstellen, aber auch Vertreter von Forschungsinstituten oder Stiftungen. Die Analysen der Pariser Schule konzentrieren sich zunächst einmal darauf, wer eine – zumindest weitgehend anerkannte – Expertenrolle im Bereich Sicherheit einnimmt. Weiterhin werden Funktionen und Handlungsabläufe der Sicherheitsexperten untersucht. Experten nehmen deshalb die zentrale Stelle bei diesen Untersuchungen ein, weil Vertreter der Pariser Schule davon ausgehen, dass sie zum Beispiel Bedrohungen identifizieren, Sicherheitsstrategien entwickeln und mögliche Gegenmaßnahmen einleiten. Damit seien sie entscheidende Akteure in der sicherheitspolitischen Praxis, deren Rolle und Verhalten vornehmlich zu beleuchten sei.

diff --git a/Test2/expected-results/testPure1.rng b/Test2/expected-results/testPure1.rng index 5ba2fe599..6a5d1da3b 100644 --- a/Test2/expected-results/testPure1.rng +++ b/Test2/expected-results/testPure1.rng @@ -31,7 +31,7 @@ - + @@ -423,7 +423,8 @@ Sample values include: 1] all; 2] most; 3] range - @@ -432,7 +433,8 @@ Sample values include: 1] all; 2] most; 3] range - @@ -441,7 +443,8 @@ Sample values include: 1] all; 2] most; 3] range - @@ -463,7 +466,8 @@ Sample values include: 1] all; 2] most; 3] range - @@ -961,20 +965,8 @@ Suggested values include: 1] internal; 2] external; 3] conjecture - - - - - indicates what kind of phenomenon is being noted in the passage. -Sample values include: 1] image; 2] character; 3] theme; 4] allusion - - [^\p{C}\p{Z}]+ - - - - @@ -1082,7 +1074,8 @@ Suggested values include: 1] m (metre); 2] kg (kilogram); 3] s (second); 4] Hz ( - @@ -1188,7 +1181,8 @@ Suggested values include: 1] below; 2] bottom; 3] margin; 4] top; 5] opposite; 6 - @@ -1217,7 +1211,8 @@ Suggested values include: 1] below; 2] bottom; 3] margin; 4] top; 5] opposite; 6 - @@ -1362,7 +1357,8 @@ Suggested values include: 1] below; 2] bottom; 3] margin; 4] top; 5] opposite; 6 - @@ -1404,7 +1400,8 @@ The element indicated by @spanTo () must follow - @@ -1612,30 +1609,42 @@ Suggested values include: 1] volume; 2] issue; 3] page; 4] line; 5] chapter; 6] + + + + + + + + + + + + @@ -2523,66 +2532,54 @@ Suggested values include: 1] volume; 2] issue; 3] page; 4] line; 5] chapter; 6] - + - - + - - + - - + - - - - + - - - - + - - - @@ -2863,13 +2860,14 @@ Suggested values include: 1] volume; 2] issue; 3] page; 4] line; 5] chapter; 6] - + + @@ -2910,6 +2908,19 @@ Suggested values include: 1] volume; 2] issue; 3] page; 4] line; 5] chapter; 6] + + + + + + + + + + + + + @@ -2968,8 +2979,10 @@ Suggested values include: 1] volume; 2] issue; 3] page; 4] line; 5] chapter; 6] + + @@ -3269,12 +3282,15 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for (cited quotation) contains a quotation from some other document, together with a bibliographic reference to its source. In a dictionary it may contain an example text with at least one occurrence of the word form, used in the sense being described, or a translation of the headword, or an example. [3.3.3. Quotation 4.3.1. Grouped Texts 9.3.5.1. Examples] - - - - + + + + + + + @@ -3828,12 +3844,12 @@ Sample values include: 1] suspension; 2] contraction; 3] brevigraph; 4] superscr attributes @target and @cRef may be supplied on . + + - + - - @@ -3851,12 +3867,12 @@ attributes @target and @cRef may be supplied on . + + - + - - @@ -4606,13 +4622,14 @@ relatedItem element must be empty - + + + + + + + - - - - - @@ -4802,9 +4819,9 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist - + - + @@ -5066,6 +5083,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] + @@ -5116,9 +5134,9 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] - + - + @@ -5532,7 +5550,7 @@ Sample values include: 1] first-line; 2] first-letter; 3] before; 4] after - (prefix definition) defines a prefixing scheme used in data.pointer values, showing how abbreviated URIs using the scheme may be expanded into full URIs. [16.2.3. Using Abbreviated Pointers] + (prefix definition) defines a prefixing scheme used in teidata.pointer values, showing how abbreviated URIs using the scheme may be expanded into full URIs. [16.2.3. Using Abbreviated Pointers] @@ -5549,7 +5567,7 @@ Sample values include: 1] first-line; 2] first-letter; 3] before; 4] after - (list of prefix definitions) contains a list of definitions of prefixing schemes used in data.pointer values, showing how abbreviated URIs using each scheme may be expanded into full URIs. [16.2.3. Using Abbreviated Pointers] + (list of prefix definitions) contains a list of definitions of prefixing schemes used in teidata.pointer values, showing how abbreviated URIs using each scheme may be expanded into full URIs. [16.2.3. Using Abbreviated Pointers] @@ -6090,7 +6108,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5 - documents a change or set of changes made during the production of a source document, or during the revision of an electronic file. [2.6. The Revision Description 2.4.1. Creation 11.7. Identifying Changes and Revisions] + documents a change or set of changes made during the production of a source document, or during the revision of an electronic file. [2.6. The Revision Description 2.4.1. Creation 11.6. Identifying Changes and Revisions] @@ -6112,7 +6130,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5 - groups a number of change descriptions associated with either the creation of a source text or the revision of an encoded text. [2.6. The Revision Description 11.7. Identifying Changes and Revisions] + groups a number of change descriptions associated with either the creation of a source text or the revision of an encoded text. [2.6. The Revision Description 11.6. Identifying Changes and Revisions] @@ -6457,6 +6475,7 @@ The attributes @to and @from on may each contain only a single value + gives the identifier of the node which is the starting point of the span of text being annotated; if not accompanied by a @to attribute, gives the identifier of the node of the entire span of text being annotated. @@ -6480,6 +6499,7 @@ The attributes @to and @from on may each contain only a single value + @@ -6496,6 +6516,7 @@ The attributes @to and @from on may each contain only a single value + @@ -6516,6 +6537,7 @@ The attributes @to and @from on may each contain only a single value + @@ -6603,7 +6625,8 @@ The attributes @to and @from on may each contain only a single value - You must supply at least two values for @target or on @@ -6628,7 +6651,8 @@ The attributes @to and @from on may each contain only a single value - Too many links! @@ -6646,7 +6670,8 @@ The attributes @to and @from on may each contain only a single value - Abstract model violation: ab may not occur inside paragraphs or other ab elements. @@ -6656,7 +6681,8 @@ The attributes @to and @from on may each contain only a single value - Abstract model violation: Lines may not contain higher-level divisions such as p or ab. @@ -6735,7 +6761,7 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec - specifies a time interval either as a number or as one of the keywords defined by the datatype data.interval + specifies a time interval either as a number or as one of the keywords defined by the datatype teidata.interval @@ -6893,7 +6919,8 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec - This @@ -6908,6 +6935,120 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec + + + contains a list of annotations, typically encoded as <annotation>, <annotationBlock>, or <note>, possibly organized with nested <listAnnotation> elements. [16.10. The standOff Container] + + + + + + + + + + + + + + + + + + + + + + + + represents an annotation following the Web + Annotation Data Model. [16.10. The standOff Container] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + (identifier) provides a unique identifier for the element bearing the attribute. + + + + specifies the destination of the reference by supplying one or more URI References + + + + + + + + + + + + + assessing + intent is to assess the target resource in some way, rather than simply make a comment about it + bookmarking + intent is to create a bookmark to the target or part thereof + classifying + intent is to classify the target in some way + commenting + intent is to comment about the target + describing + intent is to describe the target, rather than (for example) comment on it + editing + intent is to request an edit or a change to the target resource + highlighting + intent is to highlight the target resource or a segment thereof + identifying + intent is to assign an identity to the target + linking + intent is to link to a resource related to the target + moderating + intent is to assign some value or quality to the target + questioning + intent is to ask a question about the target + replying + intent is to reply to a previous statement, either an annotation or another resource + tagging + intent is to associate a tag with the target + + + + + + + + (TEI document) contains a single TEI-conformant document, combining a single TEI header with one or more members of the model.resource class. Multiple <TEI> elements may be combined within a <TEI> (or <teiCorpus>) element. [4. Default Text Structure 15.1. Varieties of Composite Text] diff --git a/Test2/inputFiles/testPure1.odd b/Test2/inputFiles/testPure1.odd index da70130df..1ed2053ec 100644 --- a/Test2/inputFiles/testPure1.odd +++ b/Test2/inputFiles/testPure1.odd @@ -1,29 +1,27 @@ - - - - + xmlns="http://www.tei-c.org/ns/1.0" + xml:lang="en" + n="testPure1"> - - - Test TEI Customization using Pure ODD - Martin Holmes - Syd Bauman - - -

Free for anyone for anything

- - -

Authored from scratch

- - + + + Test TEI Customization using Pure ODD + Martin Holmes + Syd Bauman + + +

Free for anyone for anything

+ + +

Authored from scratch

+ + - - - This file is intended as input for a conversion to + + + This file is intended as input for a conversion to RNG and Schematron (and possibly other outputs) as part of the modular Stylesheets test process. No source is specified here, because the source p5subset.xml is controlled @@ -35,180 +33,171 @@ compliant schemas (for the most severe definition of TEI-compliant). - - - - - + + + + + - - - - + - - - - + + + + + + + - - - + + + - - + + - - - + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - long playing - 12-inch vinyl - - - - - - compact disc - - - - - - - - + + + + + + + + + + long playing + 12-inch vinyl + + + + + + compact disc + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - A short bibliographic citation with nothing but author, title, and optional date - - - - - - - - - - - - - - - - - - - + + + A short bibliographic citation with nothing but author, title, and optional date + + + + + + + + + + + + + + + + + + + - - - - - - The email address of Amour de Cosmos. - - - The email address of The Venerable Bede. - - - - -

Our email element is only allowed to contain + + + + + + The email address of Amour de Cosmos. + + + The email address of The Venerable Bede. + + + + +

Our email element is only allowed to contain one of two email addresses, so we try to constrain its content model using a valList.

- - + + - - - - - Too many links! - - - + + + + + Too many links! + + + - - - + + + diff --git a/Test2/inputFiles/testSpecificationDescription1.odd b/Test2/inputFiles/testSpecificationDescription1.odd index 1de81181a..0581d0422 100644 --- a/Test2/inputFiles/testSpecificationDescription1.odd +++ b/Test2/inputFiles/testSpecificationDescription1.odd @@ -1,52 +1,49 @@ - - - - TEI test customization - Sebastian Rahtz - - -

- - -

authored from scratch

- - - - - -

Testing specList: - - - - - - - - - - - - - - -

- - - - - - - - - - - - - + xmlns:rng="http://relaxng.org/ns/structure/1.0" n="testSpecificationDescription1"> + + + + TEI test customization + Sebastian Rahtz + + +

+ + +

authored from scratch

+ + + + + +

Testing specList: + + + + + + + + + + + + + + +

+ + + + + + + + + + + + + - - - diff --git a/VERSION b/VERSION index 1e6c3f0a6..a260e0b3f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.50.1 +7.51.0 diff --git a/common/common_figures.xsl b/common/common_figures.xsl index 45994670c..0fa7721f8 100644 --- a/common/common_figures.xsl +++ b/common/common_figures.xsl @@ -124,6 +124,9 @@ of this software, even if advised of the possibility of such damage. pt + + + diff --git a/common/functions.xsl b/common/functions.xsl index 3dc8e1a04..6853ed4d0 100644 --- a/common/functions.xsl +++ b/common/functions.xsl @@ -227,6 +227,7 @@ of this software, even if advised of the possibility of such damage. + false true true true diff --git a/debian-tei-xsl/debian/changelog b/debian-tei-xsl/debian/changelog index 2bce2421e..e21c859e3 100644 --- a/debian-tei-xsl/debian/changelog +++ b/debian-tei-xsl/debian/changelog @@ -1,3 +1,9 @@ +tei-xsl (7.51.0a) natty; urgency=low + + * new release from upstream + + -- TEI Wed, 02 Dec 2020 15:39:00 -0500 + tei-xsl (7.50.0) natty; urgency=low * new release from upstream diff --git a/debian-tei-xsl/debian/compat b/debian-tei-xsl/debian/compat index b8626c4cf..9a037142a 100644 --- a/debian-tei-xsl/debian/compat +++ b/debian-tei-xsl/debian/compat @@ -1 +1 @@ -4 +10 \ No newline at end of file diff --git a/debian-tei-xsl/debian/rules b/debian-tei-xsl/debian/rules index e800c1ff7..4af1189ad 100755 --- a/debian-tei-xsl/debian/rules +++ b/debian-tei-xsl/debian/rules @@ -1,5 +1,5 @@ #!/usr/bin/make -f -export DH_COMPAT=5 +export DH_COMPAT=10 DESTDIR = $(CURDIR)/debian/tei-xsl/usr @@ -28,7 +28,7 @@ clean: install: build dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs (cd ..; make PREFIX=$(DESTDIR) install ) (cd ..; make PREFIX=$(DESTDIR) doc oxygendoc ) diff --git a/docx/from/docxtotei.xsl b/docx/from/docxtotei.xsl index ca740436b..4c3ec6043 100644 --- a/docx/from/docxtotei.xsl +++ b/docx/from/docxtotei.xsl @@ -218,7 +218,7 @@ of this software, even if advised of the possibility of such damage. - + diff --git a/docx/from/functions.xsl b/docx/from/functions.xsl index b7acc416a..50c2d195c 100644 --- a/docx/from/functions.xsl +++ b/docx/from/functions.xsl @@ -275,5 +275,47 @@ of this software, even if advised of the possibility of such damage. false + + + Returns true or false for value types that may be "on" or "off". + If the parent element exists but does not have a @w:val, the + function returns true. + + + + + + + + + + + + + + + + + + + + + + + + Translates standard justification values into CSS text-align values. + + + + + left + right + left + right + center + justify + left + + diff --git a/docx/from/marginals.xsl b/docx/from/marginals.xsl index 581d910f4..770dff034 100644 --- a/docx/from/marginals.xsl +++ b/docx/from/marginals.xsl @@ -79,7 +79,7 @@ of this software, even if advised of the possibility of such damage. Handle footnotes - + diff --git a/docx/from/paragraphs.xsl b/docx/from/paragraphs.xsl index f5f057026..4fa9c2e20 100644 --- a/docx/from/paragraphs.xsl +++ b/docx/from/paragraphs.xsl @@ -145,18 +145,18 @@ of this software, even if advised of the possibility of such damage. - + font-weight: bold; - + font-style: italic; - + text-decoration: underline; - text-align: - + text-align: + ; @@ -167,62 +167,58 @@ of this software, even if advised of the possibility of such damage. use the Word style (if provided) to make a TEI rend attribute, and check for change records. - - - - - - - - - - - - - - - - - - - text-align: - - ; - - - - - - - - - - - - - - rtl - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + text-align: + + ; + + + + + + + + + > + direction:rtl; + + + + + + + + + + + + + + + + + + + Processing of any cross-references found. diff --git a/docx/from/pass2.xsl b/docx/from/pass2.xsl index b9f4cb9d5..a2f6f4c8f 100644 --- a/docx/from/pass2.xsl +++ b/docx/from/pass2.xsl @@ -86,11 +86,27 @@ of this software, even if advised of the possibility of such damage.

zap empty p

 - - - + + + + + +
+ +
+ + +
+ +
+ + + + + + - + Singleton paragraphs in cells dropped @@ -444,35 +460,94 @@ of this software, even if advised of the possibility of such damage. - <CAPTION> belongs to nearest figure or table + <CAPTION> belongs to nearest figure or table. Tables with multi-paragraph preceding + CAPTIONs or with follwing captions are wrapped in a figure and the first para becomes a <head>, + while subsequent ones become <figDescs>. A single preceding CAPTION paragraph becomes an + internal header. Figure captions become headers and figDescs in a similar way. - + + + + + + + WARN: Possible confusion on where these captions belong: [[ + + + + + +
+ + + + + + +

+ + +

+ + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + WARN: Possible confusion on where these captions belong: [[ + + + + + + + + + +

+ +

+ - - - WARN: Possible confusion on where these captions belong: [[ - - - - - - - - - - - + + + + + - - Rename <p> to a more specific name based on @rend diff --git a/docx/from/tables.xsl b/docx/from/tables.xsl index 7dcb652ad..d29214736 100644 --- a/docx/from/tables.xsl +++ b/docx/from/tables.xsl @@ -372,96 +372,98 @@ of this software, even if advised of the possibility of such damage. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - left - - - - - - - - - - - - - - - - - - - - - background-color( - - ) - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text-align: + + + + + + + + + + + + left + + + ; + + + + + + + + + + + + + + + + + + + background-color( + + ) + + + + + + + + + + + + + + + + +
@@ -504,7 +506,7 @@ of this software, even if advised of the possibility of such damage. - + diff --git a/docx/from/textruns.xsl b/docx/from/textruns.xsl index fa2e88acb..f0214153b 100644 --- a/docx/from/textruns.xsl +++ b/docx/from/textruns.xsl @@ -173,225 +173,217 @@ of this software, even if advised of the possibility of such damage. a) it's not a special para AND the font is the ISO default, OR b) the font for the run is the same as its parent paragraph. - - false - - - - - - - - font-family: - - - - - - - - - - - - font-family: - - - - - - - - - - font-size: - - pt - - - - font-size: - - pt - - - - font-size: - - pt - - - - - position: - - - - - - - - - rtl - - - - - - - subscript - - - - italic - - - - - normalweight - - - bold - - - - - superscript - - - - - - - - - - - strikethrough - - - - doublestrikethrough - - - - underline - - - - wavyunderline - - - - doubleunderline - - - - smallcaps - - - - allcaps - - - - - color( - - ) - - - - - - background( - - ) - - - - + + false + + + + - - - - - - - - - - - - - - - - - - - - - - preserve - - - - - - - preserve - - - + + + font-family: + + + + + + + + + + + + font-family: + + + - + + + + + + font-size: + + pt + + + + font-size: + + pt + + + + font-size: + + pt + + + + + position: + + + + + + + + + + + + subscript + + + + italic + + + + + normalweight + + + bold + + + + + superscript + + + + + + + + + + + strikethrough + + + + doublestrikethrough + + + + underline + + + + wavyunderline + + + + doubleunderline + + + + smallcaps + + + + allcaps + + + + + color( + + ) + + + + + + background( + + ) + + + + + + + + + + + + + + + + + + + + + direction:rtl; + + + + preserve + + + + + + + preserve + + + + + Handle current page breaks inserted by Word diff --git a/html/html_core.xsl b/html/html_core.xsl index e958785e2..6707a919a 100644 --- a/html/html_core.xsl +++ b/html/html_core.xsl @@ -239,7 +239,10 @@ of this software, even if advised of the possibility of such damage. Process element eg - 
+    
+      
+    
+    
       
         
           pre_eg
@@ -249,6 +252,9 @@ of this software, even if advised of the possibility of such damage.
         
       
       
+      
+	⚓
+      
     

   
   
diff --git a/html/html_header.xsl b/html/html_header.xsl
index 4f23d688a..8dcbd233e 100644
--- a/html/html_header.xsl
+++ b/html/html_header.xsl
@@ -53,19 +53,26 @@ of this software, even if advised of the possibility of such damage.
       
    
 
-  
+  
   
+	   match="@rendition
+		  [not( ancestor::teix:* )]
+		  [not( starts-with( ., 'simple:') or starts-with( ., '#') )]"
+	   use="." />
   
 
   
-      Process element teiHeader
-   
+    Process element teiHeader
+  
   
 
   
-      make a style section from rendition elements in the header
-   
+    make a style section from rendition elements in the header
+  
   
   
       
diff --git a/html/html_oddprocessing.xsl b/html/html_oddprocessing.xsl
index 5bcd766d0..3da5eec93 100644
--- a/html/html_oddprocessing.xsl
+++ b/html/html_oddprocessing.xsl
@@ -215,59 +215,14 @@ of this software, even if advised of the possibility of such damage.
       
     
   
+
   
     
     
       
     
   
-  
-    Process elements teix:egXML
-  
-  
-    false
-    
-    

-      
-        
-      
-      
-	pre
-	
-	   cdata
-	
-	
-	  
-	     egXML_feasible
-	  
-	  
-	     egXML_invalid
-	  
-	  
-	     egXML_valid
-	  
-	
-      
-      
-        
-          
-            
-              
-            
-          
-        
-        
-          
-          
-            
-              
-            
-          
-          
-        
-      
-    

-  
+
   
     [html] grammar
          content
diff --git a/html/html_tagdocs.xsl b/html/html_tagdocs.xsl
index 84d5e8e7b..1ff1bd54b 100644
--- a/html/html_tagdocs.xsl
+++ b/html/html_tagdocs.xsl
@@ -43,54 +43,6 @@ of this software, even if advised of the possibility of such damage.
     
   
 
-  
-    Process elements teix:egXML
-  
-  
-    false
-    
-    

-      
-        
-      
-      
-	pre
-	
-	   cdata
-	
-	
-	  
-	     egXML_feasible
-	  
-	  
-	     egXML_invalid
-	  
-	  
-	     egXML_valid
-	  
-	
-      
-      
-        
-          
-            
-              
-            
-          
-        
-        
-          
-          
-            
-              
-            
-          
-          
-        
-      
-    

-  
-
   
     Process element ident
   
@@ -283,6 +235,55 @@ of this software, even if advised of the possibility of such damage.
     
   
 
+
+
+  Process elements teix:egXML
+
+
+  false
+  
+  

+    
+      
+    
+    
+      pre
+      
+	 cdata
+      
+      
+	
+	   egXML_feasible
+	
+	
+	   egXML_invalid
+	
+	
+	   egXML_valid
+	
+      
+    
+    
+      
+	
+	  
+	    
+	  
+	
+      
+      
+	
+	
+	  
+	    
+	  
+	
+	
+      
+    
+  

+
+
 
   
     Classes
diff --git a/latex/latex.xsl b/latex/latex.xsl
index e9ecb0fa6..83ec448ca 100644
--- a/latex/latex.xsl
+++ b/latex/latex.xsl
@@ -101,9 +101,9 @@ of this software, even if advised of the possibility of such damage.
 	           }
          
          
-	           {\textJapanese 
+	           {\textJapanese {
 		   
-	           }
+	           }}
          
          
 	           {\textKorean 
@@ -199,24 +199,39 @@ of this software, even if advised of the possibility of such damage.
       
       
       
-         
-            \textit{
-            
-            }
-         
-         
-            \textit{
-            
-            }
-         
-         
-            ‘
-	           
-            ’
-         
-         
-            
-         
+        
+          {\textJapanese {
+          
+          }}
+        
+        
+          {\textKorean {
+          
+          }}
+        
+        
+          {\textChinese {
+          
+          }}
+        
+        
+          \textit{
+          
+          }
+        
+        
+          \textit{
+          
+          }
+        
+        
+          ‘
+           
+          ’
+        
+        
+          
+        
       
    
 
@@ -257,11 +272,26 @@ of this software, even if advised of the possibility of such damage.
       
       
       
-	
-	  \textit{
-	  
-	  }
-	
+        
+      	  \textit{
+      	  
+      	  }
+      	
+        
+          {\textJapanese 
+          
+          }
+        
+        
+          {\textKorean 
+          
+          }
+        
+        
+          {\textChinese 
+          
+          }
+        
 	
 	  
 	
diff --git a/latex/latex_tagdocs.xsl b/latex/latex_tagdocs.xsl
index 818dfd60c..1a08c06cd 100644
--- a/latex/latex_tagdocs.xsl
+++ b/latex/latex_tagdocs.xsl
@@ -154,15 +154,15 @@ of this software, even if advised of the possibility of such damage.
 
    
       
-         
+         
             {\textChinese 
             
             }
          
          
-            {\textJapanese 
+            {\textJapanese {
             
-            }
+            }}
          
          
             {\textKorean 
@@ -309,14 +309,21 @@ of this software, even if advised of the possibility of such damage.
    
       {
       
-         
-            \textChinese 
-            
-         
          
-            \textJapanese 
+            \textJapanese {
             
+            }
          
+        
+          \textKorean {
+          
+          }
+        
+        
+          \textChinese {
+          
+          }
+        
          
             
          
diff --git a/odds/guidelines.xsl b/odds/guidelines.xsl
index 40fb5ec17..b98e7e120 100644
--- a/odds/guidelines.xsl
+++ b/odds/guidelines.xsl
@@ -417,10 +417,6 @@
       DC.Language
       SCHEME=iso639 
     
-    
-	DC.Creator.Address
-	tei@oucs.ox.ac.uk
-    
     
       
 	
@@ -774,41 +770,50 @@
   
 
   
-    
-      
-	

+    
+      
+      
+	
+	  #
+	  
+	  
+	
+	⚓
+      
+    
+    
-      
-      
-	
-      
-    
-    
-      

-        
-          
-        
+	
+      
+      
+	
+	  
+	
 	 
-      

-    
+      
+      
+    

   
+
   
     
       

@@ -816,7 +821,7 @@
           
             
           
-          bibliography
+	  
         
       

     
diff --git a/profiles/jtei/jtei.common.xsl b/profiles/jtei/jtei.common.xsl
index e5cad909a..0cee8df0a 100644
--- a/profiles/jtei/jtei.common.xsl
+++ b/profiles/jtei/jtei.common.xsl
@@ -445,7 +445,7 @@
     
       
       
-        
+        
       
       
       
diff --git a/profiles/jtei/openedition/to.xsl b/profiles/jtei/openedition/to.xsl
index 37e6c40cc..0516fd51e 100644
--- a/profiles/jtei/openedition/to.xsl
+++ b/profiles/jtei/openedition/to.xsl
@@ -175,7 +175,7 @@
   
   
   
-  
+  
     
   
 
@@ -278,8 +278,7 @@
   
   
   
-    
-    
+    
       
         author
         publisher
@@ -415,7 +414,7 @@
   
   
   
-  
+  
     
     
     
diff --git a/source/p5subset.xml b/source/p5subset.xml
index 425b8dbeb..56d757a4e 100644
--- a/source/p5subset.xml
+++ b/source/p5subset.xml
@@ -4,8 +4,8 @@
 	The TEI Guidelines
       
       
-        Version 4.1.0. Last updated on
-	19th August 2020, revision b414ba550
+        Version 4.2.0a. Last updated on
+	21st August 2020, revision e0066d83d
       
       
 	TEI Consortium