diff --git a/ChangeLog b/ChangeLog index 31557ccab..18c7288be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,289 @@ +2019-07-16 Peter Stadler + + update expected results + built against current Guidelines release branch + +2019-07-11 Martin Holmes + + Merge pull request #385 from TEIC/peterstadler-issue360 + fixes internal PDF links #360 + +2019-07-11 Peter Stadler + + update expected results + +2019-07-10 Peter Stadler + + remove surrounding square brackets from bibliographic references + +2019-07-10 Stuart Yeates + + Add some text to make this findable using google (#374) + +2019-07-05 Peter Stadler + + Merge branch 'dev' into peterstadler-issue360 + +2019-07-02 Peter Stadler + + fix creation of Debian packages + Debian uses fakeroot to build packages which resets all environment variables. In the Docker image the `jar` executable is outside of the default paths "/usr/sbin:/usr/bin:/sbin:/bin:/usr/bin/X11" so we need this extra treatment. + +2019-06-24 raffazizzi + + Defaulting descs to en instead of all languages + +2019-06-20 Martin Holmes + + Merge pull request #381 from rvdb/jTEI-improve-punctuation-handling + fixed the obligatory typo :-/ + +2019-06-20 rvdb + + fixed the obligatory typo :-/ + +2019-06-19 Martin Holmes + + Merge pull request #380 from rvdb/jTEI-improve-punctuation-handling + improved processing of "quotation elements" and footnotes w.r.t. subs… + +2019-06-19 rvdb + + improved processing of "quotation elements" and footnotes w.r.t. subsequent punctuation, which should now be fully compliant with CMOS: + -only commas and periods should appear before closing quotation mark + -(only the) innermost "quotation element" should "pull in" subsequent comma or period + -all punctuation marks except dash should precede footnote markers + +2019-05-20 Peter Stadler + + move relaxng related templates to their proper location #375 + Those templates were introduced by PR #366 but led to some unintended side effects in the epub build. Stylesheets group decided to move them out of teiodds.xsl, thus tacitly accepting to revert the changes to the DTD output as a consequence. + + Co-Authored-By: Martina Scholger + Co-Authored-By: Martin Holmes + Co-Authored-By: Syd Bauman + +2019-05-20 martindholmes + + Adding comment to new templates. + +2019-05-17 Piotr Banski + + added checks for trang, ant and xetex to `make check` (#239) + * added checks for trang, ant and xetex to `make check` + + * remove checks for jing and trang, and add warning for xetex + + jing and trang do not need to be installed locally but are provided within the Stylesheets repo + +2019-05-10 martindholmes + + Fix for expected-results in Test2 following revisions to specs. + +2019-05-10 Peter Stadler + + update expected results for #360 + + set default citebordercolor #360 + for new `\cite` command (was `\hyperref`) + + fix citation references + by using `\cite` rather than `\hyperref` + + some refactoring + in particular the `tei:makeHyperTarget` is unecessary because the `\bibitem` adds a label automatically + +2019-05-08 Peter Stadler + + Merge branch 'dev' into peterstadler-issue360 + +2019-05-08 Syd Bauman + + Change expected results to match #336. + +2019-05-08 Raffaele Viglianti + + Merge pull request #343 from TEIC/peterstadler-fix-multiple-schemaSpecs + fix processing of multiple schema specs (in one TEI document) + +2019-05-08 Syd Bauman + + Merge pull request #336 from PietroLiuzzo/patch-1 + adding rendering of ref, gi and att inside desc; still need to updated expected results (and then will close ticket) + +2019-05-08 raffazizzi + + Improved handling of multiple schemaSpecs when merging multiple *Spec declarations. Refs #249 + +2019-05-08 Syd Bauman + + Per #240, drop the "four", as there are now six. :-) + +2019-05-08 Syd Bauman + + Merge pull request #240 from bansp/patch-2 + Only problem w/ this PR is that we left it for so long the number of uses of `@zip64Mode` has changed. Also, the link to get.xml is currently dead due to ADHO server crash problem, but that doesn't change this PR. + So Council accepts this PR, and I'm supposed to go fix the reference to `@zip64Mode` attrs now. + +2019-04-29 Syd Bauman + + complete merge + + Add comments to solve #355 + +2019-04-29 martindholmes + + @martindholmes and @sydb working on issue #355, adding comments to clarify the creation and use of a PI. + +2019-03-30 Syd Bauman + + Merge pull request #367 from TEIC/issue366 + make sure to only pass one prefix to `concat()`, fixes 366 + +2019-03-28 Syd Bauman + + Minor change: The ever vigilant @cmsmcq [noticed](https://github.com/TEIC/Stylesheets/pull/367#issuecomment-476296447) I missed changing a '=' to 'eq' on previous commit. As he points out, should make no difference whatsoever to actual processing (of valid documents). + +2019-03-26 martindholmes + + Fix for expected results change arising from https://github.com/TEIC/Stylesheets/commit/c2d23d7125998bae7b8edc5a783789fcba02a608. + +2019-03-25 raffazizzi + + updated tests + + Merge branch 'dev' of github.com:TEIC/Stylesheets into dev + + fixed wrong variable name + +2019-03-25 Peter Stadler + + partially revert JSON tests + This undoes ff9837e7d4e22a3606f6db3a3ff14f12cf8609d4 to fix the current build problems. NB: Test/expected-results/test34.combined.json was only partially reverted, the "desc" arrays remain empty here. + +2019-03-25 Syd Bauman + + Incorporate @cmsmcq's suggestions into another attempt at fixing this; only partially tested + +2019-03-22 Peter Stadler + + make sure to only pass one prefix to `concat()`, fixes 366 + +2019-03-21 raffazizzi + + updated tests + + set "en" as default value for doclang + + switched to using default doclang parameter + +2019-03-18 martindholmes + + Fix for expected-results. + +2019-03-18 Syd Bauman + + Fix #361: Add namespace to in output. (we hope this works; let's see what Mr. Jenkins says) + +2019-03-16 James Cummings <296651+jamescummings@users.noreply.github.com> + + Merge pull request #359 from TEIC/peterstadler-issue-358 + add support for hard page breaks in odttotei + +2019-03-15 Peter Stadler + + Merge branch 'dev' into peterstadler-fix-multiple-schemaSpecs + +2019-03-11 Syd Bauman + + Merge pull request #364 from TEIC/peterstadler-dev + set localsource parameter once for build process + +2019-03-07 Peter Stadler + + add TEISOURCE_DEFAULT + which will be used when no --localsource is provided; as requested in https://github.com/TEIC/Stylesheets/pull/364#issuecomment-470603525 + + improve code for setting localsource + and add comments + + replace hard coded source in testfile + with variable DEFAULTSOURCE. This will prevent builds from failing when DEFAULTSOURCE is set to something different than the default. + +2019-03-06 Peter Stadler + + point at the vault, not the release + + support localsource pointing at some web resource + this is a temporary hack and needs to be fleshed out. + + add proper support for setting localsource + this will allow you to invoke `make` with a local copy of the TEI sources, circumventing the current hickup with the servers … + e.g. `make test DEFAULTSOURCE=file:///my/local/path/to/p5subset.xml` + +2019-03-05 Peter Stadler + + update scheme for source + NB: we need to modify the tests to capture this. Because whenever a different source is set this test will fail + + update expected json results + + update expected results #357 + + update expected results + + remove trailing whitespace #357 + + update default p5subset scheme + +2019-03-04 Joey Takeda + + #328: Suppress copying unprocessed attRefs in common_tagdocs. + +2019-02-20 raffazizzi + + fix for valDesc when no lang is specified + + fixed missing axis to get valList `@type` + +2019-02-17 Peter Stadler + + add phantomsection to spec labels, fixes 360 + +2019-02-15 Syd Bauman + + Merge in the latest changes from dev + + Fix #357. + +2019-02-15 raffazizzi + + Adjusted odd2json tests + + Changes for datatype processing + +2019-01-31 martindholmes + + Merge branch 'dev' of github.com:TEIC/Stylesheets into dev + + Updates to Test2 due to changes in ODD processing and schema. + +2019-01-30 Hugh Cayless + + Merge branch 'master' into dev post 7.47.0 release. + +2019-01-29 Hugh Cayless + + Merge branch 'release-7.47.0' + Fixing issues with the tests, which surfaced with TEI 3.5.0. + + Fixing expected results. + + Merging release branch. + + Updated changelog. + + Set VERSION 7.47.0 2019-01-29 Hugh Cayless Set VERSION 7.47.0 diff --git a/Makefile b/Makefile index 5583704ea..54739eadf 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,9 @@ SFUSER=rahtz -JING=jing -SAXON=java -jar lib/saxon9he.jar -DOTDOTSAXON=java -jar ../../lib/saxon9he.jar -DOTSAXON=java -jar ../lib/saxon9he.jar +DEFAULTSOURCE=https://www.tei-c.org/Vault/P5/current/xml/tei/odd/p5subset.xml +SAXON=java -jar lib/saxon9he.jar defaultSource=$(DEFAULTSOURCE) +DOTSAXON=java -jar ../lib/saxon9he.jar defaultSource=$(DEFAULTSOURCE) +DOTDOTSAXON=java -jar ../../lib/saxon9he.jar defaultSource=$(DEFAULTSOURCE) SAXON_ARGS=-ext:on - DIRS=bibtex cocoa common csv docx dtd docbook epub epub3 fo html wordpress markdown html5 json latex latex nlm odd odds odt p4 pdf profiles/default rdf relaxng rnc schematron simple slides tbx tcp lite tite tools txt html xsd xlsx pdf verbatimxml SCRIPTS=bin/*to* @@ -53,8 +52,10 @@ check: @which perl || exit 1 @echo -n xmllint: @which xmllint || exit 1 - @echo -n jing: - @which ${JING} || exit 1 + @echo -n ant: + @which ant || exit 1 + @echo -n xetex: + @which xetex || echo " Warning: Couldn't find xetex executable. While most transformations will work, PDF output will not be possible" v: perl -p -i -e "s+AppVersion.*/AppVersion+AppVersion>`cat VERSION` temp; mv temp test.rng perl -i -pe 'BEGIN{undef $$/;} s/\n//smg' testODD.dtd @@ -420,8 +423,8 @@ test-oddity: css # then diff testODD.rnc expected-results/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 $(FLAG) test-pure.odd test-pure.dtd - $(BINDIR)/teitornc $(FLAG) test-pure.odd test-pure.rnc + $(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 @@ -431,13 +434,13 @@ test-oddity: css 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 $(FLAG) --odd test-pure.odd test-pure.odd.html + $(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 $(FLAG) test-pure2.odd test-pure2.dtd - $(BINDIR)/teitornc $(FLAG) test-pure2.odd test-pure2.rnc - $(BINDIR)/teitohtml $(FLAG) --odd test-pure2.odd test-pure2.odd.html + $(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 @@ -466,15 +469,15 @@ test-oddity: css rm test.odd2xslstripspace moreoddity: - $(BINDIR)/teitoxsd $(FLAG) test.odd test.xsd - $(BINDIR)/teitodtd test.odd test.dtd - $(BINDIR)/teitornc test.odd test.rnc + $(BINDIR)/teitoxsd $(FLAGS) test.odd test.xsd + $(BINDIR)/teitodtd $(FLAGS) test.odd test.dtd + $(BINDIR)/teitornc $(FLAGS) test.odd test.rnc test-namespaces: @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 test33.odd test33.rnc + $(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 ]; \ @@ -483,7 +486,7 @@ test-namespaces: perl -p -i -e 's/"date" : "\d+-\d+\-\d+T\d+:\d+:\d+Z",//' test33.json if [ $(REGENERATING) -ne 1 ]; \ then diff test33.json expected-results/test33.json; fi - $(BINDIR)/teitornc test34.odd test34.rnc + $(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 ]; \ @@ -497,11 +500,11 @@ test-namespaces: perl -p -i -e 's/"date" : "\d+-\d+\-\d+T\d+:\d+:\d+Z",//' test34.combined.json if [ $(REGENERATING) -ne 1 ]; \ then diff test34.combined.json expected-results/test34.combined.json; fi - $(BINDIR)/teitohtml --odd --summaryDoc test34.odd test34.odd.html + $(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 test35.odd test35.rnc + $(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 ]; \ @@ -509,7 +512,7 @@ test-namespaces: test-scripts: for i in $(SCRIPTS); do $(BINDIR)/$$i $(FLAGS) maria.xml $$i.result && rm $$i.result; done - $(BINDIR)/teitoodd test16.odd temp.odd + $(BINDIR)/teitoodd $(FLAGS) test16.odd temp.odd for i in $(SCHEMASCRIPTS) ; do $(BINDIR)/$$i $(FLAGS) temp.odd $$i.result && rm $$i.result; done rm temp.odd diff --git a/Test/expected-results/mdtest1.tei b/Test/expected-results/mdtest1.tei index 7a975b25c..34a759a03 100644 --- a/Test/expected-results/mdtest1.tei +++ b/Test/expected-results/mdtest1.tei @@ -42,6 +42,7 @@

written like so.

End of of fenced code

+

http://github.org

An h2 header
@@ -56,7 +57,7 @@ for i in 1 .. 10 { do-something(i) }

As you probably guessed, indented 4 spaces. By the way, instead of

-

Indenting the block, you can use delimited blocks, if you like.

+

Indenting the block, you can use delimited blocks see link Visit GitHub! , if you like.

Done.

diff --git a/Test/expected-results/test.epub b/Test/expected-results/test.epub index 7fc158f74..9a1ea3386 100644 Binary files a/Test/expected-results/test.epub and b/Test/expected-results/test.epub differ diff --git a/Test/expected-results/test.isosch b/Test/expected-results/test.isosch index 0b2c28ce8..c53f94676 100644 --- a/Test/expected-results/test.isosch +++ b/Test/expected-results/test.isosch @@ -35,43 +35,40 @@ - -@calendar indicates the system or calendar to which the date represented by the content of this element -belongs, but this element has no textual content. + @calendar indicates the system or calendar to + which the date represented by the content of this element belongs, but this + element has no textual content. - + + + The @unit attribute may be unnecessary when @unitRef is present. + + + The element should not be categorized in detail with @subtype unless also categorized in general with @type - + @targetLang should only be used on if @target is specified. - + The element indicated by @spanTo () must follow the current element - + @schemeVersion can only be used if @scheme is specified. - - - - It is considered poor - practice to end a number with a decimal point; as of 2019-02-25 TEI will - consider this @points attribute of invalid - - @@ -132,7 +129,7 @@ relatedItem element must be empty An lg element - must contain at least one child l, lg or gap element. + must contain at least one child l, lg, or gap element. @@ -230,8 +227,4 @@ You must supply at least two values for @target on - - - - diff --git a/Test/expected-results/test.odd.html b/Test/expected-results/test.odd.html index 53a981525..64f400633 100644 --- a/Test/expected-results/test.odd.html +++ b/Test/expected-results/test.odd.html @@ -111,10 +111,10 @@

anchor: (anchor point) attaches an identifier to a point within a text, whether or not it corresponds with a textual element. [8.4.2. Synchronization and Overlap 16.5. Correspondence and Alignment] - appInfo: (application information) records information about an application which has edited the TEI file. [2.3.10. The Application Information Element] + appInfo: (application information) records information about an application which has edited the TEI file. [2.3.11. The Application Information Element] - application: provides information about an application which has acted upon the document. [2.3.10. The Application Information Element] + application: provides information about an application which has acted upon the document. [2.3.11. The Application Information Element] arc: encodes an arc, the connection from one node to another in a graph. [19.1. Graphs and Digraphs] @@ -179,6 +179,9 @@

att.entryLike: provides an attribute used to distinguish different styles of dictionary entries. [9.1. Dictionary Body and Overall Structure 9.2. The Structure of Dictionary Entries] + + att.formula: provides attributes for defining a mathematical formula. [2.3.9. The Unit Declaration] + att.fragmentable: provides an attribute for representing fragmentation of a structural element, typically as a consequence of some overlapping hierarchy. @@ -365,6 +368,9 @@

colloc: (collocate) contains any sequence of words that co-occur with the headword with significant frequency. [9.3.2. Grammatical Information] + + conversion: defines how to calculate one unit of measure in terms of another. [2.3.9. The Unit Declaration] + corr: (correction) contains the correct form of a passage apparently erroneous in the copy text. [3.4.1. Apparent Errors] @@ -609,7 +615,7 @@

iType: (inflectional class) indicates the inflectional class associated with a lexical item. [9.3.1. Information on Written and Spoken Forms] - idno: (identifier) supplies any form of identifier used to identify some object, such as a bibliographic item, a person, a title, an organization, etc. in a standardized way. [2.2.4. Publication, Distribution, Licensing, etc. 2.2.5. The Series Statement 3.11.2.4. Imprint, Size of a Document, and Reprint Information] + idno: (identifier) supplies any form of identifier used to identify some object, such as a bibliographic item, a person, a title, an organization, etc. in a standardized way. [13.3.1. Basic Principles 2.2.4. Publication, Distribution, Licensing, etc. 2.2.5. The Series Statement 3.11.2.4. Imprint, Size of a Document, and Reprint Information] imprimatur: contains a formal statement authorizing the publication of a work, sometimes required to appear on a title page or its verso. [4.6. Title Pages] @@ -1182,7 +1188,7 @@

samplingDecl: (sampling declaration) contains a prose description of the rationale and methods used in sampling texts in the creation of a corpus or collection. [2.3.2. The Sampling Declaration 2.3. The Encoding Description 15.3.2. Declarable Elements] - schemaRef: (schema reference) describes or points to a related customization or schema file [2.3.9. The Schema Specification] + schemaRef: (schema reference) describes or points to a related customization or schema file [2.3.10. The Schema Specification] scriptNote: describes a particular script distinguished within the description of a manuscript or similar resource. [10.7.2. Writing, Decoration, and Other Notations] @@ -1427,6 +1433,12 @@

unit: contains a symbol, a word or a phrase referring to a unit of measurement in any kind of formal or informal system. [3.5.3. Numbers and Measures] + + unitDecl: (unit declarations) provides information about units of measurement that are not members of the International System of Units. [2.3.9. The Unit Declaration] + + + unitDef: (unit definition) contains descriptive information related to a specific unit of measurement. [2.3.9. The Unit Declaration] + usg: (usage) contains usage information in a dictionary entry. [9.3.5.2. Usage Information and Other Labels] diff --git a/Test/expected-results/test.rng b/Test/expected-results/test.rng index 78021c308..c48b61a0b 100644 --- a/Test/expected-results/test.rng +++ b/Test/expected-results/test.rng @@ -206,7 +206,7 @@ - specifies the degree of statistical confidence (between zero and one) that a value falls within the range specified by min and max, or the proportion of observed values that fall within that range. + specifies the degree of statistical confidence (between zero and one) that a value falls within the range specified by @min and @max, or the proportion of observed values that fall within that range. @@ -223,7 +223,7 @@ names the unit used for the measurement -Suggested values include: 1] cm (centimetres) ; 2] mm (millimetres) ; 3] in (inches) ; 4] lines; 5] chars (characters) +Suggested values include: 1] cm (centimetres); 2] mm (millimetres); 3] in (inches); 4] line; 5] char (characters) cm (centimetres) @@ -231,9 +231,9 @@ Suggested values include: 1] cm (centimetres) ; 2] mm (millimetres) ; 3] in (inc (millimetres) in (inches) - lines + line lines of text - chars + char (characters) characters of text (\p{L}|\p{N}|\p{P}|\p{S})+ @@ -298,7 +298,7 @@ Sample values include: 1] all; 2] most; 3] range - points to a handNote element describing the hand considered responsible for the content of the element concerned. + points to a <handNote> element describing the hand considered responsible for the content of the element concerned. @@ -324,7 +324,7 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke - provides a coded representation of the degree of damage, either as a number between 0 (undamaged) and 1 (very extensively damaged), or as one of the codes high, medium, low, or unknown. The damage element with the degree attribute should only be used where the text may be read with some confidence; text supplied from other sources should be tagged as supplied. + provides a coded representation of the degree of damage, either as a number between 0 (undamaged) and 1 (very extensively damaged), or as one of the codes high, medium, low, or unknown. The <damage> element with the @degree attribute should only be used where the text may be read with some confidence; text supplied from other sources should be tagged as <supplied>. @@ -368,7 +368,7 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke - (canonical reference) specifies the destination of the pointer by supplying a canonical reference expressed using the scheme defined in a refsDecl element in the TEI header + (canonical reference) specifies the destination of the pointer by supplying a canonical reference expressed using the scheme defined in a <refsDecl> element in the TEI header @@ -495,9 +495,9 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke - -@calendar indicates the system or calendar to which the date represented by the content of this element -belongs, but this element has no textual content. + @calendar indicates the system or calendar to + which the date represented by the content of this element belongs, but this + element has no textual content. @@ -805,7 +805,7 @@ Suggested values include: 1] internal; 2] external; 3] conjecture - (language) indicates the language of the element content using a tag generated according to BCP 47. + (language) indicates the language of the element content using a tag generated according to BCP 47. @@ -856,7 +856,7 @@ Suggested values include: 1] internal; 2] external; 3] conjecture - points to a full description of the scribe concerned, typically supplied by a person element elsewhere in the description. + points to a full description of the scribe concerned, typically supplied by a <person> element elsewhere in the description. @@ -880,7 +880,7 @@ Suggested values include: 1] internal; 2] external; 3] conjecture - points to a full description of the script or writing style used by this hand, typically supplied by a scriptNote element elsewhere in the description. + points to a full description of the script or writing style used by this hand, typically supplied by a <scriptNote> element elsewhere in the description. @@ -986,6 +986,7 @@ Suggested values include: 1] internal; 2] external; 3] conjecture + @@ -993,7 +994,7 @@ Suggested values include: 1] internal; 2] external; 3] conjecture indicates the units used for the measurement, usually using the standard symbol for the desired units. -Suggested values include: 1] m (metre) ; 2] kg (kilogram) ; 3] s (second) ; 4] Hz (hertz) ; 5] Pa (pascal) ; 6] Ω (ohm) ; 7] L (litre) ; 8] t (tonne) ; 9] ha (hectare) ; 10] Å (ångström) ; 11] mL (millilitre) ; 12] cm (centimetre) ; 13] dB (decibel) ; 14] kbit (kilobit) ; 15] Kibit (kibibit) ; 16] kB (kilobyte) ; 17] KiB (kibibyte) ; 18] MB (megabyte) ; 19] MiB (mebibyte) +Suggested values include: 1] m (metre); 2] kg (kilogram); 3] s (second); 4] Hz (hertz); 5] Pa (pascal); 6] Ω (ohm); 7] L (litre); 8] t (tonne); 9] ha (hectare); 10] Å (ångström); 11] mL (millilitre); 12] cm (centimetre); 13] dB (decibel); 14] kbit (kilobit); 15] Kibit (kibibit); 16] kB (kilobyte); 17] KiB (kibibyte); 18] MB (megabyte); 19] MiB (mebibyte) m (metre) SI base unit of length @@ -1040,6 +1041,14 @@ Suggested values include: 1] m (metre) ; 2] kg (kilogram) ; 3] s (second) ; 4] H + + + + points to a unique identifier stored in the @xml:id of a <unitDef> element that defines a unit of measure. + + + + @@ -1068,6 +1077,11 @@ Suggested values include: 1] m (metre) ; 2] kg (kilogram) ; 3] s (second) ; 4] H + + + The @unit attribute may be unnecessary when @unitRef is present. + + @@ -1176,7 +1190,7 @@ Suggested values include: 1] below; 2] bottom; 3] margin; 4] top; 5] opposite; 6 - + The element should not be categorized in detail with @subtype unless also categorized in general with @type @@ -1189,7 +1203,7 @@ Suggested values include: 1] below; 2] bottom; 3] margin; 4] top; 5] opposite; 6 - specifies the language of the content to be found at the destination referenced by target, using a language tag generated according to BCP 47. + specifies the language of the content to be found at the destination referenced by @target, using a language tag generated according to BCP 47. @@ -1200,7 +1214,7 @@ Suggested values include: 1] below; 2] bottom; 3] margin; 4] top; 5] opposite; 6 - + @targetLang should only be used on if @target is specified. @@ -1255,7 +1269,7 @@ Suggested values include: 1] below; 2] bottom; 3] margin; 4] top; 5] opposite; 6 - (target function) describes the function of each of the values of the target attribute of the enclosed link, join, or alt tags. + (target function) describes the function of each of the values of the @target attribute of the enclosed <link>, <join>, or <alt> tags. (\p{L}|\p{N}|\p{P}|\p{S})+ @@ -1341,7 +1355,7 @@ Suggested values include: 1] below; 2] bottom; 3] margin; 4] top; 5] opposite; 6 - + The element indicated by @spanTo () must follow the current element @@ -1372,14 +1386,14 @@ The element indicated by @spanTo () must follow - supplies a version number for the style language provided in scheme. + supplies a version number for the style language provided in @scheme. [\d]+[a-z]*[\d]*(\.[\d]+[a-z]*[\d]*){0,3} - + @schemeVersion can only be used if @scheme is specified. @@ -1499,7 +1513,7 @@ Suggested values include: 1] volume; 2] issue; 3] page; 4] line; 5] chapter; 6] - specifies the starting point of the range of units indicated by the unit attribute. + specifies the starting point of the range of units indicated by the @unit attribute. (\p{L}|\p{N}|\p{P}|\p{S})+ @@ -1509,7 +1523,7 @@ Suggested values include: 1] volume; 2] issue; 3] page; 4] line; 5] chapter; 6] - specifies the end-point of the range of units indicated by the unit attribute. + specifies the end-point of the range of units indicated by the @unit attribute. (\p{L}|\p{N}|\p{P}|\p{S})+ @@ -2539,6 +2553,7 @@ Suggested values include: 1] volume; 2] issue; 3] page; 4] line; 5] chapter; 6] + @@ -3160,6 +3175,7 @@ Suggested values include: 1] volume; 2] issue; 3] page; 4] line; 5] chapter; 6] + @@ -3187,6 +3203,17 @@ Suggested values include: 1] volume; 2] issue; 3] page; 4] line; 5] chapter; 6] + + + + + + + An @formula is provided to describe a mathematical calculation such as a conversion between measurement systems. + + + + @@ -3216,7 +3243,7 @@ Suggested values include: 1] volume; 2] issue; 3] page; 4] line; 5] chapter; 6] indicates whether the pronunciation or orthography applies to all or part of a word. -Suggested values include: 1] full (full form) ; 2] pref (prefix) ; 3] suff (suffix) ; 4] inf (infix) ; 5] part (partial) +Suggested values include: 1] full (full form); 2] pref (prefix); 3] suff (suffix); 4] inf (infix); 5] part (partial) full (full form) @@ -3279,11 +3306,11 @@ Suggested values include: 1] full (full form) ; 2] pref (prefix) ; 3] suff (suff Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] canto; 7] speaker; 8] stanza; 9] act; 10] scene; 11] section; 12] absent; 13] unnumbered page - physical page breaks (synonymous with the pb element). + physical page breaks (synonymous with the <pb> element). column column breaks. line - line breaks (synonymous with the lb element). + line breaks (synonymous with the <lb> element). book any units termed book, liber, etc. poem @@ -3940,6 +3967,7 @@ Measures] + @@ -4020,6 +4048,9 @@ attributes @target and @cRef may be supplied on . + + + @@ -4075,7 +4106,7 @@ attributes @target and @cRef may be supplied on . Suggested values include: 1] gloss; 2] index; 3] instructions; 4] litany; 5] syllogism gloss - each list item glosses some term or concept, which is given by a label element preceding the list item. + each list item glosses some term or concept, which is given by a <label> element preceding the list item. index each list item is an entry in an index such as the alphabetical topical index at the back of a print volume. instructions @@ -4250,7 +4281,7 @@ Suggested values include: 1] gloss; 2] index; 3] instructions; 4] litany; 5] syl - The encoding used to encode the binary data. If not specified, this is assumed to be Base64. + The encoding used to encode the binary data. If not specified, this is assumed to be Base64. @@ -4533,7 +4564,7 @@ Elements] classifies the title according to some convenient typology. -Sample values include: 1] main; 2] sub (subordinate) ; 3] alt (alternate) ; 4] short; 5] desc (descriptive) +Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] short; 5] desc (descriptive) (\p{L}|\p{N}|\p{P}|\p{S})+ @@ -4697,6 +4728,9 @@ Sample values include: 1] main; 2] sub (subordinate) ; 3] alt (alternate) ; 4] s + + + @@ -4808,7 +4842,7 @@ relatedItem element must be empty An lg element - must contain at least one child l, lg or gap element. + must contain at least one child l, lg, or gap element. @@ -4914,7 +4948,7 @@ Suggested values include: 1] setting; 2] entrance; 3] exit; 4] business; 5] nove - contains the whole of a TEI encoded corpus, comprising a single corpus header and one or more TEI elements, each containing a single text header and a text. [4. Default Text Structure 15.1. Varieties of Composite Text] + contains the whole of a TEI encoded corpus, comprising a single corpus header and one or more <TEI> elements, each containing a single text header and a text. [4. Default Text Structure 15.1. Varieties of Composite Text] @@ -5017,7 +5051,7 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist - specifies a replacement pattern, that is, the skeleton of a relative or absolute URI containing references to groups in the matchPattern which, once subpattern substitution has been performed, complete the URI. + specifies a replacement pattern, that is, the skeleton of a relative or absolute URI containing references to groups in the @matchPattern which, once subpattern substitution has been performed, complete the URI. @@ -5181,7 +5215,7 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist - (identifier) supplies any form of identifier used to identify some object, such as a bibliographic item, a person, a title, an organization, etc. in a standardized way. [2.2.4. Publication, Distribution, Licensing, etc. 2.2.5. The Series Statement 3.11.2.4. Imprint, Size of a Document, and Reprint Information] + (identifier) supplies any form of identifier used to identify some object, such as a bibliographic item, a person, a title, an organization, etc. in a standardized way. [13.3.1. Basic Principles 2.2.4. Publication, Distribution, Licensing, etc. 2.2.5. The Series Statement 3.11.2.4. Imprint, Size of a Document, and Reprint Information] @@ -5199,7 +5233,8 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist ISBN - International Standard Book Number: a 13- or (if assigned prior to 2007) 10-digit identifying number assigned by the publishing industry to a published book or similar item, registered with the International ISBN Agency. + International Standard Book Number: a 13- or (if assigned prior to 2007) 10-digit identifying number assigned by the publishing industry to a published book or similar item, registered with the International ISBN Agency. + ISSN International Standard Serial Number: an eight-digit number to uniquely identify a serial publication. DOI @@ -5372,7 +5407,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] - (schema reference) describes or points to a related customization or schema file [2.3.9. The Schema Specification] + (schema reference) describes or points to a related customization or schema file [2.3.10. The Schema Specification] @@ -5621,7 +5656,7 @@ On , either the @marks attribute should be used, or a paragraph of descri - indicates whether the element types listed exhaustively include all those found within text, or represent only a subset. + indicates whether the element types listed exhaustively include all those found within <text>, or represent only a subset. @@ -5634,7 +5669,7 @@ On , either the @marks attribute should be used, or a paragraph of descri - (generic identifier) specifies the name (generic identifier) of the element indicated by the tag, within the namespace indicated by the parent namespace element. + (generic identifier) specifies the name (generic identifier) of the element indicated by the tag, within the namespace indicated by the parent <namespace> element. @@ -5645,7 +5680,7 @@ On , either the @marks attribute should be used, or a paragraph of descri - (with unique identifier) specifies the number of occurrences of this element within the text which bear a distinct value for the global xml:id attribute. + (with unique identifier) specifies the number of occurrences of this element within the text which bear a distinct value for the global @xml:id attribute. @@ -5683,7 +5718,7 @@ Sample values include: 1] first-line; 2] first-letter; 3] before; 4] after - contains a selector or series of selectors specifying the elements to which the contained style description applies, expressed in the language specified in the scheme attribute. + contains a selector or series of selectors specifying the elements to which the contained style description applies, expressed in the language specified in the @scheme attribute. @@ -5752,12 +5787,17 @@ 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] - - - - - - + + + + + + + + + + + @@ -5859,7 +5899,7 @@ Sample values include: 1] first-line; 2] first-letter; 3] before; 4] after - (category description) describes some category within a taxonomy or text typology, either in the form of a brief prose description or in terms of the situational parameters used by the TEI formal textDesc. [2.3.7. The Classification Declaration] + (category description) describes some category within a taxonomy or text typology, either in the form of a brief prose description or in terms of the situational parameters used by the TEI formal <textDesc>. [2.3.7. The Classification Declaration] @@ -5873,14 +5913,14 @@ Sample values include: 1] first-line; 2] first-letter; 3] before; 4] after - (geographic coordinates declaration) documents the notation and the datum used for geographic coordinates expressed as content of the geo element elsewhere within the document. [2.3.8. The Geographic Coordinates Declaration] + (geographic coordinates declaration) documents the notation and the datum used for geographic coordinates expressed as content of the <geo> element elsewhere within the document. [2.3.8. The Geographic Coordinates Declaration] supplies a commonly used code name for the datum employed. -Suggested values include: 1] WGS84 (World Geodetic System) ; 2] MGRS (Military Grid Reference System) ; 3] OSGB36 (ordnance survey great britain) ; 4] ED50 (European Datum coordinate system) +Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Grid Reference System); 3] OSGB36 (ordnance survey great britain); 4] ED50 (European Datum coordinate system) WGS84 (World Geodetic System) a pair of numbers to be interpreted as latitude followed by longitude according to the World Geodetic System. @@ -5899,9 +5939,63 @@ Suggested values include: 1] WGS84 (World Geodetic System) ; 2] MGRS (Military G + + + (unit declarations) provides information about units of measurement that are not members of the International System of Units. [2.3.9. The Unit Declaration] + + + + + + + + + + + + (unit definition) contains descriptive information related to a specific unit of measurement. [2.3.9. The Unit Declaration] + + + + + + + + + + + + + + + + + + + + + + + + defines how to calculate one unit of measure in terms of another. [2.3.9. The Unit Declaration] + + + + + + indicates a source unit of measure that is to be converted into another unit indicated in @toUnit. + + + + the target unit of measurement for a conversion from a source unit referenced in @fromUnit. + + + + + - (application information) records information about an application which has edited the TEI file. [2.3.10. The Application Information Element] + (application information) records information about an application which has edited the TEI file. [2.3.11. The Application Information Element] @@ -5911,7 +6005,7 @@ Suggested values include: 1] WGS84 (World Geodetic System) ; 2] MGRS (Military G - provides information about an application which has acted upon the document. [2.3.10. The Application Information Element] + provides information about an application which has acted upon the document. [2.3.11. The Application Information Element] @@ -6010,7 +6104,7 @@ Suggested values include: 1] WGS84 (World Geodetic System) ; 2] MGRS (Military G - (identifier) Supplies a language code constructed as defined in BCP 47 which is used to identify the language documented by this element, and which is referenced by the global xml:lang attribute. + (identifier) Supplies a language code constructed as defined in BCP 47 which is used to identify the language documented by this element, and which is referenced by the global @xml:lang attribute. @@ -6055,7 +6149,7 @@ Suggested values include: 1] WGS84 (World Geodetic System) ; 2] MGRS (Military G - identifies the controlled vocabulary within which the set of keywords concerned is defined, for example by a taxonomy element, or by some other resource. + identifies the controlled vocabulary within which the set of keywords concerned is defined, for example by a <taxonomy> element, or by some other resource. @@ -6068,7 +6162,7 @@ Suggested values include: 1] WGS84 (World Geodetic System) ; 2] MGRS (Military G - identifies the classification system in use, as defined by, e.g. a taxonomy element, or some other resource. + identifies the classification system in use, as defined by, e.g. a <taxonomy> element, or some other resource. @@ -6082,7 +6176,7 @@ Suggested values include: 1] WGS84 (World Geodetic System) ; 2] MGRS (Military G - identifies the classification scheme within which the set of categories concerned is defined, for example by a taxonomy element, or by some other resource. + identifies the classification scheme within which the set of categories concerned is defined, for example by a <taxonomy> element, or by some other resource. @@ -6230,18 +6324,23 @@ 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] - - - - - - + + + + + + + + + + + - indicates whether the ordering of its child change elements is to be considered significant or not + indicates whether the ordering of its child <change> elements is to be considered significant or not @@ -6269,7 +6368,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5 - points to one or more change elements documenting a state or revision campaign to which the element bearing this attribute and its children have been assigned by the encoder. + points to one or more <change> elements documenting a state or revision campaign to which the element bearing this attribute and its children have been assigned by the encoder. @@ -6356,17 +6455,17 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5 identifies a two dimensional area within the bounding box specified by the other attributes by means of a series of pairs of numbers, each of which gives the x,y coordinates of a point on a line enclosing the area. - (\-?[0-9]+\.?[0-9]*,\-?[0-9]+\.?[0-9]*) + (-?[0-9]+(\.[0-9]+)?,-?[0-9]+(\.[0-9]+)?) - (\-?[0-9]+\.?[0-9]*,\-?[0-9]+\.?[0-9]*) + (-?[0-9]+(\.[0-9]+)?,-?[0-9]+(\.[0-9]+)?) - (\-?[0-9]+\.?[0-9]*,\-?[0-9]+\.?[0-9]*) + (-?[0-9]+(\.[0-9]+)?,-?[0-9]+(\.[0-9]+)?) - (\-?[0-9]+\.?[0-9]*,\-?[0-9]+\.?[0-9]*) + (-?[0-9]+(\.[0-9]+)?,-?[0-9]+(\.[0-9]+)?) @@ -6478,7 +6577,7 @@ Sample values include: 1] glued; 2] pinned; 3] sewn - defines any two-dimensional area within a surface element. [11.1. Digital Facsimiles 11.2.2. Embedded Transcription] + defines any two-dimensional area within a <surface> element. [11.1. Digital Facsimiles 11.2.2. Embedded Transcription] @@ -6494,7 +6593,7 @@ Sample values include: 1] glued; 2] pinned; 3] sewn - indicates the amount by which this zone has been rotated clockwise, with respect to the normal orientation of the parent surface element as implied by the dimensions given in the msDesc element or by the coordinates of the surface itself. The orientation is expressed in arc degrees. + indicates the amount by which this zone has been rotated clockwise, with respect to the normal orientation of the parent <surface> element as implied by the dimensions given in the <msDesc> element or by the coordinates of the <surface> itself. The orientation is expressed in arc degrees. @@ -6503,7 +6602,7 @@ Sample values include: 1] glued; 2] pinned; 3] sewn - defines any line passing through two or more points within a surface element. [11.1. Digital Facsimiles 11.2.2. Embedded Transcription] + defines any line passing through two or more points within a <surface> element. [11.1. Digital Facsimiles 11.2.2. Embedded Transcription] @@ -6531,14 +6630,14 @@ Sample values include: 1] glued; 2] pinned; 3] sewn identifies a line within the container or bounding box specified by the parent element by means of a series of two or more pairs of numbers, each of which gives the x,y coordinates of a point on the line. - (\-?[0-9]+\.?[0-9]*,\-?[0-9]+\.?[0-9]*) + (-?[0-9]+(\.[0-9]+)?,-?[0-9]+(\.[0-9]+)?) - (\-?[0-9]+\.?[0-9]*,\-?[0-9]+\.?[0-9]*) + (-?[0-9]+(\.[0-9]+)?,-?[0-9]+(\.[0-9]+)?) - (\-?[0-9]+\.?[0-9]*,\-?[0-9]+\.?[0-9]*) + (-?[0-9]+(\.[0-9]+)?,-?[0-9]+(\.[0-9]+)?) @@ -6549,7 +6648,7 @@ Sample values include: 1] glued; 2] pinned; 3] sewn - (added span of text) marks the beginning of a longer sequence of text added by an author, scribe, annotator or corrector (see also add). [11.3.1.4. Additions and Deletions] + (added span of text) marks the beginning of a longer sequence of text added by an author, scribe, annotator or corrector (see also <add>). [11.3.1.4. Additions and Deletions] @@ -6644,7 +6743,7 @@ The @spanTo attribute of is required. classifies the material encoded according to some useful typology. -Sample values include: 1] header; 2] footer; 3] pageNum (page number) ; 4] lineNum (line number) ; 5] sig (signature) ; 6] catch (catchword) +Sample values include: 1] header; 2] footer; 3] pageNum (page number); 4] lineNum (line number); 5] sig (signature); 6] catch (catchword) (\p{L}|\p{N}|\p{P}|\p{S})+ @@ -6655,7 +6754,7 @@ Sample values include: 1] header; 2] footer; 3] pageNum (page number) ; 4] lineN - contains one or more handNote elements documenting the different hands identified within the source texts. [11.3.2.1. Document Hands] + contains one or more <handNote> elements documenting the different hands identified within the source texts. [11.3.2.1. Document Hands] @@ -6671,7 +6770,7 @@ Sample values include: 1] header; 2] footer; 3] pageNum (page number) ; 4] lineN - indicates a handNote element describing the hand concerned. + indicates a <handNote> element describing the hand concerned. @@ -6884,9 +6983,14 @@ Sample values include: 1] header; 2] footer; 3] pageNum (page number) ; 4] lineN supplies a list of transpositions, each of which is indicated at some point in a document typically by means of metamarks. [11.3.4.5. Transpositions] - - - + + + + + + + + @@ -7370,7 +7474,7 @@ Suggested values include: 1] initial; 2] final - (embedding tree) provides an alternative to the tree element for representing ordered rooted tree structures. [19.3. Another Tree Notation] + (embedding tree) provides an alternative to the <tree> element for representing ordered rooted tree structures. [19.3. Another Tree Notation] @@ -7398,7 +7502,7 @@ Suggested values include: 1] initial; 2] final (underspecified embedding tree, so called because of its - characteristic shape when drawn) provides for an underspecified eTree, that is, an eTree with information left out. [19.3. Another Tree Notation] + characteristic shape when drawn) provides for an underspecified <eTree>, that is, an <eTree> with information left out. [19.3. Another Tree Notation] @@ -7423,7 +7527,7 @@ Suggested values include: 1] initial; 2] final - (leaf or terminal node of an embedding tree) provides explicitly for a leaf of an embedding tree, which may also be encoded with the eTree element. [19.3. Another Tree Notation] + (leaf or terminal node of an embedding tree) provides explicitly for a leaf of an embedding tree, which may also be encoded with the <eTree> element. [19.3. Another Tree Notation] @@ -7461,9 +7565,14 @@ Suggested values include: 1] initial; 2] final provides for lists of forests. [19.3. Another Tree Notation] - - - + + + + + + + + @@ -7478,7 +7587,7 @@ Suggested values include: 1] initial; 2] final - (TEI document) contains a single TEI-conformant document, combining a single TEI header with one or more members of the model.resourceLike class. Multiple TEI elements may be combined to form a teiCorpus element. [4. Default Text Structure 15.1. Varieties of Composite Text] + (TEI document) contains a single TEI-conformant document, combining a single TEI header with one or more members of the model.resourceLike class. Multiple <TEI> elements may be combined to form a <teiCorpus> element. [4. Default Text Structure 15.1. Varieties of Composite Text] @@ -8229,6 +8338,8 @@ Suggested values include: 1] initial; 2] final + + @@ -8446,7 +8557,7 @@ Suggested values include: 1] initial; 2] final specifies the role of this subdivision of the title. -Suggested values include: 1] main; 2] sub (subordinate) ; 3] alt (alternate) ; 4] short; 5] desc (descriptive) +Suggested values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] short; 5] desc (descriptive) main main title of the work @@ -8831,8 +8942,8 @@ Suggested values include: 1] main; 2] sub (subordinate) ; 3] alt (alternate) ; 4 - specifies the unit of time in which the interval value is expressed, if this is not inherited from the parent timeline. -Suggested values include: 1] d (days) ; 2] h (hours) ; 3] min (minutes) ; 4] s (seconds) ; 5] ms (milliseconds) + specifies the unit of time in which the @interval value is expressed, if this is not inherited from the parent <timeline>. +Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (seconds); 5] ms (milliseconds) d (days) @@ -8868,7 +8979,7 @@ Suggested values include: 1] d (days) ; 2] h (hours) ; 3] min (minutes) ; 4] s ( - identifies the reference point for determining the time of the current when element, which is obtained by adding the interval to the time of the reference point. + identifies the reference point for determining the time of the current <when> element, which is obtained by adding the interval to the time of the reference point. @@ -8890,8 +9001,8 @@ Suggested values include: 1] d (days) ; 2] h (hours) ; 3] min (minutes) ; 4] s ( - specifies the unit of time corresponding to the interval value of the timeline or of its constituent points in time. -Suggested values include: 1] d (days) ; 2] h (hours) ; 3] min (minutes) ; 4] s (seconds) ; 5] ms (milliseconds) + specifies the unit of time corresponding to the @interval value of the timeline or of its constituent points in time. +Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (seconds); 5] ms (milliseconds) d (days) @@ -8958,9 +9069,9 @@ You must supply at least two values for @target on indicates whether the targets to be joined include the entire element indicated (the entire subtree including its root), or just the children of the target (the branches of the subtree). root - the rooted subtrees indicated by the target attribute are joined, each subtree become a child of the virtual element created by the join + the rooted subtrees indicated by the @target attribute are joined, each subtree become a child of the virtual element created by the join branches - the children of the subtrees indicated by the target attribute become the children of the virtual element (i.e. the roots of the subtrees are discarded) + the children of the subtrees indicated by the @target attribute become the children of the virtual element (i.e. the roots of the subtrees are discarded) @@ -8969,7 +9080,7 @@ You must supply at least two values for @target on - (join group) groups a collection of join elements and possibly pointers. [16.7. Aggregation] + (join group) groups a collection of <join> elements and possibly pointers. [16.7. Aggregation] @@ -8985,7 +9096,7 @@ You must supply at least two values for @target on - supplies the default value for the result on each join included within the group. + supplies the default value for the @result on each <join> included within the group. @@ -9025,7 +9136,7 @@ You must supply at least two values for @target on - If mode is excl, each weight states the probability that the corresponding alternative occurs. If mode is incl each weight states the probability that the corresponding alternative occurs given that at least one of the other alternatives occurs. + If @mode is excl, each weight states the probability that the corresponding alternative occurs. If @mode is incl each weight states the probability that the corresponding alternative occurs given that at least one of the other alternatives occurs. @@ -9040,7 +9151,7 @@ You must supply at least two values for @target on - (alternation group) groups a collection of alt elements and possibly pointers. [16.8. Alternation] + (alternation group) groups a collection of <alt> elements and possibly pointers. [16.8. Alternation] @@ -9078,7 +9189,7 @@ You must supply at least two values for @target on indicates type of entry, in dictionaries with multiple types. -Suggested values include: 1] main; 2] hom (homograph) ; 3] xref (cross reference) ; 4] affix; 5] abbr (abbreviation) ; 6] supplemental; 7] foreign +Suggested values include: 1] main; 2] hom (homograph); 3] xref (cross reference); 4] affix; 5] abbr (abbreviation); 6] supplemental; 7] foreign main a main entry (default). @@ -9155,7 +9266,7 @@ Suggested values include: 1] main; 2] hom (homograph) ; 3] xref (cross reference - indicates an anchor element typically elsewhere in the document, but possibly in another document, which is the original location of this component. + indicates an <anchor> element typically elsewhere in the document, but possibly in another document, which is the original location of this component. @@ -9626,8 +9737,8 @@ Suggested values include: 1] simple; 2] lemma; 3] variant; 4] compound; 5] deriv - classifies the grammatical information given according to some convenient typology—in the case of terminological information, preferably the dictionary of data element types specified in ISO 12620. -Sample values include: 1] pos (part of speech) ; 2] gen (gender) ; 3] num (number) ; 4] animate; 5] proper + classifies the grammatical information given according to some convenient typology—in the case of terminological information, preferably the dictionary of data element types specified in ISO 12620. +Sample values include: 1] pos (part of speech); 2] gen (gender); 3] num (number); 4] animate; 5] proper (\p{L}|\p{N}|\p{P}|\p{S})+ @@ -9710,7 +9821,7 @@ Sample values include: 1] abbrev; 2] verbTable - (grammatical information group) groups morpho-syntactic information about a lexical item, e.g. pos, gen, number, case, or iType (inflectional class). [9.3.2. Grammatical Information] + (grammatical information group) groups morpho-syntactic information about a lexical item, e.g. <pos>, <gen>, <number>, <case>, or <iType> (inflectional class). [9.3.2. Grammatical Information] @@ -9806,7 +9917,7 @@ Sample values include: 1] abbrev; 2] verbTable classifies the usage information using any convenient typology. -Sample values include: 1] geo (geographic) ; 2] time; 3] dom (domain) ; 4] register; 5] style; 6] plev (preference level) ; 7] lang (language) ; 8] gram (grammatical) ; 9] syn (synonym) ; 10] hyper (hypernym) ; 11] colloc (collocation) ; 12] comp (complement) ; 13] obj (object) ; 14] subj (subject) ; 15] verb; 16] hint +Sample values include: 1] geo (geographic); 2] time; 3] dom (domain); 4] register; 5] style; 6] plev (preference level); 7] lang (language); 8] gram (grammatical); 9] syn (synonym); 10] hyper (hypernym); 11] colloc (collocation); 12] comp (complement); 13] obj (object); 14] subj (subject); 15] verb; 16] hint (\p{L}|\p{N}|\p{P}|\p{S})+ @@ -9851,7 +9962,7 @@ Sample values include: 1] geo (geographic) ; 2] time; 3] dom (domain) ; 4] regis indicates the type of cross reference, using any convenient typology. -Sample values include: 1] syn (synonym) ; 2] etym (etymological) ; 3] cf (compare or consult) ; 4] illus (illustration) +Sample values include: 1] syn (synonym); 2] etym (etymological); 3] cf (compare or consult); 4] illus (illustration) (\p{L}|\p{N}|\p{P}|\p{S})+ @@ -9896,7 +10007,7 @@ Sample values include: 1] syn (synonym) ; 2] etym (etymological) ; 3] cf (compar indicates the kind of typographic modification made to the headword in the reference. -Sample values include: 1] cap (capital) ; 2] noHyph (no hyphen) +Sample values include: 1] cap (capital); 2] noHyph (no hyphen) (\p{L}|\p{N}|\p{P}|\p{S})+ diff --git a/Test/expected-results/test.tex b/Test/expected-results/test.tex index 29234e1e8..30d2749a5 100644 --- a/Test/expected-results/test.tex +++ b/Test/expected-results/test.tex @@ -133,6 +133,8 @@ \usepackage{graphicx} \usepackage{marginnote} +\renewcommand{\@cite}[1]{#1} + \renewcommand*{\marginfont}{\itshape\footnotesize} @@ -280,7 +282,7 @@ {\end{list}\end{raggedright}} \newenvironment{specHead}[2]% {\vspace{20pt}\hrule\vspace{10pt}% - \label{#1}\markright{#2}% + \phantomsection\label{#1}\markright{#2}% \pdfbookmark[2]{#2}{#1}% \hspace{-0.75in}{\bfseries\fontsize{16pt}{18pt}\selectfont#2}% @@ -327,7 +329,7 @@ \fancyfoot[LE]{} \fancyfoot[CE]{\thepage} \fancyfoot[RE]{\TheID} -\hypersetup{linkbordercolor=0.75 0.75 0.75,urlbordercolor=0.75 0.75 0.75,bookmarksnumbered=true} +\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} \let\tabcellsep& \frontmatter diff --git a/Test/expected-results/test.xml.docx b/Test/expected-results/test.xml.docx index 9c4bde47c..145f4a86a 100644 Binary files a/Test/expected-results/test.xml.docx and b/Test/expected-results/test.xml.docx differ diff --git a/Test/expected-results/test.xml.odt b/Test/expected-results/test.xml.odt index c3ccd3a4c..3e8a139b8 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/test15.odd.html b/Test/expected-results/test15.odd.html index d4f429247..fa92bd4b8 100644 --- a/Test/expected-results/test15.odd.html +++ b/Test/expected-results/test15.odd.html @@ -107,7 +107,7 @@

add alt anchor - application + application bibl biblStruct binaryObject @@ -151,7 +151,7 @@

reg relatedItem rs - schemaRef + schemaRef seg table teiCorpus @@ -160,6 +160,7 @@

time trailer unit + unitDef xenoData @@ -168,7 +169,7 @@

Atributos - Atributos
typocaracteriza el elemento utilizando una clasificación o tipología funcional.
EstadoOpcional
Tipo de datosteidata.enumerated
<div typ="verse"> +
Atributos
typocaracteriza el elemento utilizando una clasificación o tipología funcional.
@@ -1127,7 +1128,7 @@

  • gap/@agent
  • geoDecl/@datum
  • hyphenation/@eol
    • -
  • idno/@type
    • +
  • idno/@type
  • join/@scope
  • list/@type
  • measure/@type
    • @@ -1219,10 +1220,10 @@

    - + - + @@ -1275,6 +1276,9 @@

    + + + @@ -1440,6 +1444,9 @@

    + + + @@ -1606,7 +1613,7 @@

    - + @@ -2077,7 +2084,7 @@

    - + @@ -2259,6 +2266,12 @@

    + + + + + + diff --git a/Test/expected-results/test15.odd.rnc b/Test/expected-results/test15.odd.rnc index 3e90dff26..10c9e8d42 100644 --- a/Test/expected-results/test15.odd.rnc +++ b/Test/expected-results/test15.odd.rnc @@ -1,5 +1,6 @@ namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" -namespace ns1 = "http://www.isocat.org/ns/dcr" +namespace ns1 = "http://www.w3.org/1999/xhtml" +namespace ns2 = "http://www.isocat.org/ns/dcr" namespace rng = "http://relaxng.org/ns/structure/1.0" namespace sch = "http://purl.oclc.org/dsdl/schematron" default namespace tei = "http://www.tei-c.org/ns/1.0" @@ -99,8 +100,15 @@ att.ranging.attribute.max = | xsd:decimal }? att.ranging.attribute.confidence = - - ## specifies the degree of statistical confidence (between zero and one) that a value falls within the range specified by min and max, or the proportion of observed values that fall within that range. + [ + a:documentation [ + "specifies the degree of statistical confidence (between zero and one) that a value falls within the range specified by " + ns1:code [ "@min" ] + " and " + ns1:code [ "@max" ] + ", or the proportion of observed values that fall within that range." + ] + ] attribute confidence { xsd:double }? att.dimensions.attributes = att.ranging.attributes, @@ -112,7 +120,7 @@ att.dimensions.attributes = att.dimensions.attribute.unit = ## names the unit used for the measurement - ## Suggested values include: 1] cm (centimetres) ; 2] mm (millimetres) ; 3] in (inches) ; 4] lines; 5] chars (characters) + ## Suggested values include: 1] cm (centimetres); 2] mm (millimetres); 3] in (inches); 4] line; 5] char (characters) attribute unit { ## (centimetres) @@ -125,10 +133,10 @@ att.dimensions.attribute.unit = "in" | ## lines of text - "lines" + "line" | ## (characters) characters of text - "chars" + "char" | xsd:token { pattern = "(\p{L}|\p{N}|\p{P}|\p{S})+" } }? att.dimensions.attribute.quantity = @@ -169,8 +177,13 @@ att.dimensions.attribute.scope = }? att.written.attributes = att.written.attribute.hand att.written.attribute.hand = - - ## points to a handNote element describing the hand considered responsible for the content of the element concerned. + [ + a:documentation [ + "points to a " + ns1:code [ "" ] + " element describing the hand considered responsible for the content of the element concerned." + ] + ] attribute hand { xsd:anyURI }? att.breaking.attributes = att.breaking.attribute.break att.breaking.attribute.break = @@ -181,8 +194,13 @@ att.breaking.attribute.break = }? att.cReferencing.attributes = att.cReferencing.attribute.cRef att.cReferencing.attribute.cRef = - - ## (canonical reference) specifies the destination of the pointer by supplying a canonical reference expressed using the scheme defined in a refsDecl element in the TEI header + [ + a:documentation [ + "(canonical reference) specifies the destination of the pointer by supplying a canonical reference expressed using the scheme defined in a " + ns1:code [ "" ] + " element in the TEI header" + ] + ] attribute cRef { xsd:string }? att.datable.w3c.attributes = att.datable.w3c.attribute.when, @@ -330,9 +348,9 @@ sch:pattern [ " " sch:assert [ test = "string-length(.) gt 0" - "\x{a}" ~ - "@calendar indicates the system or calendar to which the date represented by the content of this element\x{a}" ~ - "belongs, but this " + " @calendar indicates the system or calendar to\x{a}" ~ + " which the date represented by the content of this element belongs, but this\x{a}" ~ + " " sch:name [ ] " element has no textual content." ] @@ -351,13 +369,13 @@ att.datcat.attributes = att.datcat.attribute.datcat = ## contains a PID (persistent identifier) that aligns the given element with the appropriate Data Category (or categories) in ISOcat. - attribute ns1:datcat { + attribute ns2:datcat { list { xsd:anyURI+ } }? att.datcat.attribute.valueDatcat = ## contains a PID (persistent identifier) that aligns the content of the given element or the value of the given attribute with the appropriate simple Data Category (or categories) in ISOcat. - attribute ns1:valueDatcat { + attribute ns2:valueDatcat { list { xsd:anyURI+ } }? att.declarable.attributes = att.declarable.attribute.default @@ -556,8 +574,16 @@ att.global.attribute.n = ## (number) gives a number (or other label) for an element, which is not necessarily unique within the document. attribute n { xsd:string }? att.global.attribute.xmllang = - - ## (language) indicates the language of the element content using a tag generated according to BCP 47. + [ + a:documentation [ + "(language) indicates the language of the element content using a tag generated according to " + ns1:a [ + href = "http://www.rfc-editor.org/rfc/bcp/bcp47.txt" + "BCP 47" + ] + "." + ] + ] attribute xml:lang { xsd:language | ( @@ -584,8 +610,13 @@ att.handFeatures.attribute.scribe = ## gives a name or other identifier for the scribe believed to be responsible for this hand. attribute scribe { xsd:Name }? att.handFeatures.attribute.scribeRef = - - ## points to a full description of the scribe concerned, typically supplied by a person element elsewhere in the description. + [ + a:documentation [ + "points to a full description of the scribe concerned, typically supplied by a " + ns1:code [ "" ] + " element elsewhere in the description." + ] + ] attribute scribeRef { list { xsd:anyURI+ } }? @@ -596,8 +627,13 @@ att.handFeatures.attribute.script = list { xsd:Name+ } }? att.handFeatures.attribute.scriptRef = - - ## points to a full description of the script or writing style used by this hand, typically supplied by a scriptNote element elsewhere in the description. + [ + a:documentation [ + "points to a full description of the script or writing style used by this hand, typically supplied by a " + ns1:code [ "" ] + " element elsewhere in the description." + ] + ] attribute scriptRef { list { xsd:anyURI+ } }? @@ -670,12 +706,13 @@ att.resourced.attribute.url = attribute url { xsd:anyURI } att.measurement.attributes = att.measurement.attribute.unit, + att.measurement.attribute.unitRef, att.measurement.attribute.quantity, att.measurement.attribute.commodity att.measurement.attribute.unit = ## indicates the units used for the measurement, usually using the standard symbol for the desired units. - ## Suggested values include: 1] m (metre) ; 2] kg (kilogram) ; 3] s (second) ; 4] Hz (hertz) ; 5] Pa (pascal) ; 6] Ω (ohm) ; 7] L (litre) ; 8] t (tonne) ; 9] ha (hectare) ; 10] Å (ångström) ; 11] mL (millilitre) ; 12] cm (centimetre) ; 13] dB (decibel) ; 14] kbit (kilobit) ; 15] Kibit (kibibit) ; 16] kB (kilobyte) ; 17] KiB (kibibyte) ; 18] MB (megabyte) ; 19] MiB (mebibyte) + ## Suggested values include: 1] m (metre); 2] kg (kilogram); 3] s (second); 4] Hz (hertz); 5] Pa (pascal); 6] Ω (ohm); 7] L (litre); 8] t (tonne); 9] ha (hectare); 10] Å (ångström); 11] mL (millilitre); 12] cm (centimetre); 13] dB (decibel); 14] kbit (kilobit); 15] Kibit (kibibit); 16] kB (kilobyte); 17] KiB (kibibyte); 18] MB (megabyte); 19] MiB (mebibyte) attribute unit { ## (metre) SI base unit of length @@ -736,6 +773,17 @@ att.measurement.attribute.unit = "MiB" | xsd:token { pattern = "(\p{L}|\p{N}|\p{P}|\p{S})+" } }? +att.measurement.attribute.unitRef = + [ + a:documentation [ + "points to a unique identifier stored in the " + ns1:code [ "@xml:id" ] + " of a " + ns1:code [ "" ] + " element that defines a unit of measure." + ] + ] + attribute unitRef { xsd:anyURI }? att.measurement.attribute.quantity = ## specifies the number of the specified units that comprise the measurement @@ -752,6 +800,26 @@ att.measurement.attribute.commodity = xsd:token { pattern = "(\p{L}|\p{N}|\p{P}|\p{S})+" }+ } }? +sch:pattern [ + id = + "test15-att.measurement-att-measurement-unitRef-constraint-rule-5" + "\x{a}" ~ + " " + sch:rule [ + context = "tei:*[@unitRef]" + "\x{a}" ~ + " " + sch:report [ + test = "@unit" + role = "info" + "The @unit attribute may be unnecessary when @unitRef is present." + ] + "\x{a}" ~ + " " + ] + "\x{a}" ~ + " " +] att.naming.attributes = att.canonical.attributes, att.naming.attribute.role, @@ -832,7 +900,7 @@ att.typed.attribute.subtype = xsd:token { pattern = "(\p{L}|\p{N}|\p{P}|\p{S})+" } }? sch:pattern [ - id = "test15-att.typed-subtypeTyped-constraint-rule-5" + id = "test15-att.typed-subtypeTyped-constraint-rule-6" "\x{a}" ~ " " sch:rule [ @@ -856,8 +924,18 @@ att.pointing.attributes = att.pointing.attribute.target, att.pointing.attribute.evaluate att.pointing.attribute.targetLang = - - ## specifies the language of the content to be found at the destination referenced by target, using a language tag generated according to BCP 47. + [ + a:documentation [ + "specifies the language of the content to be found at the destination referenced by " + ns1:code [ "@target" ] + ", using a language tag generated according to " + ns1:a [ + href = "http://www.rfc-editor.org/rfc/bcp/bcp47.txt" + "BCP 47" + ] + "." + ] + ] attribute targetLang { xsd:language | ( @@ -865,7 +943,7 @@ att.pointing.attribute.targetLang = "") }? sch:pattern [ - id = "test15-att.pointing-targetLang-targetLang-constraint-rule-6" + id = "test15-att.pointing-targetLang-targetLang-constraint-rule-7" "\x{a}" ~ " " sch:rule [ @@ -916,8 +994,19 @@ att.pointing.group.attribute.domains = list { xsd:anyURI, xsd:anyURI, xsd:anyURI* } }? att.pointing.group.attribute.targFunc = - - ## (target function) describes the function of each of the values of the target attribute of the enclosed link, join, or alt tags. + [ + a:documentation [ + "(target function) describes the function of each of the values of the " + ns1:code [ "@target" ] + " attribute of the enclosed " + ns1:code [ "" ] + ", " + ns1:code [ "" ] + ", or " + ns1:code [ "" ] + " tags." + ] + ] attribute targFunc { list { xsd:token { pattern = "(\p{L}|\p{N}|\p{P}|\p{S})+" }, @@ -964,7 +1053,7 @@ att.spanning.attribute.spanTo = ## indicates the end of a span initiated by the element bearing this attribute. attribute spanTo { xsd:anyURI }? sch:pattern [ - id = "test15-att.spanning-spanTo-spanTo-2-constraint-rule-7" + id = "test15-att.spanning-spanTo-spanTo-2-constraint-rule-8" "\x{a}" ~ " " sch:rule [ @@ -1008,14 +1097,19 @@ att.styleDef.attribute.scheme = "other" }? att.styleDef.attribute.schemeVersion = - - ## supplies a version number for the style language provided in scheme. + [ + a:documentation [ + "supplies a version number for the style language provided in " + ns1:code [ "@scheme" ] + "." + ] + ] attribute schemeVersion { xsd:token { pattern = "[\d]+[a-z]*[\d]*(\.[\d]+[a-z]*[\d]*){0,3}" } }? sch:pattern [ id = - "test15-att.styleDef-schemeVersion-schemeVersionRequiresScheme-constraint-rule-8" + "test15-att.styleDef-schemeVersion-schemeVersionRequiresScheme-constraint-rule-9" "\x{a}" ~ " " sch:rule [ @@ -1118,14 +1212,24 @@ att.citing.attribute.unit = | xsd:token { pattern = "(\p{L}|\p{N}|\p{P}|\p{S})+" } }? att.citing.attribute.from = - - ## specifies the starting point of the range of units indicated by the unit attribute. + [ + a:documentation [ + "specifies the starting point of the range of units indicated by the " + ns1:code [ "@unit" ] + " attribute." + ] + ] attribute from { xsd:token { pattern = "(\p{L}|\p{N}|\p{P}|\p{S})+" } }? att.citing.attribute.to = - - ## specifies the end-point of the range of units indicated by the unit attribute. + [ + a:documentation [ + "specifies the end-point of the range of units indicated by the " + ns1:code [ "@unit" ] + " attribute." + ] + ] attribute to { xsd:token { pattern = "(\p{L}|\p{N}|\p{P}|\p{S})+" } }? @@ -1501,6 +1605,7 @@ model.encodingDescPart = | listPrefixDef | classDecl | geoDecl + | unitDecl | appInfo model.editorialDeclPart = correction @@ -1518,6 +1623,16 @@ model.profileDescPart = | textClass | calendarDesc | correspDesc +att.formula.attributes = att.formula.attribute.formula +att.formula.attribute.formula = + [ + a:documentation [ + "An " + ns1:code [ "@formula" ] + " is provided to describe a mathematical calculation such as a conversion between measurement systems." + ] + ] + attribute formula { text }? model.correspActionPart = model.dateLike | model.addressLike | model.nameLike | note model.correspContextPart = model.ptrLike | model.pLike | note @@ -1552,14 +1667,24 @@ att.milestoneUnit.attribute.unit = ## provides a conventional name for the kind of section changing at this milestone. ## Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] canto; 7] speaker; 8] stanza; 9] act; 10] scene; 11] section; 12] absent; 13] unnumbered attribute unit { - - ## physical page breaks (synonymous with the pb element). + [ + a:documentation [ + "physical page breaks (synonymous with the " + ns1:code [ "" ] + " element)." + ] + ] "page" | ## column breaks. "column" - | - ## line breaks (synonymous with the lb element). + | [ + a:documentation [ + "line breaks (synonymous with the " + ns1:code [ "" ] + " element)." + ] + ] "line" | ## any units termed book, liber, etc. @@ -1599,7 +1724,7 @@ p = element para { macro.paraContent >> sch:pattern [ - id = "test15-p-abstractModel-structure-p-constraint-report-4" + id = "test15-p-abstractModel-structure-p-constraint-report-5" "\x{a}" ~ " " sch:rule [ @@ -1620,7 +1745,7 @@ p = " " ] >> sch:pattern [ - id = "test15-p-abstractModel-structure-l-constraint-report-5" + id = "test15-p-abstractModel-structure-l-constraint-report-6" "\x{a}" ~ " " sch:rule [ @@ -1798,7 +1923,7 @@ desc = macro.limitedContent >> sch:pattern [ id = - "test15-desc-deprecationInfo-only-in-deprecated-constraint-rule-9" + "test15-desc-deprecationInfo-only-in-deprecated-constraint-rule-10" "\x{a}" ~ " " sch:rule [ @@ -2141,6 +2266,7 @@ time = (text | model.gLike | model.phrase | model.global)*, att.global.attributes, att.datable.attributes, + att.canonical.attributes, att.editLike.attributes, att.dimensions.attributes, att.typed.attributes, @@ -2176,7 +2302,7 @@ ptr = element ptr { empty >> sch:pattern [ - id = "test15-ptr-ptrAtts-constraint-report-6" + id = "test15-ptr-ptrAtts-constraint-report-7" "\x{a}" ~ " " sch:rule [ @@ -2210,7 +2336,7 @@ ref = element ref { macro.paraContent >> sch:pattern [ - id = "test15-ref-refAtts-constraint-report-7" + id = "test15-ref-refAtts-constraint-report-8" "\x{a}" ~ " " sch:rule [ @@ -2243,7 +2369,7 @@ ref = ## contains any sequence of items organized as a list. [3.7. Lists] element list { - ((model.divTop | model.global)*, + ((model.divTop | model.global | desc*)*, ((item, model.global*)+ | (headLabel?, headItem?, @@ -2251,7 +2377,7 @@ ref = (model.divBottom, model.global*)*) >> sch:pattern [ id = - "test15-list-gloss-list-must-have-labels-constraint-rule-10" + "test15-list-gloss-list-must-have-labels-constraint-rule-11" "\x{a}" ~ " " sch:rule [ @@ -2275,8 +2401,13 @@ ref = ## describes the nature of the items in the list. ## Suggested values include: 1] gloss; 2] index; 3] instructions; 4] litany; 5] syllogism attribute type { - - ## each list item glosses some term or concept, which is given by a label element preceding the list item. + [ + a:documentation [ + "each list item glosses some term or concept, which is given by a " + ns1:code [ "
    EstadoOpcional
    Tipo de datosteidata.enumerated
    <div typ="verse">  <head>Night in Tarras</head>  <lg type="stanza">   <l>At evening tramping on the hot white road</l> @@ -531,7 +532,7 @@

    header: abstract - application + application availability cRefPattern calendar @@ -666,7 +667,7 @@

    header: biblFull - idno + idno

    @@ -1001,7 +1002,7 @@

    header: biblFull - idno + idno

    @@ -1042,7 +1043,7 @@

    Ejemplo

    		-
    It is spelled <q>Tübingen</q> — to enter the +
    It is spelled <q>Tübingen</q> — to enter the letter <q>u</q> with an umlaut hold down the <q>option</q> key and press <q>0 0 f c</q>
    		anchor: (punto de anclaje) enlanza un indentificador con una posición al interno del texto, independientemente del hecho que esta sea o no a un elemento textual. [8.4.2. Synchronization and Overlap 16.5. Correspondence and Alignment]
    appInfo: (información de la aplicación) recoge información sobre la aplicación que ha editado el fichero de TEI. [2.3.10. The Application Information Element]appInfo: (información de la aplicación) recoge información sobre la aplicación que ha editado el fichero de TEI. [2.3.11. The Application Information Element]
    application: proporciona información sobre la aplicación que ha actuado sobre el documento. [2.3.10. The Application Information Element]application: proporciona información sobre la aplicación que ha actuado sobre el documento. [2.3.11. The Application Information Element]
    argument: lista formal o descripción de los argumentos contenidos en una sección de texto. [4.2. Elements Common to All Divisions 4.6. Title Pages]
    att.edition: provides attributes identifying the source edition from which some encoded feature derives.
    att.formula: provides attributes for defining a mathematical formula. [2.3.9. The Unit Declaration]
    att.fragmentable: provides an attribute for representing fragmentation of a structural element, typically as a consequence of some overlapping hierarchy.
    closer: agrupa saludos, fechas, y expresiones similares que aparecen al final de una división textual, especialmente en una letra. [4.2.2. Openers and Closers 4.2. Elements Common to All Divisions]
    conversion: defines how to calculate one unit of measure in terms of another. [2.3.9. The Unit Declaration]
    corr: (corrección) contiene la forma correcta de un pasaje aparentemente erróneo en el texto de copia. [3.4.1. Apparent Errors]
    hyphenation: indica el modo en que han sido tratados el uso del guión presente en el texto fuente en la versión codificada de este. [2.3.3. The Editorial Practices Declaration 15.3.2. Declarable Elements]
    idno: (número identificativo) proporciona un número, estándard o no, usado para la identificación de un elemento bibliográfico. [2.2.4. Publication, Distribution, Licensing, etc. 2.2.5. The Series Statement 3.11.2.4. Imprint, Size of a Document, and Reprint Information]idno: (número identificativo) proporciona un número, estándard o no, usado para la identificación de un elemento bibliográfico. [13.3.1. Basic Principles 2.2.4. Publication, Distribution, Licensing, etc. 2.2.5. The Series Statement 3.11.2.4. Imprint, Size of a Document, and Reprint Information]
    imprimatur: contiene una declaración formal que autoriza la publicazione de una obra, normalmente contenida en el recto o en el verso del frontispicio. [4.6. Title Pages]samplingDecl: (declaración de muestra) contiene una descripción en prosa sobre los fundamentos y métodos usados en textos de muestra en la creación de un corpus o una selección de textos. [2.3.2. The Sampling Declaration 2.3. The Encoding Description 15.3.2. Declarable Elements]
    schemaRef: (schema reference) describes or points to a related customization or schema file [2.3.9. The Schema Specification]schemaRef: (schema reference) describes or points to a related customization or schema file [2.3.10. The Schema Specification]
    scriptNote: describes a particular script distinguished within the description of a manuscript or similar resource. [10.7.2. Writing, Decoration, and Other Notations]
    unit: contains a symbol, a word or a phrase referring to a unit of measurement in any kind of formal or informal system. [3.5.3. Numbers and Measures]
    unitDecl: (unit declarations) provides information about units of measurement that are not members of the International System of Units. [2.3.9. The Unit Declaration]
    unitDef: (unit definition) contains descriptive information related to a specific unit of measurement. [2.3.9. The Unit Declaration]
    when: proporciona una indicación temporal en términos relativos respecto a otros elementos determinados sobre la misma escala temporal, o en términos absolutos. [16.4.2. Placing Synchronous Events in Time]
    @@ -1088,9 +1097,13 @@ These seem to have no obvious translation - - - + + Since soft page breaks are an optional and application specific feature, we disregard them completely. + See the OpenDocument specification + for further information. + + + @@ -1166,6 +1179,13 @@ These seem to have no obvious translation + + + +
    @@ -1389,4 +1409,23 @@ These seem to have no obvious translation + + + Check whether the given element (e.g. text:p) refers to a style that implies a hard page break before. + + The element for which to check the style. + The element's attribute @text:style-name or @table:style-name is used for looking up the style + A tei:pb element if the lookup was succesful, the empty sequence otherwise + + + + + + + + diff --git a/profiles/jtei/jtei.common.xsl b/profiles/jtei/jtei.common.xsl index 67c911da9..d107ee31e 100644 --- a/profiles/jtei/jtei.common.xsl +++ b/profiles/jtei/jtei.common.xsl @@ -84,10 +84,47 @@ - + - + + + + + + + + + + + + @@ -301,6 +338,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/profiles/jtei/odt/odt.common.xsl b/profiles/jtei/odt/odt.common.xsl index e4f3f8337..8d15fb25e 100644 --- a/profiles/jtei/odt/odt.common.xsl +++ b/profiles/jtei/odt/odt.common.xsl @@ -399,15 +399,11 @@ - - + + - - - [] - + @@ -843,12 +840,35 @@ - + + + + + + + + + + + + + + + + + + + + + diff --git a/profiles/jtei/openedition/to.xsl b/profiles/jtei/openedition/to.xsl index 398c7d166..4c4ff5da0 100644 --- a/profiles/jtei/openedition/to.xsl +++ b/profiles/jtei/openedition/to.xsl @@ -350,10 +350,8 @@ - - - - + + @@ -974,6 +972,12 @@ + + + + + @@ -985,16 +989,6 @@ - - - - - diff --git a/profiles/jtei/pdf/to.xsl b/profiles/jtei/pdf/to.xsl index bfd2298c8..a4404b85c 100644 --- a/profiles/jtei/pdf/to.xsl +++ b/profiles/jtei/pdf/to.xsl @@ -377,9 +377,7 @@ - - - + @@ -1123,15 +1121,6 @@ - - - - - + diff --git a/tools/getnames.xsl b/tools/getnames.xsl index 4f1f8d1b9..f3699876c 100644 --- a/tools/getnames.xsl +++ b/tools/getnames.xsl @@ -37,12 +37,14 @@ theory of liability, whether in contract, strict liability, or tort of this software, even if advised of the possibility of such damage. --> + + - + select="doc($defaultSource)//elementSpec"> + diff --git a/tools/oddbyexample.xsl b/tools/oddbyexample.xsl index 53d8ce465..4240932a1 100644 --- a/tools/oddbyexample.xsl +++ b/tools/oddbyexample.xsl @@ -88,7 +88,7 @@ valList true http://www.tei-c.org/Vault/P5/current/xml/tei/odd/p5subset.xml + >https://www.tei-c.org/Vault/P5/current/xml/tei/odd/p5subset.xml false