From 475c9c7ac59321b92bf3ba9ae0ebf22495e181ac Mon Sep 17 00:00:00 2001 From: helenasabel Date: Fri, 27 Aug 2021 21:00:59 +0200 Subject: [PATCH 1/3] P5 subset update --- source/p5subset.xml | 388 ++++++++++++++++++++------------------------ 1 file changed, 179 insertions(+), 209 deletions(-) diff --git a/source/p5subset.xml b/source/p5subset.xml index a8412ec7a..1e0808313 100644 --- a/source/p5subset.xml +++ b/source/p5subset.xml @@ -7,7 +7,7 @@ Version 4.3.0a. Last updated on - 19th July 2021, revision 2f6b034be + 26th August 2021, revision 59a2becc4 TEI Consortium @@ -369,7 +369,7 @@ Instance - provides attributes which can be used to associate a representation such as a name or title + provides attributes that can be used to associate a representation such as a name or title with canonical information about the object being named or referenced. fournit des attributs qui peuvent être utilisés pour associer une représentation telle qu'un nom ou un titre à l'information canonique concernant @@ -642,7 +642,7 @@ The MS. was lost in transmission by mail from - provides an attribute to indicate the hand in which + provides attributes to indicate the hand in which the content of an element was written in the source being transcribed. @@ -850,7 +850,7 @@ header (see section ). - provides an attribute to indicate whether or not the element + provides attributes to indicate whether or not the element concerned is considered to mark the end of an orthographic token in the same way as whitespace. fournit un attribut pour indiquer si un élément est @@ -913,7 +913,7 @@ of any adjacent whitespace - provides an attribute which may be used to supply a + provides attributes that may be used to supply a canonical reference as a means of identifying the target of a pointer. ポインタのターゲットを識別する手段としてcanonical referenceを提供するために使用される属性を提供する。 @@ -1431,11 +1431,10 @@ of any adjacent whitespace - provides the dcr:datacat and - dcr:ValueDatacat attributes which are used to + provides attributes that are used to align XML elements or attributes with the appropriate Data Categories (DCs) defined by the ISO 12620:2009 - standard and stored in the Web repository called ISOCat at http://www.isocat.org/. - dcr:datacat属性とdcr:ValueDatacat属性を提供する．これらがXML要素や属性を連携させる日付分類は、国際標準ISO 12620:2009で定義されるものであり，http://www.isocat.org/にあるISOCatと呼ばれるWebリポジトリに格納されている． + standard and stored in the Web repository called ISOCat at . + dcr:datacat属性とdcr:ValueDatacat属性を提供する．これらがXML要素や属性を連携させる日付分類は、国際標準ISO 12620:2009で定義されるものであり，にあるISOCatと呼ばれるWebリポジトリに格納されている． contains a PID (persistent identifier) that aligns the given element with the appropriate @@ -1471,11 +1470,11 @@ of any adjacent whitespace their schemas that make use of data categories from a DCR should refer to them using this PID. For XML-based resources, like TEI documents, ISO 12620:2009 normative Annex A gives a small Data Category Reference XML vocabulary (also available online - at http://www.isocat.org/12620/), + at ), which provides two attributes, dcr:datcat and dcr:valueDatcat.

-

ISO 12620:2009は、データ分類のレジストリ（DCR）に関するデータモデルと手続きについての国際標準である．データ分類は，一つの言語の構造における基本的な記述子として定義される。DCRのデータモデルでは、個々のデータ分類には、ユニークな永続的識別子（PID)、つまり、URIが割り当てられる．DCRからデータ分類を利用する言語資源，あるいは、できることならそのスキーマは、このPIDを用いて参照すべきである。TEI文書のようなXMLベースの資源(https://www.iso.org/standard/37243.htmlにて参照可能)に関しては、ISO 12620:2009 付録 Aに、dcr:datcat属性とdcr:valueDatcat属性を提供する小さなデータ分類参照のXML語彙がある。

 +

ISO 12620:2009は、データ分類のレジストリ（DCR）に関するデータモデルと手続きについての国際標準である．データ分類は，一つの言語の構造における基本的な記述子として定義される。DCRのデータモデルでは、個々のデータ分類には、ユニークな永続的識別子（PID)、つまり、URIが割り当てられる．DCRからデータ分類を利用する言語資源，あるいは、できることならそのスキーマは、このPIDを用いて参照すべきである。TEI文書のようなXMLベースの資源(にて参照可能)に関しては、ISO 12620:2009 付録 Aに、dcr:datcat属性とdcr:valueDatcat属性を提供する小さなデータ分類参照のXML語彙がある。

 @@ -1612,7 +1611,7 @@ with individual parts of a TEI text are fully defined in chapter - provides an attribute for representing + provides attributes for representing fragmentation of a structural element, typically as a consequence of some overlapping hierarchy. 通常は階層関係のオーバーラップなどに起因する、構造を持つ要素の断片化を表現するための属性を与える。 @@ -2349,7 +2348,7 @@ the TEI header.

 - provides an attribute used by elements to point to an + provides attributes used by elements to point to an external source. 外部ソースを参照する要素によって用いられる属性を示す。 @@ -3487,7 +3486,7 @@ baby? - provides an attribute to indicate the type of section which is changing at a specific milestone. + provides attributes to indicate the type of section which is changing at a specific milestone. provides a conventional name for the kind of section changing at this milestone. @@ -3741,7 +3740,7 @@ this name in the form of a set of whitespace-separated values, for example the o - provides an attribute to indicate any specialised notation used for element content. + provides attributes to indicate any specialised notation used for element content. @@ -3884,7 +3883,7 @@ this name in the form of a set of whitespace-separated values, for example the o - provides attributes which can be used to classify or subclassify elements in any way. + provides attributes that can be used to classify or subclassify elements in any way. 요소의 분류 또는 하위분류에서 사용될 수 있는 속성을 제공한다. 提供可依任何方法將元素分類或次要分類的一般屬性。 要素を分類するための属性を示す． @@ -11997,8 +11996,8 @@ the target element - - provides attributes for selecting particular elements + + provides attributes for selecting particular elements within a document. @@ -13111,6 +13110,7 @@ codes used elsewhere in the text. + @@ -13205,6 +13205,22 @@ codes used elsewhere in the text. + + + provides attributes for referencing locations by pointing to entries in a canonical list of places. + + + indicates one or more locations by pointing to a place element or other canonical description. + indique une ou plusieurs localisations en pointant vers un élément place ou autre description canonique. + indica una o más localizaciónes señalando un elemento place u otra descripción canónica. + indica una o più posizioni facendo riferimento a un elemento place o altra descrizione canonica. + + + + + + +
The Schema Specification
The Application Information Element @@ -15153,8 +15169,8 @@ supplied to printer. - - Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab. + + Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText. @@ -16611,7 +16627,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches... - +

The word 入学試験 nyūgakushiken (university entrance exam) is glossed with a hiragana phonation guide.

@@ -16663,7 +16679,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches... - +

The word 你 好 nǐ hǎo (hello) is glossed in pinyin to provide a pronunciation guide.

@@ -16766,7 +16782,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches... - +

The word 大統領 daitōryō (president) is glossed character by character in hiragana to provide a pronunciation guide.

@@ -17551,6 +17567,92 @@ Normalization + + deliberately marked omission + indicates a purposeful + marking in the source document signalling that content has been + omitted, and may also supply or describe the omitted content. + + + + + + + + + + + + + + + + + What projects men make—what queer turns they take, + Since steam has improved our condition; + They never are still, but must cure or must kill + With steam physic or steam ammunition. + But a short time ago, to a quack you would go, + To steam a fat man to a thinner; + Now changed from all that, if you wish to get fat, + Come to Barton’s and eat a steam dinner! + Oh dear! think of a scheme, odd though it seem— + I’m sure ’twill succeed if you make it by steam. + + + You may sleep, you may dream, you may travel by steam, + For the outcry is still to go faster; + And what does it reck, should you e’en break your neck, + If ’tis steam that brings on the disaster? + + * * * * + The printer omits four lines here, + skipping the second half of the second octave, before the refrain. + + Oh dear! think of a scheme, odd though it seem— + I’m sure ’twill succeed if you make it by steam. + + + + + + + You think you’ve lost your love + Well, I saw her yesterday + It’s you she's thinking of + And she told me what to say + + + + She says she loves you + And you know that can’t be bad + Yes, she loves you + And you know you should be glad + + + She said you hurt her so + She almost lost her mind + But now she said she knows + You’re not the hurting kind + + + ****** + + + + + +

Unlike gap, which indicates content that the encoder + cannot or chooses not to represent, ellipsis indicates a + passage explicitly signalled in the source document as absent. The + ellipsis element is not appropriate for every use of + ellipsis points, such as when they indicate that a speaker is + pausing.

+ + + + + addition 삽입, 첨가 @@ -25622,15 +25724,15 @@ by the stage direction.

- - Abstract model violation: Lines may not contain higher-level structural elements such as div. + + Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText. - - Abstract model violation: p and ab may not contain higher-level structural elements such as div. + + Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText. @@ -31622,7 +31724,7 @@ and simplified for simplified characters. The 韻文モジュール - defines a set of attributes which certain elements may use to + defines a set of attributes that certain elements may use to represent metrical information. 운율 정보를 표시하기 위하여 특정 요소들이 사용할 수 있는 속성 집합을 정의한다. 定義一組特定元素所使用、表示詩行韻律的屬性。 @@ -31769,7 +31871,7 @@ user-defined alternative notations.

詩句跨行 encabalgamiento enjambement - provides an attribute which may be used to indicate + provides attributes that may be used to indicate enjambement of the parent element. 句またがり enjamb 속성을 포함하는 요소를 모아놓는다. @@ -35437,7 +35539,7 @@ very loudly.

 - provides an attribute used to distinguish + provides attributes used to distinguish different styles of dictionary entries. 사전 표제 항목의 다른 형식을 모아 놓는다. 匯集不同格式的字典辭條 @@ -37017,7 +37119,7 @@ list of values. Typical values might be IPA,

A much fuller list of values for the type attribute may be generated from the data category registry - accessible from http://www.isocat.org and + accessible from and maintained by ISO technical committee 37.

@@ -42437,7 +42539,7 @@ element in the TEI header. - provides an attribute to indicate text type or classification. + provides attributes to indicate text type or classification. identifies the text types or classifications applicable to this @@ -45314,7 +45416,7 @@ the encoder wishes to distinguish these two modes of transcription.

 - supplies the change attribute, allowing its member + provides attributes allowing its member elements to specify one or more states or revision campaigns with which they are associated. そのメンバ要素が関連する1つ以上の状態または改定を指定できるように、change属性を提供する。 @@ -45492,7 +45594,7 @@ are also understood with reference to this same coordinate system.-->

- provides attributes which can be used to position their parent + provides attributes that can be used to position their parent element within a two dimensional coordinate system. 이차원 좌표 체계 내에서 위치될 수 있는 요소 los elementos se pueden colocar dentro de un sistema de coordenadas bidimensional. @@ -47386,144 +47488,7 @@ lemma and usually one or more readings or notes on the relevant passage. - - - + @@ -47534,7 +47499,6 @@ lemma and usually one or more readings or notes on the relevant passage. - @@ -47855,13 +47819,12 @@ reading groups, each associated with witness specifications.

 - -

The term lemma is used in text criticism to -describe the reading in the text itself (as opposed to those in the -apparatus); this usage is distinct from that of mathematics (where a -lemma is a major step in a proof) and natural-language processing -(where a lemma is the dictionary form associated with an inflected -form in the running text).

+ +

The term lemma is used in text criticism to describe the reading given in the + main text, which may be used as a heading in the apparatus itself. This usage connects it to + mathematics (where a lemma is a proven proposition used as a step in a proof, a "given") and + natural-language processing (where a lemma is the dictionary headword associated with an + inflected form in the running text).

Le terme lemma est utilisé dans la critique textuelle pour décrire la @@ -48761,7 +48724,7 @@ and rdg, and also within any of their constituent elements.

- supplies the attribute used to identify the witnesses + provides attributes used to identify the witnesses supporting a particular reading in a critical apparatus. @@ -50551,6 +50514,7 @@ different witnesses. + @@ -50571,18 +50535,6 @@ different witnesses. - - - indicates the location of an event by pointing to a place element - place 요소를 지시함으로써 사건의 위치를 나타낸다. - indica la localización de un acontecimiento señalando un elemento lugar - - indique la localisation d'un évènement en pointant vers un élément place - - indica la posizione di un evento facendo riferimento a un elemento place - - - @@ -56607,8 +56559,8 @@ Information with a Text - - Abstract model violation: Lines may not contain higher-level divisions such as p or ab. + + Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText. @@ -58855,7 +58807,7 @@ etc. as appropriate.

- provides the norm and orig attributes for usage within word-level elements in the analysis module and within lexicographic microstructure in the dictionaries module. + provides attributes for usage within word-level elements in the analysis module and within lexicographic microstructure in the dictionaries module. @@ -59610,7 +59562,7 @@ The attributes @to and @from on may each contain only a single valueinterp with any textual element through its ana attribute.

Alternatively (or, in addition) an interp may carry an - inst attribute which points to one or more textual + inst attribute that points to one or more textual elements to which the analysis represented by the content of the interp applies.

 @@ -66293,7 +66245,7 @@ contains specifications for the elements
Specification Elements - + element specification 요소 명시 @@ -66338,6 +66290,16 @@ contains specifications for the elements + + + + This elementSpec element has a mode= of "delete" even though it has child elements. Change the mode= to "add", "change", or "replace", or remove the child elements. + + + This elementSpec element has a mode= of "", but does not have any child elements or schema-changing attributes. Specify child elements, use validUntil=, predeclare=, ns=, or prefix=, or change the mode= to "delete". + + + specifies a default prefix which will be @@ -66652,11 +66614,10 @@ the associated TEI header.

- - - - - + + + + @@ -66707,7 +66668,7 @@ the associated TEI header.

- + @@ -67705,7 +67666,7 @@ have a canonical name, supplied as the value for their - whether to obey any rendition attribute which is + whether to obey any rendition attribute that is present. @@ -67877,7 +67838,7 @@ have a canonical name, supplied as the value for their - whether to obey any rendition attribute which is + whether to obey any rendition attribute that is present @@ -68494,7 +68455,7 @@ have a canonical name, supplied as the value for their - supplies attributes for the elements which define + provides attributes for the elements which define component parts of a content model. @@ -70048,7 +70009,7 @@ an attribute may take, additional to the information carried by the - provides the identifying attribute for elements which can be + provides identifying attributes for elements which can be subsequently referenced by means of a key attribute. key 속성에 @@ -70173,7 +70134,7 @@ should correspond to an existing module, via a moduleSpec or - provides an attribute indicating the target namespace for an + provides attributes indicating the target namespace for an object being created @@ -70267,12 +70228,14 @@ should correspond to an existing module, via a moduleSpec or + + @@ -70383,6 +70346,7 @@ should correspond to an existing module, via a moduleSpec or + @@ -70432,6 +70396,7 @@ should correspond to an existing module, via a moduleSpec or + @@ -70451,6 +70416,7 @@ should correspond to an existing module, via a moduleSpec or + @@ -70464,7 +70430,9 @@ should correspond to an existing module, via a moduleSpec or + + @@ -70760,6 +70728,8 @@ should correspond to an existing module, via a moduleSpec or + + From dbff44a66b0882381b3517202fa7b60f1ab1b602 Mon Sep 17 00:00:00 2001 From: helenasabel Date: Fri, 27 Aug 2021 22:03:36 +0200 Subject: [PATCH 2/3] update of expected results --- Test/expected-results/test.isosch | 16 +- Test/expected-results/test.odd.html | 36 ++-- Test/expected-results/test.rng | 69 +++++-- Test/expected-results/test15.odd.html | 84 +++++---- Test/expected-results/test15.odd.rnc | 63 +++++-- Test/expected-results/test21.odd.rnc | 74 +++++--- Test/expected-results/test30.dtd | 36 +++- Test/expected-results/test30.rnc | 73 ++++--- Test/expected-results/test33.rnc | 65 +++++-- Test/expected-results/test34.combined.json | 118 +++++++++--- Test/expected-results/test34.odd.html | 53 +++--- Test/expected-results/test34.rnc | 65 +++++-- Test/expected-results/test35.rnc | 65 +++++-- Test/expected-results/testdrama.compiled.xml | 188 ++++++++++++++----- 14 files changed, 695 insertions(+), 310 deletions(-) diff --git a/Test/expected-results/test.isosch b/Test/expected-results/test.isosch index 9d82ae340..8661aabac 100644 --- a/Test/expected-results/test.isosch +++ b/Test/expected-results/test.isosch @@ -75,8 +75,8 @@ The element indicated by @spanTo () must follow the - - Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab. + + Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText. @@ -213,15 +213,15 @@ The @spanTo attribute of is required. - - Abstract model violation: Lines may not contain higher-level structural elements such as div. + + Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText. - - Abstract model violation: p and ab may not contain higher-level structural elements such as div. + + Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText. @@ -240,8 +240,8 @@ The @spanTo attribute of is required. - - Abstract model violation: Lines may not contain higher-level divisions such as p or ab. + + Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText. diff --git a/Test/expected-results/test.odd.html b/Test/expected-results/test.odd.html index 5a9764dbd..a20b0e94a 100644 --- a/Test/expected-results/test.odd.html +++ b/Test/expected-results/test.odd.html @@ -39,9 +39,9 @@

Table of contents

  • eTree (embedding tree) provides an alternative to the <tree> element for representing ordered rooted tree structures.
  • eTree (embedding tree) provides an alternative to the <tree> element for representing ordered rooted tree structures.
  • eTree (embedding tree) provides an alternative to the <tree> element for representing ordered rooted tree structures.
    valueprovides the value of an embedding tree, which is a feature structure or other analytic element.
    • -
  • eTree (embedding tree) provides an alternative to the <tree> element for representing ordered rooted tree structures.
    [+ att.global (@xml:id, @n, @xml:lang, @xml:base, @xml:space) (att.global.rendition (@rend, @style, @rendition)) (att.global.linking (@corresp, @synch, @sameAs, @copyOf, @next, @prev, @exclude, @select)) (att.global.facs (@facs)) (att.global.change (@change)) (att.global.responsibility (@cert, @resp)) (att.global.source (@source)) att.typed (@type, @subtype) ]
    • +
  • eTree (embedding tree) provides an alternative to the <tree> element for representing ordered rooted tree structures.
    [+ att.global (@xml:id, @n, @xml:lang, @xml:base, @xml:space) (att.global.rendition (@rend, @style, @rendition)) (att.global.linking (@corresp, @synch, @sameAs, @copyOf, @next, @prev, @exclude, @select)) (att.global.facs (@facs)) (att.global.change (@change)) (att.global.responsibility (@cert, @resp)) (att.global.source (@source)) att.typed (@type, @subtype) ]
  • eTree (embedding tree) provides an alternative to the <tree> element for representing ordered rooted tree structures.
    valueprovides the value of an embedding tree, which is a feature structure or other analytic element.
    • -
  • eTree (embedding tree) provides an alternative to the <tree> element for representing ordered rooted tree structures.
    valueprovides the value of an embedding tree, which is a feature structure or other analytic element.
    [+ att.global (@xml:id, @n, @xml:lang, @xml:base, @xml:space) (att.global.rendition (@rend, @style, @rendition)) (att.global.linking (@corresp, @synch, @sameAs, @copyOf, @next, @prev, @exclude, @select)) (att.global.facs (@facs)) (att.global.change (@change)) (att.global.responsibility (@cert, @resp)) (att.global.source (@source)) att.typed (@type, @subtype) ]
    • +
  • eTree (embedding tree) provides an alternative to the <tree> element for representing ordered rooted tree structures.
    valueprovides the value of an embedding tree, which is a feature structure or other analytic element.
    [+ att.global (@xml:id, @n, @xml:lang, @xml:base, @xml:space) (att.global.rendition (@rend, @style, @rendition)) (att.global.linking (@corresp, @synch, @sameAs, @copyOf, @next, @prev, @exclude, @select)) (att.global.facs (@facs)) (att.global.change (@change)) (att.global.responsibility (@cert, @resp)) (att.global.source (@source)) att.typed (@type, @subtype) ]
  • eTree (embedding tree) provides an alternative to the <tree> element for representing ordered rooted tree structures.
    valueprovides the value of an embedding tree, which is a feature structure or other analytic element.
    rend [att.global.rendition](rendition) indicates how the element in question was rendered or presented in the source text.
    xml:base [att.global]provides a base URI reference with which applications can resolve relative URI references into absolute URI references.
    prev [att.global.linking](previous) points to the previous element of a virtual aggregate of which the current element is part.
    next [att.global.linking]points to the next element of a virtual aggregate of which the current element is part.
  • UNKNOWN ELEMENT valList
  • UNKNOWN ELEMENT valList
    • @@ -135,13 +135,13 @@

    att.ascribed.directed: provides attributes for elements representing speech or action that can be directed at a group or individual. [3.3.3. Quotation 8.3. Elements Unique to Spoken Texts] - att.breaking: provides an attribute to indicate whether or not the element concerned is considered to mark the end of an orthographic token in the same way as whitespace. [3.11.3. Milestone Elements] + att.breaking: provides attributes to indicate whether or not the element concerned is considered to mark the end of an orthographic token in the same way as whitespace. [3.11.3. Milestone Elements] - att.cReferencing: provides an attribute which may be used to supply a canonical reference as a means of identifying the target of a pointer. + att.cReferencing: provides attributes that may be used to supply a canonical reference as a means of identifying the target of a pointer. - att.canonical: provides attributes which can be used to associate a representation such as a name or title with canonical information about the object being named or referenced. [13.1.1. Linking Names and Their Referents] + att.canonical: provides attributes that can be used to associate a representation such as a name or title with canonical information about the object being named or referenced. [13.1.1. Linking Names and Their Referents] att.citeStructurePart: provides attributes for selecting particular elements within a document. @@ -150,7 +150,7 @@

    att.citing: provides attributes for specifying the specific part of a bibliographic item being cited. [1.3.1. Attribute Classes] - att.coordinated: provides attributes which can be used to position their parent element within a two dimensional coordinate system. + att.coordinated: provides attributes that can be used to position their parent element within a two dimensional coordinate system. att.damaged: provides attributes describing the nature of any physical damage affecting a reading. [11.3.3.1. Damage, Illegibility, and Supplied Text 1.3.1. Attribute Classes] @@ -162,7 +162,7 @@

    att.datable.w3c: provides attributes for normalization of elements that contain datable events conforming to the W3C XML Schema Part 2: Datatypes Second Edition. [3.6.4. Dates and Times 13.4. Dates] - att.datcat: provides the dcr:datacat and dcr:ValueDatacat attributes which are used to align XML elements or attributes with the appropriate Data Categories (DCs) defined by the ISO 12620:2009 standard and stored in the Web repository called ISOCat at http://www.isocat.org/. [9.5.2. Lexical View 18.3. Other Atomic Feature Values] + att.datcat: provides attributes that are used to align XML elements or attributes with the appropriate Data Categories (DCs) defined by the ISO 12620:2009 standard and stored in the Web repository called ISOCat at http://www.isocat.org/. [9.5.2. Lexical View 18.3. Other Atomic Feature Values] att.declarable: provides attributes for those elements in the TEI header which may be independently selected by means of the special purpose decls attribute. [15.3. Associating Contextual Information with a Text] @@ -186,19 +186,19 @@

    att.edition: provides attributes identifying the source edition from which some encoded feature derives. - 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.entryLike: provides attributes 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. + att.fragmentable: provides attributes for representing fragmentation of a structural element, typically as a consequence of some overlapping hierarchy. att.global: provides attributes common to all elements in the TEI encoding scheme. [1.3.1.1. Global Attributes] - att.global.change: supplies the change attribute, allowing its member elements to specify one or more states or revision campaigns with which they are associated. + att.global.change: provides attributes allowing its member elements to specify one or more states or revision campaigns with which they are associated. att.global.facs: provides attributes used to express correspondence between an element and all or part of a facsimile image or surface. [11.1. Digital Facsimiles] @@ -213,7 +213,7 @@

    att.global.responsibility: provides attributes indicating the agent responsible for some aspect of the text, the markup or something asserted by the markup, and the degree of certainty associated with it. [1.3.1.1.4. Sources, certainty, and responsibility 3.5. Simple Editorial Changes 11.3.2.2. Hand, Responsibility, and Certainty Attributes 17.3. Spans and Interpretations 13.1.1. Linking Names and Their Referents] - att.global.source: provides an attribute used by elements to point to an external source. [1.3.1.1.4. Sources, certainty, and responsibility 3.3.3. Quotation 8.3.4. Writing] + att.global.source: provides attributes used by elements to point to an external source. [1.3.1.1.4. Sources, certainty, and responsibility 3.3.3. Quotation 8.3.4. Writing] att.handFeatures: provides attributes describing aspects of the hand in which a manuscript is written. [11.3.2.1. Document Hands] @@ -224,6 +224,9 @@

    att.lexicographic: provides a set of attributes for specifying standard and normalized values, grammatical functions, alternate or equivalent forms, and information about composite parts. [9.2. The Structure of Dictionary Entries] + + att.locatable: provides attributes for referencing locations by pointing to entries in a canonical list of places. [2.3.9. The Unit Declaration 13.3.4.3. States, Traits, and Events] + att.measurement: provides attributes to represent a regularized or normalized measurement. @@ -231,13 +234,13 @@

    att.media: provides attributes for specifying display and related properties of external media. - att.milestoneUnit: provides an attribute to indicate the type of section which is changing at a specific milestone. [3.11.3. Milestone Elements 2.3.6.3. Milestone Method 2.3.6. The Reference System Declaration] + att.milestoneUnit: provides attributes to indicate the type of section which is changing at a specific milestone. [3.11.3. Milestone Elements 2.3.6.3. Milestone Method 2.3.6. The Reference System Declaration] att.naming: provides attributes common to elements which refer to named persons, places, organizations etc. [3.6.1. Referring Strings 13.3.6. Names and Nyms] - att.notated: provides an attribute to indicate any specialised notation used for element content. + att.notated: provides attributes to indicate any specialised notation used for element content. att.partials: provides attributes for describing the extent of lexical references for a dictionary term. @@ -285,10 +288,10 @@

    att.transcriptional: provides attributes specific to elements encoding authorial or scribal intervention in a text when transcribing manuscript or similar sources. [11.3.1.4. Additions and Deletions] - att.typed: provides attributes which can be used to classify or subclassify elements in any way. [1.3.1. Attribute Classes 17.1.1. Words and Above 3.6.1. Referring Strings 3.7. Simple Links and Cross-References 3.6.5. Abbreviations and Their Expansions 3.13.1. Core Tags for Verse 7.2.5. Speech Contents 4.1.1. Un-numbered Divisions 4.1.2. Numbered Divisions 4.2.1. Headings and Trailers 4.4. Virtual Divisions 13.3.2.3. Personal Relationships 11.3.1.1. Core Elements for Transcriptional Work 16.1.1. Pointers and Links 16.3. Blocks, Segments, and Anchors 12.2. Linking the Apparatus to the Text 22.5.1.2. Defining Content Models: RELAX NG 8.3. Elements Unique to Spoken Texts 23.3.1.3. Modification of Attribute and Attribute Value Lists] + att.typed: provides attributes that can be used to classify or subclassify elements in any way. [1.3.1. Attribute Classes 17.1.1. Words and Above 3.6.1. Referring Strings 3.7. Simple Links and Cross-References 3.6.5. Abbreviations and Their Expansions 3.13.1. Core Tags for Verse 7.2.5. Speech Contents 4.1.1. Un-numbered Divisions 4.1.2. Numbered Divisions 4.2.1. Headings and Trailers 4.4. Virtual Divisions 13.3.2.3. Personal Relationships 11.3.1.1. Core Elements for Transcriptional Work 16.1.1. Pointers and Links 16.3. Blocks, Segments, and Anchors 12.2. Linking the Apparatus to the Text 22.5.1.2. Defining Content Models: RELAX NG 8.3. Elements Unique to Spoken Texts 23.3.1.3. Modification of Attribute and Attribute Value Lists] - att.written: provides an attribute to indicate the hand in which the content of an element was written in the source being transcribed. [1.3.1. Attribute Classes] + att.written: provides attributes to indicate the hand in which the content of an element was written in the source being transcribed. [1.3.1. Attribute Classes] author: (author) in a bibliographic reference, contains the name(s) of an author, personal or corporate, of a work; for example in the same form as that provided by a recognized bibliographic name authority. [3.12.2.2. Titles, Authors, and Editors 2.2.1. The Title Statement] @@ -494,6 +497,9 @@

    editorialDecl: (editorial practice declaration) provides details of editorial principles and practices applied during the encoding of a text. [2.3.3. The Editorial Practices Declaration 2.3. The Encoding Description 15.3.2. Declarable Elements] + + ellipsis: (deliberately marked omission) indicates a purposeful marking in the source document signalling that content has been omitted, and may also supply or describe the omitted content. [3.5.3. Additions, Deletions, and Omissions] + email: (electronic mail address) contains an email address identifying a location to which email messages can be delivered. [3.6.2. Addresses] diff --git a/Test/expected-results/test.rng b/Test/expected-results/test.rng index 927be39c2..24af83f21 100644 --- a/Test/expected-results/test.rng +++ b/Test/expected-results/test.rng @@ -2598,6 +2598,7 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line; + @@ -3250,15 +3251,6 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line; - - - - - - (use) supplies an XPath selection pattern using the syntax defined in . The XPath pattern is relative to the context given in @match, which will either be a sibling attribute in the case of `<citeStructure>` or on the parent `<citeStructure>` in the case of `<citeData>`. - - - @@ -3270,6 +3262,21 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line; + + + + + + + indicates one or more locations by pointing to a <place> element or other canonical description. + + + + + + + + @@ -3416,8 +3423,8 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant - - Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab. + + Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText. @@ -3842,6 +3849,24 @@ Sample values include: 1] rubbing (rubbing); 2] mildew (mildew); 3] smoke (smoke + + + (deliberately marked omission) indicates a purposeful marking in the source document signalling that content has been omitted, and may also supply or describe the omitted content. [3.5.3. Additions, Deletions, and Omissions] + + + + + + + + + + + + + + + (addition) contains letters, words, or phrases inserted in the source text by an author, scribe, or a previous annotator or corrector. [3.5.3. Additions, Deletions, and Omissions] @@ -5190,6 +5215,15 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist + + + + + + (use) supplies an XPath selection pattern using the syntax defined in . The XPath pattern is relative to the context given in @match, which will either be a sibling attribute in the case of `<citeStructure>` or on the parent `<citeStructure>` in the case of `<citeData>`. + + + @@ -6209,6 +6243,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr + indicates a source unit of measure that is to be converted into another unit indicated in @toUnit. @@ -8107,15 +8142,15 @@ Suggested values include: 1] initial; 2] final - - Abstract model violation: Lines may not contain higher-level structural elements such as div. + + Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText. - - Abstract model violation: p and ab may not contain higher-level structural elements such as div. + + Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText. @@ -9120,8 +9155,8 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat - - Abstract model violation: Lines may not contain higher-level divisions such as p or ab. + + Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText. diff --git a/Test/expected-results/test15.odd.html b/Test/expected-results/test15.odd.html index 97bbdc0a3..6b7607a93 100644 --- a/Test/expected-results/test15.odd.html +++ b/Test/expected-results/test15.odd.html @@ -234,7 +234,7 @@

    Atributos - Atributos att.global (@xml:id, @n, @xml:lang, @xml:base, @xml:space) (att.global.rendition (@rend, @style, @rendition)) (att.global.linking (@corresp, @synch, @sameAs, @copyOf, @next, @prev, @exclude, @select)) (att.global.responsibility (@cert, @resp)) (att.global.source (@source)) att.divLike (@org, @sample) (att.fragmentable (@part)) att.declaring (@decls) att.written (@hand) att.typed (type, @subtype)
    typcaracteriza el elemento utilizando una clasificación o tipología funcional.
    Derivado deatt.typed
    EstadoOpcional
    Tipo de datosteidata.enumerated
    + Atributos att.global (@xml:id, @n, @xml:lang, @xml:base, @xml:space) (att.global.rendition (@rend, @style, @rendition)) (att.global.linking (@corresp, @synch, @sameAs, @copyOf, @next, @prev, @exclude, @select)) (att.global.responsibility (@cert, @resp)) (att.global.source (@source)) att.divLike (@org, @sample) (att.fragmentable (@part)) att.declaring (@decls) att.written (@hand) att.typed (type, @subtype)
    typcaracteriza el elemento utilizando una clasificación o tipología funcional.
    Derivado deatt.typed
    EstadoOpcional
    Tipo de datosteidata.enumerated
    @@ -281,6 +281,7 @@

    cit desc divGen + ellipsis gap gb head @@ -359,7 +360,7 @@

    Ejemplo -
    <body> +
    <body>  <div typ="part">   <head>Fallacies of Authority</head>   <para>The subject of which is Authority in various shapes, and the object, to repress all @@ -388,7 +389,7 @@

    -<s:report test="ancestor::tei:l"> Abstract model violation: Lines may not contain higher-level structural elements such as div. +<s:report test="(ancestor::tei:l or ancestor::tei:lg) and not(ancestor::tei:floatingText)"> Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText. </s:report>
    @@ -398,7 +399,7 @@

    -<s:report test="ancestor::tei:p or ancestor::tei:ab and not(ancestor::tei:floatingText)"> Abstract model violation: p and ab may not contain higher-level structural elements such as div. +<s:report test="(ancestor::tei:p or ancestor::tei:ab) and not(ancestor::tei:floatingText)"> Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText. </s:report>
    @@ -407,7 +408,7 @@

    Content model - 
    +                  
     <content>
  <sequence minOccurs="1" maxOccurs="1">
   <alternate minOccurs="0"
@@ -454,7 +455,7 @@ 
    
   </sequence>
  </sequence>
 </content>
-    ⚓
    
+    ⚓
    @@ -462,14 +463,14 @@

    Declaración - 
    +                  
     element div
 {
    att.global.attributes,
    att.divLike.attributes,
    att.typed.attribute.subtype,
    att.declaring.attributes,
-   att.written.attributes,
+   att.written.attributes,
    attribute typ { text }?,
    (
       ( model.divTop | model.global )*,
@@ -484,7 +485,7 @@ 
    
          ( model.divBottom, model.global* )*
       )?
    )
-}⚓
    
+}⚓
    @@ -510,7 +511,7 @@

    Atributos - Atributos att.global (@xml:id, @n, @xml:lang, @xml:base, @xml:space) (att.global.rendition (@rend, @style, @rendition)) (att.global.linking (@corresp, @synch, @sameAs, @copyOf, @next, @prev, @exclude, @select)) (att.global.responsibility (@cert, @resp)) (att.global.source (@source)) att.declaring (@decls) att.fragmentable (@part) att.written (@hand) + Atributos att.global (@xml:id, @n, @xml:lang, @xml:base, @xml:space) (att.global.rendition (@rend, @style, @rendition)) (att.global.linking (@corresp, @synch, @sameAs, @copyOf, @next, @prev, @exclude, @select)) (att.global.responsibility (@cert, @resp)) (att.global.source (@source)) att.declaring (@decls) att.fragmentable (@part) att.written (@hand) @@ -631,6 +632,7 @@

    del desc distinct + ellipsis email emph expan @@ -721,7 +723,7 @@

    Ejemplo -
    <para>Hallgerd was outside. <q>There is blood on your axe,</q> she said. <q>What have you +
    <para>Hallgerd was outside. <q>There is blood on your axe,</q> she said. <q>What have you    done?</q> </para> <para> @@ -754,7 +756,8 @@

    -<s:report test="ancestor::tei:l[not(.//tei:note//tei:p[. = current()])]"> Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab. +<s:report test="(ancestor::tei:l or ancestor::tei:lg) and not(parent::tei:figure or + parent::tei:note or ancestor::tei:floatingText)"> Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText. </s:report>
    @@ -763,11 +766,11 @@

    Content model - 
    +                  
     <content>
  <macroRef key="macro.paraContent"/>
 </content>
-    ⚓
    
+    ⚓
    @@ -775,15 +778,15 @@

    Declaración - 
    +                  
     element para
 {
    att.global.attributes,
    att.declaring.attributes,
-   att.fragmentable.attributes,
-   att.written.attributes,
+   att.fragmentable.attributes,
+   att.written.attributes,
    macro.paraContent
-}⚓
    
+}⚓
    @@ -809,7 +812,7 @@

    Atributos - Atributos att.global (@xml:id, @n, @xml:lang, @xml:base, @xml:space) (att.global.rendition (@rend, @style, @rendition)) (att.global.linking (@corresp, @synch, @sameAs, @copyOf, @next, @prev, @exclude, @select)) (att.global.responsibility (@cert, @resp)) (att.global.source (@source)) att.ascribed.directed (@toWhom) (att.ascribed (@who))
    typ(type) Puede usarse para indicar si el material citado es hablado o pensado, o para caracterizarlo con más precisión.
    EstadoOpcional
    Tipo de datosteidata.enumerated
    Los valores sugeridos incluyen:
    spoken
    (spoken) representación del estilo directo, normalmente marcado mediante comillas.
    thought
    (thought) representación de un pensamiento o reflexión, p.ej. un monólogo interno.
    written
    (written) cita de una fuente escrita.
    soCalled
    (so called) distancia autorial
    foreign
    (foreign) palabras extranjeras
    distinct
    (distinct) lingüisticamente distinto
    term
    término técnico
    emph
    (emph) énfasis retórico
    mentioned
    (mentioned) se refiere a sí mismo, no a su referente habitual
    + Atributos att.global (@xml:id, @n, @xml:lang, @xml:base, @xml:space) (att.global.rendition (@rend, @style, @rendition)) (att.global.linking (@corresp, @synch, @sameAs, @copyOf, @next, @prev, @exclude, @select)) (att.global.responsibility (@cert, @resp)) (att.global.source (@source)) att.ascribed.directed (@toWhom) (att.ascribed (@who))
    typ(type) Puede usarse para indicar si el material citado es hablado o pensado, o para caracterizarlo con más precisión.
    EstadoOpcional
    Tipo de datosteidata.enumerated
    Los valores sugeridos incluyen:
    spoken
    (spoken) representación del estilo directo, normalmente marcado mediante comillas.
    thought
    (thought) representación de un pensamiento o reflexión, p.ej. un monólogo interno.
    written
    (written) cita de una fuente escrita.
    soCalled
    (so called) distancia autorial
    foreign
    (foreign) palabras extranjeras
    distinct
    (distinct) lingüisticamente distinto
    term
    término técnico
    emph
    (emph) énfasis retórico
    mentioned
    (mentioned) se refiere a sí mismo, no a su referente habitual
    @@ -987,6 +990,7 @@

    del desc distinct + ellipsis email emph expan @@ -1088,7 +1092,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>
    @@ -1098,11 +1102,11 @@

    Content model - 
    +                  
     <content>
  <macroRef key="macro.specialPara"/>
 </content>
-    ⚓
    
+    ⚓
    @@ -1110,7 +1114,7 @@

    Declaración - 
    +                  
     element q
 {
    att.global.attributes,
@@ -1128,7 +1132,7 @@ 
    
     | "mentioned"
    }?,
    macro.specialPara
-}⚓
    
+}⚓
    @@ -1204,11 +1208,11 @@

    Content model - 
    +                  
     <content>
  <dataRef key="teidata.word"/>
 </content>
-    ⚓
    
+    ⚓
    @@ -1216,8 +1220,8 @@

    Declaración - 
    -teidata.enumerated = teidata.word⚓
    + 
    +teidata.enumerated = teidata.word⚓
    @@ -1288,13 +1292,13 @@

    att.ascribed.directed: provides attributes for elements representing speech or action that can be directed at a group or individual. [3.3.3. Quotation 8.3. Elements Unique to Spoken Texts] - att.breaking: provides an attribute to indicate whether or not the element concerned is considered to mark the end of an orthographic token in the same way as whitespace. [3.11.3. Milestone Elements] + att.breaking: provides attributes to indicate whether or not the element concerned is considered to mark the end of an orthographic token in the same way as whitespace. [3.11.3. Milestone Elements] - att.cReferencing: provides an attribute which may be used to supply a canonical reference as a means of identifying the target of a pointer. + att.cReferencing: provides attributes that may be used to supply a canonical reference as a means of identifying the target of a pointer. - att.canonical: provides attributes which can be used to associate a representation such as a name or title with canonical information about the object being named or referenced. [13.1.1. Linking Names and Their Referents] + att.canonical: provides attributes that can be used to associate a representation such as a name or title with canonical information about the object being named or referenced. [13.1.1. Linking Names and Their Referents] att.citeStructurePart: provides attributes for selecting particular elements within a document. @@ -1309,7 +1313,7 @@

    att.datable.w3c: proporciona atributos para la normalización de elementos que contienen eventos datables. [3.6.4. Dates and Times 13.4. Dates] - att.datcat: provides the dcr:datacat and dcr:ValueDatacat attributes which are used to align XML elements or attributes with the appropriate Data Categories (DCs) defined by the ISO 12620:2009 standard and stored in the Web repository called ISOCat at http://www.isocat.org/. [9.5.2. Lexical View 18.3. Other Atomic Feature Values] + att.datcat: provides attributes that are used to align XML elements or attributes with the appropriate Data Categories (DCs) defined by the ISO 12620:2009 standard and stored in the Web repository called ISOCat at http://www.isocat.org/. [9.5.2. Lexical View 18.3. Other Atomic Feature Values] att.declarable: proporciona atributos para los elementos contenidos en el encabezado que pueden ser seleccionados autónomamente mediante el atributo decls adecuado. [15.3. Associating Contextual Information with a Text] @@ -1336,7 +1340,7 @@

    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. + att.fragmentable: provides attributes for representing fragmentation of a structural element, typically as a consequence of some overlapping hierarchy. att.global: proporciona un conjunto de atributos común a todos los elementos del esquema de codificación TEI. [1.3.1.1. Global Attributes] @@ -1351,7 +1355,7 @@

    att.global.responsibility: provides attributes indicating the agent responsible for some aspect of the text, the markup or something asserted by the markup, and the degree of certainty associated with it. [1.3.1.1.4. Sources, certainty, and responsibility 3.5. Simple Editorial Changes 11.3.2.2. Hand, Responsibility, and Certainty Attributes 17.3. Spans and Interpretations 13.1.1. Linking Names and Their Referents] - att.global.source: provides an attribute used by elements to point to an external source. [1.3.1.1.4. Sources, certainty, and responsibility 3.3.3. Quotation 8.3.4. Writing] + att.global.source: provides attributes used by elements to point to an external source. [1.3.1.1.4. Sources, certainty, and responsibility 3.3.3. Quotation 8.3.4. Writing] att.handFeatures: proporciona atributos que describen los aspectos de la mano que ha escrito un manuscrito. [11.3.2.1. Document Hands] @@ -1359,6 +1363,9 @@

    att.internetMedia: atributos para registrar un periodo temporal normalizado + + att.locatable: provides attributes for referencing locations by pointing to entries in a canonical list of places. [2.3.9. The Unit Declaration 13.3.4.3. States, Traits, and Events] + att.measurement: proporciona atributos que representen una medición regularizada o normalizada. @@ -1366,13 +1373,13 @@

    att.media: provides attributes for specifying display and related properties of external media. - att.milestoneUnit: provides an attribute to indicate the type of section which is changing at a specific milestone. [3.11.3. Milestone Elements 2.3.6.3. Milestone Method 2.3.6. The Reference System Declaration] + att.milestoneUnit: provides attributes to indicate the type of section which is changing at a specific milestone. [3.11.3. Milestone Elements 2.3.6.3. Milestone Method 2.3.6. The Reference System Declaration] att.naming: identifica los atributos comunes a los elementos que se refieren a personas, lugares, organizaciones, etc. indicados por nombre [3.6.1. Referring Strings 13.3.6. Names and Nyms] - att.notated: provides an attribute to indicate any specialised notation used for element content. + att.notated: provides attributes to indicate any specialised notation used for element content. att.patternReplacement: provides attributes for regular-expression matching and replacement. [16.2.3. Using Abbreviated Pointers 2.3.6.3. Milestone Method 2.3.6. The Reference System Declaration 2.3.6.2. Search-and-Replace Method] @@ -1417,7 +1424,7 @@

    att.transcriptional: proporciona a los atributos específicos a los elementos que codifican la intervención authorial o scribal en un texto al transcribir el manuscrito o las fuentes similares. [11.3.1.4. Additions and Deletions] - att.written: provides an attribute to indicate the hand in which the content of an element was written in the source being transcribed. [1.3.1. Attribute Classes] + att.written: provides attributes to indicate the hand in which the content of an element was written in the source being transcribed. [1.3.1. Attribute Classes] author: (author) en una referencia bibliográfica, contiene el nombre del autor/es, personal o empresa de una obra; la declaración esencial de responsabilidad para cualquier ítem bibliográfico. [3.12.2.2. Titles, Authors, and Editors 2.2.1. The Title Statement] @@ -1593,6 +1600,9 @@

    editorialDecl: (declaración de la edición) proporciona detalles de principios editoriales y prácticas aplicadas en la codificación de un texto. [2.3.3. The Editorial Practices Declaration 2.3. The Encoding Description 15.3.2. Declarable Elements] + + ellipsis: (deliberately marked omission) indicates a purposeful marking in the source document signalling that content has been omitted, and may also supply or describe the omitted content. [3.5.3. Additions, Deletions, and Omissions] + email: (dirección de correo electrónico) contiene una dirección de correo electrónico indentificando el lugar dónde los mensajes electrónicos pueden ser enviados. [3.6.2. Addresses] diff --git a/Test/expected-results/test15.odd.rnc b/Test/expected-results/test15.odd.rnc index 1e35c53fb..70592b2b3 100644 --- a/Test/expected-results/test15.odd.rnc +++ b/Test/expected-results/test15.odd.rnc @@ -1422,7 +1422,7 @@ model.stageLike_sequenceOptional = stage? model.stageLike_sequenceOptionalRepeatable = stage* model.stageLike_sequenceRepeatable = stage+ model.entryPart = notAllowed -model.global.edit = gap +model.global.edit = gap | ellipsis model.divPart = model.lLike | model.pLike | lg | sp model.placeNamePart = notAllowed model.placeNamePart_alternation = notAllowed @@ -1654,16 +1654,6 @@ model.standOffPart = | listChange | seg | listAnnotation -att.citeStructurePart.attributes = att.citeStructurePart.attribute.use -att.citeStructurePart.attribute.use = - [ - a:documentation [ - "(use) supplies an XPath selection pattern using the syntax defined in . The XPath pattern is relative to the context given in " - ns1:code [ "@match" ] - ", which will either be a sibling attribute in the case of `` or on the parent `` in the case of ``." - ] - ] - attribute use { text } att.formula.attributes = att.formula.attribute.formula att.formula.attribute.formula = [ @@ -1674,6 +1664,18 @@ att.formula.attribute.formula = ] ] attribute formula { text }? +att.locatable.attributes = att.locatable.attribute.where +att.locatable.attribute.where = + [ + a:documentation [ + "indicates one or more locations by pointing to a " + ns1:code [ "" ] + " element or other canonical description." + ] + ] + attribute where { + list { xsd:anyURI+ } + }? model.correspActionPart = model.dateLike | model.addressLike | model.nameLike | note | noteGrp model.correspContextPart = model.ptrLike | model.pLike | note | noteGrp @@ -1796,9 +1798,9 @@ p = " " sch:report [ test = - "ancestor::tei:l[not(.//tei:note//tei:p[. = current()])]" + "(ancestor::tei:l or ancestor::tei:lg) and not(parent::tei:figure or parent::tei:note or ancestor::tei:floatingText)" "\x{a}" ~ - " Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab.\x{a}" ~ + " Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.\x{a}" ~ " " ] "\x{a}" ~ @@ -2204,6 +2206,16 @@ gap = }?, empty } +ellipsis = + + ## (deliberately marked omission) indicates a purposeful marking in the source document signalling that content has been omitted, and may also supply or describe the omitted content. [3.5.3. Additions, Deletions, and Omissions] + element ellipsis { + model.descLike?, + att.global.attributes, + att.dimensions.attributes, + att.timed.attributes, + empty + } add = ## (addition) contains letters, words, or phrases inserted in the source text by an author, scribe, or a previous annotator or corrector. [3.5.3. Additions, Deletions, and Omissions] @@ -3257,6 +3269,16 @@ textLang = }?, empty } +att.citeStructurePart.attributes = att.citeStructurePart.attribute.use +att.citeStructurePart.attribute.use = + [ + a:documentation [ + "(use) supplies an XPath selection pattern using the syntax defined in . The XPath pattern is relative to the context given in " + ns1:code [ "@match" ] + ", which will either be a sibling attribute in the case of `` or on the parent `` in the case of ``." + ] + ] + attribute use { text } att.patternReplacement.attributes = att.patternReplacement.attribute.matchPattern, att.patternReplacement.attribute.replacementPattern @@ -4090,6 +4112,7 @@ conversion = att.global.attributes, att.datable.attributes, att.formula.attributes, + att.locatable.attributes, [ a:documentation [ "indicates a source unit of measure that is to be converted into another unit indicated in " @@ -4469,9 +4492,10 @@ floatingText = "\x{a}" ~ " " sch:report [ - test = "ancestor::tei:l" + test = + "(ancestor::tei:l or ancestor::tei:lg) and not(ancestor::tei:floatingText)" "\x{a}" ~ - " Abstract model violation: Lines may not contain higher-level structural elements such as div.\x{a}" ~ + " Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~ " " ] "\x{a}" ~ @@ -4491,9 +4515,9 @@ floatingText = " " sch:report [ test = - "ancestor::tei:p or ancestor::tei:ab and not(ancestor::tei:floatingText)" + "(ancestor::tei:p or ancestor::tei:ab) and not(ancestor::tei:floatingText)" "\x{a}" ~ - " Abstract model violation: p and ab may not contain higher-level structural elements such as div.\x{a}" ~ + " Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~ " " ] "\x{a}" ~ @@ -4994,9 +5018,10 @@ ab = "\x{a}" ~ " " sch:report [ - test = "ancestor::tei:l or ancestor::tei:lg" + test = + "(ancestor::tei:l or ancestor::tei:lg) and not(parent::tei:figure or parent::tei:note or ancestor::tei:floatingText)" "\x{a}" ~ - " Abstract model violation: Lines may not contain higher-level divisions such as p or ab.\x{a}" ~ + " Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.\x{a}" ~ " " ] "\x{a}" ~ diff --git a/Test/expected-results/test21.odd.rnc b/Test/expected-results/test21.odd.rnc index a0f33251a..abc5c81fb 100644 --- a/Test/expected-results/test21.odd.rnc +++ b/Test/expected-results/test21.odd.rnc @@ -1685,7 +1685,8 @@ model.stageLike_sequenceOptionalRepeatable = stage* model.stageLike_sequenceRepeatable = stage+ model.entryPart = notAllowed model.eventLike = event | listEvent -model.global.edit = gap | addSpan | damageSpan | delSpan | space +model.global.edit = + gap | ellipsis | addSpan | damageSpan | delSpan | space model.divPart = model.lLike | model.pLike | lg | sp model.persStateLike = persName @@ -2047,16 +2048,6 @@ model.standOffPart = | seg | listAnnotation | zone -att.citeStructurePart.attributes = att.citeStructurePart.attribute.use -att.citeStructurePart.attribute.use = - [ - a:documentation [ - "(use) supplies an XPath selection pattern using the syntax defined in . The XPath pattern is relative to the context given in " - ns1:code [ "@match" ] - ", which will either be a sibling attribute in the case of `` or on the parent `` in the case of ``." - ] - ] - attribute use { text } att.formula.attributes = att.formula.attribute.formula att.formula.attribute.formula = [ @@ -2067,6 +2058,18 @@ att.formula.attribute.formula = ] ] attribute formula { text }? +att.locatable.attributes = att.locatable.attribute.where +att.locatable.attribute.where = + [ + a:documentation [ + "indique une ou plusieurs localisations en pointant vers un élément " + ns1:code [ "" ] + " ou autre description canonique." + ] + ] + attribute where { + list { xsd:anyURI+ } + }? model.correspActionPart = model.dateLike | model.addressLike | model.nameLike | note | noteGrp model.correspContextPart = model.ptrLike | model.pLike | note | noteGrp @@ -2194,9 +2197,9 @@ p = " " sch:report [ test = - "ancestor::tei:l[not(.//tei:note//tei:p[. = current()])]" + "(ancestor::tei:l or ancestor::tei:lg) and not(parent::tei:figure or parent::tei:note or ancestor::tei:floatingText)" "\x{a}" ~ - " Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab.\x{a}" ~ + " Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.\x{a}" ~ " " ] "\x{a}" ~ @@ -2624,6 +2627,16 @@ gap = }?, empty } +ellipsis = + + ## (deliberately marked omission) indicates a purposeful marking in the source document signalling that content has been omitted, and may also supply or describe the omitted content. [3.5.3. Additions, Deletions, and Omissions] + element ellipsis { + (metamark, model.descLike?, supplied?), + att.global.attributes, + att.dimensions.attributes, + att.timed.attributes, + empty + } add = ## ( ajout) contient des lettres, des mots ou des phrases insérés dans le texte par un auteur, un copiste, un annotateur ou un correcteur. [3.5.3. Additions, Deletions, and Omissions] @@ -4228,15 +4241,7 @@ event = att.typed.attributes, att.naming.attributes, att.sortable.attributes, - [ - a:documentation [ - "indique la localisation d'un évènement en pointant vers un élément " - ns1:code [ "" ] - "\x{a}" ~ - " " - ] - ] - attribute where { xsd:anyURI }?, + att.locatable.attributes, empty } faith = @@ -4969,6 +4974,16 @@ listNym = att.sortable.attributes, empty } +att.citeStructurePart.attributes = att.citeStructurePart.attribute.use +att.citeStructurePart.attribute.use = + [ + a:documentation [ + "(use) supplies an XPath selection pattern using the syntax defined in . The XPath pattern is relative to the context given in " + ns1:code [ "@match" ] + ", which will either be a sibling attribute in the case of `` or on the parent `` in the case of ``." + ] + ] + attribute use { text } att.patternReplacement.attributes = att.patternReplacement.attribute.matchPattern, att.patternReplacement.attribute.replacementPattern @@ -5793,6 +5808,7 @@ conversion = att.global.attributes, att.datable.attributes, att.formula.attributes, + att.locatable.attributes, [ a:documentation [ "indicates a source unit of measure that is to be converted into another unit indicated in " @@ -6193,9 +6209,10 @@ ab = "\x{a}" ~ " " sch:report [ - test = "ancestor::tei:l or ancestor::tei:lg" + test = + "(ancestor::tei:l or ancestor::tei:lg) and not(parent::tei:figure or parent::tei:note or ancestor::tei:floatingText)" "\x{a}" ~ - " Abstract model violation: Lines may not contain higher-level divisions such as p or ab.\x{a}" ~ + " Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.\x{a}" ~ " " ] "\x{a}" ~ @@ -8389,9 +8406,10 @@ group = "\x{a}" ~ " " sch:report [ - test = "ancestor::tei:l" + test = + "(ancestor::tei:l or ancestor::tei:lg) and not(ancestor::tei:floatingText)" "\x{a}" ~ - " Abstract model violation: Lines may not contain higher-level structural elements such as div.\x{a}" ~ + " Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~ " " ] "\x{a}" ~ @@ -8411,9 +8429,9 @@ group = " " sch:report [ test = - "ancestor::tei:p or ancestor::tei:ab and not(ancestor::tei:floatingText)" + "(ancestor::tei:p or ancestor::tei:ab) and not(ancestor::tei:floatingText)" "\x{a}" ~ - " Abstract model violation: p and ab may not contain higher-level structural elements such as div.\x{a}" ~ + " Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~ " " ] "\x{a}" ~ diff --git a/Test/expected-results/test30.dtd b/Test/expected-results/test30.dtd index 353bd87a8..84127b351 100644 --- a/Test/expected-results/test30.dtd +++ b/Test/expected-results/test30.dtd @@ -121,6 +121,10 @@ subtype %teidata.enumerated; #IMPLIED'> + + @@ -724,11 +728,11 @@ to %teidata.word; #IMPLIED'> - - - - - + + + + + @@ -979,14 +983,14 @@ to %teidata.word; #IMPLIED'> - - + + @@ -1034,6 +1038,10 @@ sort %teidata.count; #IMPLIED'> unit %teidata.enumerated; #REQUIRED'> + + @@ -1587,6 +1595,7 @@ scheme %teidata.pointer; #REQUIRED > %Tatt.global.attributes; %Tatt.datable.attributes; %Tatt.formula.attributes; + %Tatt.locatable.attributes; fromUnit %teidata.pointer; #REQUIRED toUnit %teidata.pointer; #REQUIRED > @@ -1807,6 +1816,13 @@ when %teidata.temporal.w3c; #IMPLIED > %Tatt.naming.attributes; %Tatt.typed.attribute.subtype; type %teidata.enumerated; #IMPLIED > + + + + @@ -1837,7 +1853,7 @@ type %teidata.enumerated; #IMPLIED > %Tatt.typed.attributes; %Tatt.naming.attributes; %Tatt.sortable.attributes; -where %teidata.pointer; #IMPLIED > + %Tatt.locatable.attributes; > diff --git a/Test/expected-results/test30.rnc b/Test/expected-results/test30.rnc index 43aebf018..a143aad15 100644 --- a/Test/expected-results/test30.rnc +++ b/Test/expected-results/test30.rnc @@ -1641,7 +1641,8 @@ Tmodel.stageLike_sequenceOptionalRepeatable = Tstage* Tmodel.stageLike_sequenceRepeatable = Tstage+ Tmodel.entryPart = notAllowed Tmodel.eventLike = Tevent | TlistEvent -Tmodel.global.edit = Tgap | TaddSpan | TdamageSpan | TdelSpan | Tspace +Tmodel.global.edit = + Tgap | Tellipsis | TaddSpan | TdamageSpan | TdelSpan | Tspace Tmodel.divPart = Tmodel.lLike | Tmodel.pLike | Tlg | Tsp Tmodel.persStateLike = TpersName @@ -2017,16 +2018,6 @@ Tmodel.standOffPart = | Tzone | Tseg | TlistAnnotation -Tatt.citeStructurePart.attributes = Tatt.citeStructurePart.attribute.use -Tatt.citeStructurePart.attribute.use = - [ - a:documentation [ - "(use) supplies an XPath selection pattern using the syntax defined in . The XPath pattern is relative to the context given in " - ns1:code [ "@match" ] - ", which will either be a sibling attribute in the case of `` or on the parent `` in the case of ``." - ] - ] - attribute use { text } Tatt.formula.attributes = Tatt.formula.attribute.formula Tatt.formula.attribute.formula = [ @@ -2037,6 +2028,18 @@ Tatt.formula.attribute.formula = ] ] attribute formula { text }? +Tatt.locatable.attributes = Tatt.locatable.attribute.where +Tatt.locatable.attribute.where = + [ + a:documentation [ + "indicates one or more locations by pointing to a " + ns1:code [ "" ] + " element or other canonical description." + ] + ] + attribute where { + list { xsd:anyURI+ } + }? Tmodel.correspActionPart = Tmodel.dateLike | Tmodel.addressLike @@ -2169,9 +2172,9 @@ Tp = " " sch:report [ test = - "ancestor::tei:l[not(.//tei:note//tei:p[. = current()])]" + "(ancestor::tei:l or ancestor::tei:lg) and not(parent::tei:figure or parent::tei:note or ancestor::tei:floatingText)" "\x{a}" ~ - " Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab.\x{a}" ~ + " Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.\x{a}" ~ " " ] "\x{a}" ~ @@ -2578,6 +2581,16 @@ Tgap = }?, empty } +Tellipsis = + + ## (deliberately marked omission) indicates a purposeful marking in the source document signalling that content has been omitted, and may also supply or describe the omitted content. [3.5.3. Additions, Deletions, and Omissions] + element ellipsis { + (Tmetamark, Tmodel.descLike?, Tsupplied?), + Tatt.global.attributes, + Tatt.dimensions.attributes, + Tatt.timed.attributes, + empty + } Tadd = ## (addition) contains letters, words, or phrases inserted in the source text by an author, scribe, or a previous annotator or corrector. [3.5.3. Additions, Deletions, and Omissions] @@ -3665,6 +3678,16 @@ TtextLang = }?, empty } +Tatt.citeStructurePart.attributes = Tatt.citeStructurePart.attribute.use +Tatt.citeStructurePart.attribute.use = + [ + a:documentation [ + "(use) supplies an XPath selection pattern using the syntax defined in . The XPath pattern is relative to the context given in " + ns1:code [ "@match" ] + ", which will either be a sibling attribute in the case of `` or on the parent `` in the case of ``." + ] + ] + attribute use { text } Tatt.patternReplacement.attributes = Tatt.patternReplacement.attribute.matchPattern, Tatt.patternReplacement.attribute.replacementPattern @@ -4499,6 +4522,7 @@ Tconversion = Tatt.global.attributes, Tatt.datable.attributes, Tatt.formula.attributes, + Tatt.locatable.attributes, [ a:documentation [ "indicates a source unit of measure that is to be converted into another unit indicated in " @@ -5286,14 +5310,7 @@ Tevent = Tatt.typed.attributes, Tatt.naming.attributes, Tatt.sortable.attributes, - [ - a:documentation [ - "indicates the location of an event by pointing to a " - ns1:code [ "" ] - " element" - ] - ] - attribute where { xsd:anyURI }?, + Tatt.locatable.attributes, empty } Tfaith = @@ -6927,9 +6944,10 @@ Tab = "\x{a}" ~ " " sch:report [ - test = "ancestor::tei:l or ancestor::tei:lg" + test = + "(ancestor::tei:l or ancestor::tei:lg) and not(parent::tei:figure or parent::tei:note or ancestor::tei:floatingText)" "\x{a}" ~ - " Abstract model violation: Lines may not contain higher-level divisions such as p or ab.\x{a}" ~ + " Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.\x{a}" ~ " " ] "\x{a}" ~ @@ -7484,9 +7502,10 @@ Tdiv = "\x{a}" ~ " " sch:report [ - test = "ancestor::tei:l" + test = + "(ancestor::tei:l or ancestor::tei:lg) and not(ancestor::tei:floatingText)" "\x{a}" ~ - " Abstract model violation: Lines may not contain higher-level structural elements such as div.\x{a}" ~ + " Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~ " " ] "\x{a}" ~ @@ -7506,9 +7525,9 @@ Tdiv = " " sch:report [ test = - "ancestor::tei:p or ancestor::tei:ab and not(ancestor::tei:floatingText)" + "(ancestor::tei:p or ancestor::tei:ab) and not(ancestor::tei:floatingText)" "\x{a}" ~ - " Abstract model violation: p and ab may not contain higher-level structural elements such as div.\x{a}" ~ + " Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~ " " ] "\x{a}" ~ diff --git a/Test/expected-results/test33.rnc b/Test/expected-results/test33.rnc index 3effa6c2b..f8a9317c8 100644 --- a/Test/expected-results/test33.rnc +++ b/Test/expected-results/test33.rnc @@ -1487,7 +1487,7 @@ tei_model.stageLike_sequenceOptional = tei_stage? tei_model.stageLike_sequenceOptionalRepeatable = tei_stage* tei_model.stageLike_sequenceRepeatable = tei_stage+ tei_model.entryPart = notAllowed -tei_model.global.edit = tei_gap +tei_model.global.edit = tei_gap | tei_ellipsis tei_model.divPart = tei_model.lLike | tei_model.pLike | tei_lg | tei_sp tei_model.placeNamePart = notAllowed tei_model.placeNamePart_alternation = notAllowed @@ -1751,17 +1751,6 @@ tei_model.standOffPart = | tei_listChange | tei_seg | tei_listAnnotation -tei_att.citeStructurePart.attributes = - tei_att.citeStructurePart.attribute.use -tei_att.citeStructurePart.attribute.use = - [ - a:documentation [ - "(use) supplies an XPath selection pattern using the syntax defined in . The XPath pattern is relative to the context given in " - ns1:code [ "@match" ] - ", which will either be a sibling attribute in the case of `` or on the parent `` in the case of ``." - ] - ] - attribute use { text } tei_att.formula.attributes = tei_att.formula.attribute.formula tei_att.formula.attribute.formula = [ @@ -1772,6 +1761,18 @@ tei_att.formula.attribute.formula = ] ] attribute formula { text }? +tei_att.locatable.attributes = tei_att.locatable.attribute.where +tei_att.locatable.attribute.where = + [ + a:documentation [ + "indicates one or more locations by pointing to a " + ns1:code [ "" ] + " element or other canonical description." + ] + ] + attribute where { + list { xsd:anyURI+ } + }? tei_model.correspActionPart = tei_model.dateLike | tei_model.addressLike @@ -1900,9 +1901,9 @@ tei_p = " " sch:report [ test = - "ancestor::tei:l[not(.//tei:note//tei:p[. = current()])]" + "(ancestor::tei:l or ancestor::tei:lg) and not(parent::tei:figure or parent::tei:note or ancestor::tei:floatingText)" "\x{a}" ~ - " Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab.\x{a}" ~ + " Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.\x{a}" ~ " " ] "\x{a}" ~ @@ -2328,6 +2329,16 @@ tei_gap = }?, empty } +tei_ellipsis = + + ## (deliberately marked omission) indicates a purposeful marking in the source document signalling that content has been omitted, and may also supply or describe the omitted content. [3.5.3. Additions, Deletions, and Omissions] + element tei:ellipsis { + tei_model.descLike?, + tei_att.global.attributes, + tei_att.dimensions.attributes, + tei_att.timed.attributes, + empty + } tei_add = ## (addition) contains letters, words, or phrases inserted in the source text by an author, scribe, or a previous annotator or corrector. [3.5.3. Additions, Deletions, and Omissions] @@ -3424,6 +3435,17 @@ tei_textLang = }?, empty } +tei_att.citeStructurePart.attributes = + tei_att.citeStructurePart.attribute.use +tei_att.citeStructurePart.attribute.use = + [ + a:documentation [ + "(use) supplies an XPath selection pattern using the syntax defined in . The XPath pattern is relative to the context given in " + ns1:code [ "@match" ] + ", which will either be a sibling attribute in the case of `` or on the parent `` in the case of ``." + ] + ] + attribute use { text } tei_att.patternReplacement.attributes = tei_att.patternReplacement.attribute.matchPattern, tei_att.patternReplacement.attribute.replacementPattern @@ -4276,6 +4298,7 @@ tei_conversion = tei_att.global.attributes, tei_att.datable.attributes, tei_att.formula.attributes, + tei_att.locatable.attributes, [ a:documentation [ "indicates a source unit of measure that is to be converted into another unit indicated in " @@ -4667,9 +4690,10 @@ tei_div = "\x{a}" ~ " " sch:report [ - test = "ancestor::tei:l" + test = + "(ancestor::tei:l or ancestor::tei:lg) and not(ancestor::tei:floatingText)" "\x{a}" ~ - " Abstract model violation: Lines may not contain higher-level structural elements such as div.\x{a}" ~ + " Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~ " " ] "\x{a}" ~ @@ -4688,9 +4712,9 @@ tei_div = " " sch:report [ test = - "ancestor::tei:p or ancestor::tei:ab and not(ancestor::tei:floatingText)" + "(ancestor::tei:p or ancestor::tei:ab) and not(ancestor::tei:floatingText)" "\x{a}" ~ - " Abstract model violation: p and ab may not contain higher-level structural elements such as div.\x{a}" ~ + " Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~ " " ] "\x{a}" ~ @@ -5212,9 +5236,10 @@ tei_ab = "\x{a}" ~ " " sch:report [ - test = "ancestor::tei:l or ancestor::tei:lg" + test = + "(ancestor::tei:l or ancestor::tei:lg) and not(parent::tei:figure or parent::tei:note or ancestor::tei:floatingText)" "\x{a}" ~ - " Abstract model violation: Lines may not contain higher-level divisions such as p or ab.\x{a}" ~ + " Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.\x{a}" ~ " " ] "\x{a}" ~ diff --git a/Test/expected-results/test34.combined.json b/Test/expected-results/test34.combined.json index 2e8507e49..c2a1c0b05 100644 --- a/Test/expected-results/test34.combined.json +++ b/Test/expected-results/test34.combined.json @@ -2619,7 +2619,8 @@ "atts" : [ "att.global", "att.datable", - "att.formula" ], + "att.formula", + "att.locatable" ], "unknown" : [ ] }, "attributes" : @@ -4604,6 +4605,44 @@ { "type" : "classRef", "key" : "model.editorialDeclPart" } ] } ] }, + { "ident" : "ellipsis", + "ns" : "http:\/\/foo.foo\/foo", + "type" : "elementSpec", + "module" : "core", + "desc" : + [ "indicates a purposeful\n marking in the source document signalling that content has been\n omitted, and may also supply or describe the omitted content.<\/desc>" ], + "shortDesc" : "(deliberately marked omission) indicates a purposeful\n marking in the source document signalling that content has been\n omitted, and may also supply or describe the omitted content.", + "gloss" : + [ "deliberately marked omission<\/gloss>" ], + "altIdent" : + [ ], + "classes" : + { "model" : + [ "model.global.edit" ], + "atts" : + [ "att.global", + "att.dimensions", + "att.timed" ], + "unknown" : + [ ] }, + "attributes" : + [ ], + "content" : + [ + { "type" : "sequence", + "minOccurs" : "1", + "maxOccurs" : "1", + "content" : + [ + { "type" : "elementRef", + "key" : "metamark" }, + + { "type" : "classRef", + "key" : "model.descLike" }, + + { "type" : "elementRef", + "key" : "supplied" } ] } ] }, + { "ident" : "email", "ns" : "http:\/\/foo.foo\/foo", "type" : "elementSpec", @@ -13207,8 +13246,8 @@ "type" : "classSpec", "module" : "tei", "desc" : - [ "provides an attribute to indicate whether or not the element\n concerned is considered to mark the end of an orthographic token in the same way\n as whitespace.<\/desc>" ], - "shortDesc" : "provides an attribute to indicate whether or not the element\n concerned is considered to mark the end of an orthographic token in the same way\n as whitespace.", + [ "provides attributes to indicate whether or not the element\n concerned is considered to mark the end of an orthographic token in the same way\n as whitespace.<\/desc>" ], + "shortDesc" : "provides attributes to indicate whether or not the element\n concerned is considered to mark the end of an orthographic token in the same way\n as whitespace.", "gloss" : [ ], "altIdent" : @@ -13270,8 +13309,8 @@ "type" : "classSpec", "module" : "tei", "desc" : - [ "provides an attribute which may be used to supply a\n canonical reference<\/term> as a means of identifying the\n target of a pointer.<\/desc>" ], - "shortDesc" : "provides an attribute which may be used to supply a\n canonical reference as a means of identifying the\n target of a pointer.", + [ "provides attributes that may be used to supply a\n canonical reference<\/term> as a means of identifying the\n target of a pointer.<\/desc>" ], + "shortDesc" : "provides attributes that may be used to supply a\n canonical reference as a means of identifying the\n target of a pointer.", "gloss" : [ ], "altIdent" : @@ -13303,8 +13342,8 @@ "type" : "classSpec", "module" : "tei", "desc" : - [ "provides attributes which can be used to associate a representation such as a name or title\n with canonical information about the object being named or referenced.<\/desc>" ], - "shortDesc" : "provides attributes which can be used to associate a representation such as a name or title\n with canonical information about the object being named or referenced.", + [ "provides attributes that can be used to associate a representation such as a name or title\n with canonical information about the object being named or referenced.<\/desc>" ], + "shortDesc" : "provides attributes that can be used to associate a representation such as a name or title\n with canonical information about the object being named or referenced.", "gloss" : [ ], "altIdent" : @@ -13354,9 +13393,9 @@ { "ident" : "att.citeStructurePart", "ns" : "http:\/\/foo.foo\/foo", "type" : "classSpec", - "module" : "tei", + "module" : "header", "desc" : - [ "provides attributes for selecting particular elements\n within a document.<\/desc>" ], + [ "provides attributes for selecting particular elements\n within a document.<\/desc>" ], "shortDesc" : "provides attributes for selecting particular elements\n within a document.", "gloss" : [ ], @@ -13717,8 +13756,8 @@ "type" : "classSpec", "module" : "tei", "desc" : - [ "provides the dcr:datacat<\/att> and\n dcr:ValueDatacat<\/att> attributes which are used to \n align XML elements or attributes with the appropriate Data Categories (DCs) defined by the ISO 12620:2009 \n standard and stored in the Web repository called ISOCat at http:\/\/www.isocat.org\/<\/ref>.<\/desc>" ], - "shortDesc" : "provides the dcr:datacat and\n dcr:ValueDatacat attributes which are used to \n align XML elements or attributes with the appropriate Data Categories (DCs) defined by the ISO 12620:2009 \n standard and stored in the Web repository called ISOCat at http:\/\/www.isocat.org\/.", + [ "provides attributes that are used to \n align XML elements or attributes with the appropriate Data Categories (DCs) defined by the ISO 12620:2009 \n standard and stored in the Web repository called ISOCat at .<\/desc>" ], + "shortDesc" : "provides attributes that are used to \n align XML elements or attributes with the appropriate Data Categories (DCs) defined by the ISO 12620:2009 \n standard and stored in the Web repository called ISOCat at .", "gloss" : [ ], "altIdent" : @@ -14524,8 +14563,8 @@ "type" : "classSpec", "module" : "tei", "desc" : - [ "provides an attribute for representing\n fragmentation of a structural element, typically as \n a consequence of some overlapping hierarchy.<\/desc>" ], - "shortDesc" : "provides an attribute for representing\n fragmentation of a structural element, typically as \n a consequence of some overlapping hierarchy.", + [ "provides attributes for representing\n fragmentation of a structural element, typically as \n a consequence of some overlapping hierarchy.<\/desc>" ], + "shortDesc" : "provides attributes for representing\n fragmentation of a structural element, typically as \n a consequence of some overlapping hierarchy.", "gloss" : [ ], "altIdent" : @@ -15062,8 +15101,8 @@ "type" : "classSpec", "module" : "tei", "desc" : - [ "provides an attribute used by elements to point to an\n external source.<\/desc>" ], - "shortDesc" : "provides an attribute used by elements to point to an\n external source.", + [ "provides attributes used by elements to point to an\n external source.<\/desc>" ], + "shortDesc" : "provides attributes used by elements to point to an\n external source.", "gloss" : [ ], "altIdent" : @@ -15286,6 +15325,39 @@ "dataRef" : { "key" : "teidata.word" } } } ] }, + { "ident" : "att.locatable", + "ns" : "http:\/\/foo.foo\/foo", + "type" : "classSpec", + "module" : "tei", + "desc" : + [ "provides attributes for referencing locations by pointing to entries in a canonical list of places.<\/desc>" ], + "shortDesc" : "provides attributes for referencing locations by pointing to entries in a canonical list of places.", + "gloss" : + [ ], + "altIdent" : + [ ], + "attributes" : + [ + { "onElement" : false, + "ident" : "where", + "mode" : "add", + "ns" : "", + "usage" : "opt", + "desc" : + [ "indicates one or more locations by pointing to a place<\/gi> element or other canonical description.<\/desc>" ], + "shortDesc" : "indicates one or more locations by pointing to a place element or other canonical description.", + "gloss" : + [ ], + "altIdent" : + [ ], + "valDesc" : + [ ], + "datatype" : + { "min" : "1", + "max" : "unbounded", + "dataRef" : + { "key" : "teidata.pointer" } } } ] }, + { "ident" : "att.measurement", "ns" : "http:\/\/foo.foo\/foo", "type" : "classSpec", @@ -15638,8 +15710,8 @@ "type" : "classSpec", "module" : "core", "desc" : - [ "provides an attribute to indicate the type of section which is changing at a specific milestone.<\/desc>" ], - "shortDesc" : "provides an attribute to indicate the type of section which is changing at a specific milestone.", + [ "provides attributes to indicate the type of section which is changing at a specific milestone.<\/desc>" ], + "shortDesc" : "provides attributes to indicate the type of section which is changing at a specific milestone.", "gloss" : [ ], "altIdent" : @@ -15851,8 +15923,8 @@ "type" : "classSpec", "module" : "tei", "desc" : - [ "provides an attribute to indicate any specialised notation used for element content.<\/desc>" ], - "shortDesc" : "provides an attribute to indicate any specialised notation used for element content.", + [ "provides attributes to indicate any specialised notation used for element content.<\/desc>" ], + "shortDesc" : "provides attributes to indicate any specialised notation used for element content.", "gloss" : [ ], "altIdent" : @@ -16896,8 +16968,8 @@ "type" : "classSpec", "module" : "tei", "desc" : - [ "provides attributes which can be used to classify or subclassify elements in any way.<\/desc>" ], - "shortDesc" : "provides attributes which can be used to classify or subclassify elements in any way.", + [ "provides attributes that can be used to classify or subclassify elements in any way.<\/desc>" ], + "shortDesc" : "provides attributes that can be used to classify or subclassify elements in any way.", "gloss" : [ ], "altIdent" : @@ -16949,8 +17021,8 @@ "type" : "classSpec", "module" : "tei", "desc" : - [ "provides an attribute to indicate the hand in which\n the content of an element was written in the source being transcribed.<\/desc>" ], - "shortDesc" : "provides an attribute to indicate the hand in which\n the content of an element was written in the source being transcribed.", + [ "provides attributes to indicate the hand in which\n the content of an element was written in the source being transcribed.<\/desc>" ], + "shortDesc" : "provides attributes to indicate the hand in which\n the content of an element was written in the source being transcribed.", "gloss" : [ ], "altIdent" : diff --git a/Test/expected-results/test34.odd.html b/Test/expected-results/test34.odd.html index 7611c7b65..29c3884a8 100644 --- a/Test/expected-results/test34.odd.html +++ b/Test/expected-results/test34.odd.html @@ -228,6 +228,7 @@

    del desc distinct + ellipsis email emph expan @@ -319,10 +320,10 @@

    Content model - 
    +                
     <content>
 </content>
-    ⚓
    
+    ⚓
    @@ -330,8 +331,8 @@

    Schema Declaration - 
    -element cit { tei_ref, macro.specialPara+, text }⚓
    + 
    +element cit { tei_ref, macro.specialPara+, text }⚓
    @@ -518,6 +519,7 @@

    del desc distinct + ellipsis email emph expan @@ -609,10 +611,10 @@

    Content model - 
    +                
     <content>
 </content>
-    ⚓
    
+    ⚓
    @@ -620,8 +622,8 @@

    Schema Declaration - 
    -element cit { tei_ref, macro.specialPara+, text }⚓
    + 
    +element cit { tei_ref, macro.specialPara+, text }⚓
    @@ -808,6 +810,7 @@

    del desc distinct + ellipsis email emph expan @@ -899,10 +902,10 @@

    Content model - 
    +                
     <content>
 </content>
-    ⚓
    
+    ⚓
    @@ -910,8 +913,8 @@

    Schema Declaration - 
    -element q { tei_ref, macro.specialPara+, text }⚓
    + 
    +element q { tei_ref, macro.specialPara+, text }⚓
    @@ -986,13 +989,13 @@

    att.ascribed.directed: provides attributes for elements representing speech or action that can be directed at a group or individual. [3.3.3. Quotation 8.3. Elements Unique to Spoken Texts] - att.breaking: provides an attribute to indicate whether or not the element concerned is considered to mark the end of an orthographic token in the same way as whitespace. [3.11.3. Milestone Elements] + att.breaking: provides attributes to indicate whether or not the element concerned is considered to mark the end of an orthographic token in the same way as whitespace. [3.11.3. Milestone Elements] - att.cReferencing: provides an attribute which may be used to supply a canonical reference as a means of identifying the target of a pointer. + att.cReferencing: provides attributes that may be used to supply a canonical reference as a means of identifying the target of a pointer. - att.canonical: provides attributes which can be used to associate a representation such as a name or title with canonical information about the object being named or referenced. [13.1.1. Linking Names and Their Referents] + att.canonical: provides attributes that can be used to associate a representation such as a name or title with canonical information about the object being named or referenced. [13.1.1. Linking Names and Their Referents] att.citeStructurePart: provides attributes for selecting particular elements within a document. @@ -1007,7 +1010,7 @@

    att.datable.w3c: provides attributes for normalization of elements that contain datable events conforming to the W3C XML Schema Part 2: Datatypes Second Edition. [3.6.4. Dates and Times 13.4. Dates] - att.datcat: provides the dcr:datacat and dcr:ValueDatacat attributes which are used to align XML elements or attributes with the appropriate Data Categories (DCs) defined by the ISO 12620:2009 standard and stored in the Web repository called ISOCat at http://www.isocat.org/. [9.5.2. Lexical View 18.3. Other Atomic Feature Values] + att.datcat: provides attributes that are used to align XML elements or attributes with the appropriate Data Categories (DCs) defined by the ISO 12620:2009 standard and stored in the Web repository called ISOCat at http://www.isocat.org/. [9.5.2. Lexical View 18.3. Other Atomic Feature Values] att.declarable: provides attributes for those elements in the TEI header which may be independently selected by means of the special purpose decls attribute. [15.3. Associating Contextual Information with a Text] @@ -1034,7 +1037,7 @@

    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. + att.fragmentable: provides attributes for representing fragmentation of a structural element, typically as a consequence of some overlapping hierarchy. att.global: provides attributes common to all elements in the TEI encoding scheme. [1.3.1.1. Global Attributes] @@ -1049,7 +1052,7 @@

    att.global.responsibility: provides attributes indicating the agent responsible for some aspect of the text, the markup or something asserted by the markup, and the degree of certainty associated with it. [1.3.1.1.4. Sources, certainty, and responsibility 3.5. Simple Editorial Changes 11.3.2.2. Hand, Responsibility, and Certainty Attributes 17.3. Spans and Interpretations 13.1.1. Linking Names and Their Referents] - att.global.source: provides an attribute used by elements to point to an external source. [1.3.1.1.4. Sources, certainty, and responsibility 3.3.3. Quotation 8.3.4. Writing] + att.global.source: provides attributes used by elements to point to an external source. [1.3.1.1.4. Sources, certainty, and responsibility 3.3.3. Quotation 8.3.4. Writing] att.handFeatures: provides attributes describing aspects of the hand in which a manuscript is written. [11.3.2.1. Document Hands] @@ -1057,6 +1060,9 @@

    att.internetMedia: provides attributes for specifying the type of a computer resource using a standard taxonomy. + + att.locatable: provides attributes for referencing locations by pointing to entries in a canonical list of places. [2.3.9. The Unit Declaration 13.3.4.3. States, Traits, and Events] + att.measurement: provides attributes to represent a regularized or normalized measurement. @@ -1064,13 +1070,13 @@

    att.media: provides attributes for specifying display and related properties of external media. - att.milestoneUnit: provides an attribute to indicate the type of section which is changing at a specific milestone. [3.11.3. Milestone Elements 2.3.6.3. Milestone Method 2.3.6. The Reference System Declaration] + att.milestoneUnit: provides attributes to indicate the type of section which is changing at a specific milestone. [3.11.3. Milestone Elements 2.3.6.3. Milestone Method 2.3.6. The Reference System Declaration] att.naming: provides attributes common to elements which refer to named persons, places, organizations etc. [3.6.1. Referring Strings 13.3.6. Names and Nyms] - att.notated: provides an attribute to indicate any specialised notation used for element content. + att.notated: provides attributes to indicate any specialised notation used for element content. att.patternReplacement: provides attributes for regular-expression matching and replacement. [16.2.3. Using Abbreviated Pointers 2.3.6.3. Milestone Method 2.3.6. The Reference System Declaration 2.3.6.2. Search-and-Replace Method] @@ -1112,10 +1118,10 @@

    att.transcriptional: provides attributes specific to elements encoding authorial or scribal intervention in a text when transcribing manuscript or similar sources. [11.3.1.4. Additions and Deletions] - att.typed: provides attributes which can be used to classify or subclassify elements in any way. [1.3.1. Attribute Classes 17.1.1. Words and Above 3.6.1. Referring Strings 3.7. Simple Links and Cross-References 3.6.5. Abbreviations and Their Expansions 3.13.1. Core Tags for Verse 7.2.5. Speech Contents 4.1.1. Un-numbered Divisions 4.1.2. Numbered Divisions 4.2.1. Headings and Trailers 4.4. Virtual Divisions 13.3.2.3. Personal Relationships 11.3.1.1. Core Elements for Transcriptional Work 16.1.1. Pointers and Links 16.3. Blocks, Segments, and Anchors 12.2. Linking the Apparatus to the Text 22.5.1.2. Defining Content Models: RELAX NG 8.3. Elements Unique to Spoken Texts 23.3.1.3. Modification of Attribute and Attribute Value Lists] + att.typed: provides attributes that can be used to classify or subclassify elements in any way. [1.3.1. Attribute Classes 17.1.1. Words and Above 3.6.1. Referring Strings 3.7. Simple Links and Cross-References 3.6.5. Abbreviations and Their Expansions 3.13.1. Core Tags for Verse 7.2.5. Speech Contents 4.1.1. Un-numbered Divisions 4.1.2. Numbered Divisions 4.2.1. Headings and Trailers 4.4. Virtual Divisions 13.3.2.3. Personal Relationships 11.3.1.1. Core Elements for Transcriptional Work 16.1.1. Pointers and Links 16.3. Blocks, Segments, and Anchors 12.2. Linking the Apparatus to the Text 22.5.1.2. Defining Content Models: RELAX NG 8.3. Elements Unique to Spoken Texts 23.3.1.3. Modification of Attribute and Attribute Value Lists] - att.written: provides an attribute to indicate the hand in which the content of an element was written in the source being transcribed. [1.3.1. Attribute Classes] + att.written: provides attributes to indicate the hand in which the content of an element was written in the source being transcribed. [1.3.1. Attribute Classes] author: (author) in a bibliographic reference, contains the name(s) of an author, personal or corporate, of a work; for example in the same form as that provided by a recognized bibliographic name authority. [3.12.2.2. Titles, Authors, and Editors 2.2.1. The Title Statement] @@ -1291,6 +1297,9 @@

    editorialDecl: (editorial practice declaration) provides details of editorial principles and practices applied during the encoding of a text. [2.3.3. The Editorial Practices Declaration 2.3. The Encoding Description 15.3.2. Declarable Elements] + + ellipsis: (deliberately marked omission) indicates a purposeful marking in the source document signalling that content has been omitted, and may also supply or describe the omitted content. [3.5.3. Additions, Deletions, and Omissions] + email: (electronic mail address) contains an email address identifying a location to which email messages can be delivered. [3.6.2. Addresses] diff --git a/Test/expected-results/test34.rnc b/Test/expected-results/test34.rnc index 9f5d1ed85..b31420577 100644 --- a/Test/expected-results/test34.rnc +++ b/Test/expected-results/test34.rnc @@ -1488,7 +1488,7 @@ tei_model.stageLike_sequenceOptional = tei_stage? tei_model.stageLike_sequenceOptionalRepeatable = tei_stage* tei_model.stageLike_sequenceRepeatable = tei_stage+ tei_model.entryPart = notAllowed -tei_model.global.edit = tei_gap +tei_model.global.edit = tei_gap | tei_ellipsis tei_model.divPart = tei_model.lLike | tei_model.pLike | tei_lg | tei_sp tei_model.placeNamePart = notAllowed tei_model.placeNamePart_alternation = notAllowed @@ -1756,17 +1756,6 @@ tei_model.standOffPart = | tei_listChange | tei_seg | tei_listAnnotation -tei_att.citeStructurePart.attributes = - tei_att.citeStructurePart.attribute.use -tei_att.citeStructurePart.attribute.use = - [ - a:documentation [ - "(use) supplies an XPath selection pattern using the syntax defined in . The XPath pattern is relative to the context given in " - ns1:code [ "@match" ] - ", which will either be a sibling attribute in the case of `` or on the parent `` in the case of ``." - ] - ] - attribute use { text } tei_att.formula.attributes = tei_att.formula.attribute.formula tei_att.formula.attribute.formula = [ @@ -1777,6 +1766,18 @@ tei_att.formula.attribute.formula = ] ] attribute formula { text }? +tei_att.locatable.attributes = tei_att.locatable.attribute.where +tei_att.locatable.attribute.where = + [ + a:documentation [ + "indicates one or more locations by pointing to a " + ns1:code [ "" ] + " element or other canonical description." + ] + ] + attribute where { + list { xsd:anyURI+ } + }? tei_model.correspActionPart = tei_model.dateLike | tei_model.addressLike @@ -1905,9 +1906,9 @@ tei_p = " " sch:report [ test = - "ancestor::tei:l[not(.//tei:note//tei:p[. = current()])]" + "(ancestor::tei:l or ancestor::tei:lg) and not(parent::tei:figure or parent::tei:note or ancestor::tei:floatingText)" "\x{a}" ~ - " Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab.\x{a}" ~ + " Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.\x{a}" ~ " " ] "\x{a}" ~ @@ -2333,6 +2334,16 @@ tei_gap = }?, empty } +tei_ellipsis = + + ## (deliberately marked omission) indicates a purposeful marking in the source document signalling that content has been omitted, and may also supply or describe the omitted content. [3.5.3. Additions, Deletions, and Omissions] + element ellipsis { + tei_model.descLike?, + tei_att.global.attributes, + tei_att.dimensions.attributes, + tei_att.timed.attributes, + empty + } tei_add = ## (addition) contains letters, words, or phrases inserted in the source text by an author, scribe, or a previous annotator or corrector. [3.5.3. Additions, Deletions, and Omissions] @@ -3429,6 +3440,17 @@ tei_textLang = }?, empty } +tei_att.citeStructurePart.attributes = + tei_att.citeStructurePart.attribute.use +tei_att.citeStructurePart.attribute.use = + [ + a:documentation [ + "(use) supplies an XPath selection pattern using the syntax defined in . The XPath pattern is relative to the context given in " + ns1:code [ "@match" ] + ", which will either be a sibling attribute in the case of `` or on the parent `` in the case of ``." + ] + ] + attribute use { text } tei_att.patternReplacement.attributes = tei_att.patternReplacement.attribute.matchPattern, tei_att.patternReplacement.attribute.replacementPattern @@ -4279,6 +4301,7 @@ tei_conversion = tei_att.global.attributes, tei_att.datable.attributes, tei_att.formula.attributes, + tei_att.locatable.attributes, [ a:documentation [ "indicates a source unit of measure that is to be converted into another unit indicated in " @@ -4670,9 +4693,10 @@ tei_div = "\x{a}" ~ " " sch:report [ - test = "ancestor::tei:l" + test = + "(ancestor::tei:l or ancestor::tei:lg) and not(ancestor::tei:floatingText)" "\x{a}" ~ - " Abstract model violation: Lines may not contain higher-level structural elements such as div.\x{a}" ~ + " Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~ " " ] "\x{a}" ~ @@ -4691,9 +4715,9 @@ tei_div = " " sch:report [ test = - "ancestor::tei:p or ancestor::tei:ab and not(ancestor::tei:floatingText)" + "(ancestor::tei:p or ancestor::tei:ab) and not(ancestor::tei:floatingText)" "\x{a}" ~ - " Abstract model violation: p and ab may not contain higher-level structural elements such as div.\x{a}" ~ + " Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~ " " ] "\x{a}" ~ @@ -5215,9 +5239,10 @@ tei_ab = "\x{a}" ~ " " sch:report [ - test = "ancestor::tei:l or ancestor::tei:lg" + test = + "(ancestor::tei:l or ancestor::tei:lg) and not(parent::tei:figure or parent::tei:note or ancestor::tei:floatingText)" "\x{a}" ~ - " Abstract model violation: Lines may not contain higher-level divisions such as p or ab.\x{a}" ~ + " Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.\x{a}" ~ " " ] "\x{a}" ~ diff --git a/Test/expected-results/test35.rnc b/Test/expected-results/test35.rnc index 4498b3a27..a8df6ddfc 100644 --- a/Test/expected-results/test35.rnc +++ b/Test/expected-results/test35.rnc @@ -1486,7 +1486,7 @@ tei_model.stageLike_sequenceOptional = tei_stage? tei_model.stageLike_sequenceOptionalRepeatable = tei_stage* tei_model.stageLike_sequenceRepeatable = tei_stage+ tei_model.entryPart = notAllowed -tei_model.global.edit = tei_gap +tei_model.global.edit = tei_gap | tei_ellipsis tei_model.divPart = tei_model.lLike | tei_model.pLike | tei_lg | tei_sp tei_model.placeNamePart = notAllowed tei_model.placeNamePart_alternation = notAllowed @@ -1750,17 +1750,6 @@ tei_model.standOffPart = | tei_listChange | tei_seg | tei_listAnnotation -tei_att.citeStructurePart.attributes = - tei_att.citeStructurePart.attribute.use -tei_att.citeStructurePart.attribute.use = - [ - a:documentation [ - "(use) supplies an XPath selection pattern using the syntax defined in . The XPath pattern is relative to the context given in " - ns1:code [ "@match" ] - ", which will either be a sibling attribute in the case of `` or on the parent `` in the case of ``." - ] - ] - attribute use { text } tei_att.formula.attributes = tei_att.formula.attribute.formula tei_att.formula.attribute.formula = [ @@ -1771,6 +1760,18 @@ tei_att.formula.attribute.formula = ] ] attribute formula { text }? +tei_att.locatable.attributes = tei_att.locatable.attribute.where +tei_att.locatable.attribute.where = + [ + a:documentation [ + "indicates one or more locations by pointing to a " + ns1:code [ "" ] + " element or other canonical description." + ] + ] + attribute where { + list { xsd:anyURI+ } + }? tei_model.correspActionPart = tei_model.dateLike | tei_model.addressLike @@ -1898,9 +1899,9 @@ tei_p = " " sch:report [ test = - "ancestor::tei:l[not(.//tei:note//tei:p[. = current()])]" + "(ancestor::tei:l or ancestor::tei:lg) and not(parent::tei:figure or parent::tei:note or ancestor::tei:floatingText)" "\x{a}" ~ - " Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab.\x{a}" ~ + " Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.\x{a}" ~ " " ] "\x{a}" ~ @@ -2326,6 +2327,16 @@ tei_gap = }?, empty } +tei_ellipsis = + + ## (deliberately marked omission) indicates a purposeful marking in the source document signalling that content has been omitted, and may also supply or describe the omitted content. [3.5.3. Additions, Deletions, and Omissions] + element tei:ellipsis { + tei_model.descLike?, + tei_att.global.attributes, + tei_att.dimensions.attributes, + tei_att.timed.attributes, + empty + } tei_add = ## (addition) contains letters, words, or phrases inserted in the source text by an author, scribe, or a previous annotator or corrector. [3.5.3. Additions, Deletions, and Omissions] @@ -3403,6 +3414,17 @@ tei_textLang = }?, empty } +tei_att.citeStructurePart.attributes = + tei_att.citeStructurePart.attribute.use +tei_att.citeStructurePart.attribute.use = + [ + a:documentation [ + "(use) supplies an XPath selection pattern using the syntax defined in . The XPath pattern is relative to the context given in " + ns1:code [ "@match" ] + ", which will either be a sibling attribute in the case of `` or on the parent `` in the case of ``." + ] + ] + attribute use { text } tei_att.patternReplacement.attributes = tei_att.patternReplacement.attribute.matchPattern, tei_att.patternReplacement.attribute.replacementPattern @@ -4255,6 +4277,7 @@ tei_conversion = tei_att.global.attributes, tei_att.datable.attributes, tei_att.formula.attributes, + tei_att.locatable.attributes, [ a:documentation [ "indicates a source unit of measure that is to be converted into another unit indicated in " @@ -4646,9 +4669,10 @@ tei_div = "\x{a}" ~ " " sch:report [ - test = "ancestor::tei:l" + test = + "(ancestor::tei:l or ancestor::tei:lg) and not(ancestor::tei:floatingText)" "\x{a}" ~ - " Abstract model violation: Lines may not contain higher-level structural elements such as div.\x{a}" ~ + " Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~ " " ] "\x{a}" ~ @@ -4667,9 +4691,9 @@ tei_div = " " sch:report [ test = - "ancestor::tei:p or ancestor::tei:ab and not(ancestor::tei:floatingText)" + "(ancestor::tei:p or ancestor::tei:ab) and not(ancestor::tei:floatingText)" "\x{a}" ~ - " Abstract model violation: p and ab may not contain higher-level structural elements such as div.\x{a}" ~ + " Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText.\x{a}" ~ " " ] "\x{a}" ~ @@ -5191,9 +5215,10 @@ tei_ab = "\x{a}" ~ " " sch:report [ - test = "ancestor::tei:l or ancestor::tei:lg" + test = + "(ancestor::tei:l or ancestor::tei:lg) and not(parent::tei:figure or parent::tei:note or ancestor::tei:floatingText)" "\x{a}" ~ - " Abstract model violation: Lines may not contain higher-level divisions such as p or ab.\x{a}" ~ + " Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.\x{a}" ~ " " ] "\x{a}" ~ diff --git a/Test/expected-results/testdrama.compiled.xml b/Test/expected-results/testdrama.compiled.xml index 5654efa6d..a7caa3538 100644 --- a/Test/expected-results/testdrama.compiled.xml +++ b/Test/expected-results/testdrama.compiled.xml @@ -227,7 +227,7 @@ 8.3. Elements Unique to Spoken Texts - provides attributes which can be used to associate a representation such as a name or title + provides attributes that can be used to associate a representation such as a name or title with canonical information about the object being named or referenced. fournit des attributs qui peuvent être utilisés pour associer une représentation telle qu'un nom ou un titre à l'information canonique concernant @@ -497,7 +497,7 @@ The MS. was lost in transmission by mail from - provides an attribute to indicate the hand in which + provides attributes to indicate the hand in which the content of an element was written in the source being transcribed. @@ -527,7 +527,7 @@ The MS. was lost in transmission by mail from 1.3.1. Attribute Classes - provides an attribute to indicate whether or not the element + provides attributes to indicate whether or not the element concerned is considered to mark the end of an orthographic token in the same way as whitespace. fournit un attribut pour indiquer si un élément est @@ -590,7 +590,7 @@ of any adjacent whitespace Elements - provides an attribute which may be used to supply a + provides attributes that may be used to supply a canonical reference as a means of identifying the target of a pointer. ポインタのターゲットを識別する手段としてcanonical referenceを提供するために使用される属性を提供する。 @@ -1000,11 +1000,10 @@ Elements 13.4. Dates - provides the dcr:datacat and - dcr:ValueDatacat attributes which are used to + provides attributes that are used to align XML elements or attributes with the appropriate Data Categories (DCs) defined by the ISO 12620:2009 - standard and stored in the Web repository called ISOCat at http://www.isocat.org/. - dcr:datacat属性とdcr:ValueDatacat属性を提供する．これらがXML要素や属性を連携させる日付分類は、国際標準ISO 12620:2009で定義されるものであり，http://www.isocat.org/にあるISOCatと呼ばれるWebリポジトリに格納されている． + standard and stored in the Web repository called ISOCat at . + dcr:datacat属性とdcr:ValueDatacat属性を提供する．これらがXML要素や属性を連携させる日付分類は、国際標準ISO 12620:2009で定義されるものであり，にあるISOCatと呼ばれるWebリポジトリに格納されている． contains a PID (persistent identifier) that aligns the given element with the appropriate @@ -1040,11 +1039,11 @@ Elements their schemas that make use of data categories from a DCR should refer to them using this PID. For XML-based resources, like TEI documents, ISO 12620:2009 normative Annex A gives a small Data Category Reference XML vocabulary (also available online - at http://www.isocat.org/12620/), + at ), which provides two attributes, dcr:datcat and dcr:valueDatcat.

    -

    ISO 12620:2009は、データ分類のレジストリ（DCR）に関するデータモデルと手続きについての国際標準である．データ分類は，一つの言語の構造における基本的な記述子として定義される。DCRのデータモデルでは、個々のデータ分類には、ユニークな永続的識別子（PID)、つまり、URIが割り当てられる．DCRからデータ分類を利用する言語資源，あるいは、できることならそのスキーマは、このPIDを用いて参照すべきである。TEI文書のようなXMLベースの資源(https://www.iso.org/standard/37243.htmlにて参照可能)に関しては、ISO 12620:2009 付録 Aに、dcr:datcat属性とdcr:valueDatcat属性を提供する小さなデータ分類参照のXML語彙がある。

     +

    ISO 12620:2009は、データ分類のレジストリ（DCR）に関するデータモデルと手続きについての国際標準である．データ分類は，一つの言語の構造における基本的な記述子として定義される。DCRのデータモデルでは、個々のデータ分類には、ユニークな永続的識別子（PID)、つまり、URIが割り当てられる．DCRからデータ分類を利用する言語資源，あるいは、できることならそのスキーマは、このPIDを用いて参照すべきである。TEI文書のようなXMLベースの資源(にて参照可能)に関しては、ISO 12620:2009 付録 Aに、dcr:datcat属性とdcr:valueDatcat属性を提供する小さなデータ分類参照のXML語彙がある。

     9.5.2. Lexical View 18.3. Other Atomic Feature Values @@ -1188,7 +1187,7 @@ Information with a Text Information with a Text     - provides an attribute for representing + provides attributes for representing fragmentation of a structural element, typically as a consequence of some overlapping hierarchy. 通常は階層関係のオーバーラップなどに起因する、構造を持つ要素の断片化を表現するための属性を与える。 @@ -1778,7 +1777,7 @@ the TEI header.

    1.3.1.1.3. Rendition Indicators     - provides an attribute used by elements to point to an + provides attributes used by elements to point to an external source. 外部ソースを参照する要素によって用いられる属性を示す。 @@ -2844,7 +2843,7 @@ this name in the form of a set of whitespace-separated values, for example the o 13.3.6. Names and Nyms - provides an attribute to indicate any specialised notation used for element content. + provides attributes to indicate any specialised notation used for element content. @@ -2985,7 +2984,7 @@ this name in the form of a set of whitespace-separated values, for example the o 11.3.1.4. Additions and Deletions - provides attributes which can be used to classify or subclassify elements in any way. + provides attributes that can be used to classify or subclassify elements in any way. 요소의 분류 또는 하위분류에서 사용될 수 있는 속성을 제공한다. 提供可依任何方法將元素分類或次要分類的一般屬性。 要素を分類するための属性を示す． @@ -6581,23 +6580,7 @@ which contain an XPath expression. - - provides attributes for selecting particular elements - within a document. - - - use - supplies an XPath selection pattern using the - syntax defined in . The XPath pattern is relative to the context given - in match, which will either be a sibling attribute in the case of - citeStructure or on the parent citeStructure in the case of - citeData. - - - - - - + provides attributes for defining a mathematical formula. @@ -6658,6 +6641,21 @@ which contain an XPath expression. 2.3.9. The Unit Declaration + + provides attributes for referencing locations by pointing to entries in a canonical list of places. + + + indicates one or more locations by pointing to a place element or other canonical description. + indique une ou plusieurs localisations en pointant vers un élément place ou autre description canonique. + indica una o más localizaciónes señalando un elemento place u otra descripción canónica. + indica una o più posizioni facendo riferimento a un elemento place o altra descrizione canonica. + + + + + 2.3.9. The Unit Declaration + 13.3.4.3. States, Traits, and Events + groups elements which define the parts (usually names, dates and places) of one action related to the correspondence. @@ -6860,7 +6858,7 @@ one initial. Information interchange — Representation of dates and times.

    - provides an attribute to indicate the type of section which is changing at a specific milestone. + provides attributes to indicate the type of section which is changing at a specific milestone. provides a conventional name for the kind of section changing at this milestone. @@ -7084,8 +7082,8 @@ Elements - - Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab. + + Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText. @@ -8476,7 +8474,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches... - +

    The word 入学試験 nyūgakushiken (university entrance exam) is glossed with a hiragana phonation guide.

    @@ -8527,7 +8525,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches... - +

    The word 你 好 nǐ hǎo (hello) is glossed in pinyin to provide a pronunciation guide.

    @@ -8620,7 +8618,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...     - +

    The word 大統領 daitōryō (president) is glossed character by character in hiragana to provide a pronunciation guide.

    @@ -9396,6 +9394,91 @@ Normalization 3.5.3. Additions, Deletions, and Omissions + + deliberately marked omission + indicates a purposeful + marking in the source document signalling that content has been + omitted, and may also supply or describe the omitted content. + + + + + + + + + + + + + + + + + What projects men make—what queer turns they take, + Since steam has improved our condition; + They never are still, but must cure or must kill + With steam physic or steam ammunition. + But a short time ago, to a quack you would go, + To steam a fat man to a thinner; + Now changed from all that, if you wish to get fat, + Come to Barton’s and eat a steam dinner! + Oh dear! think of a scheme, odd though it seem— + I’m sure ’twill succeed if you make it by steam. + + + You may sleep, you may dream, you may travel by steam, + For the outcry is still to go faster; + And what does it reck, should you e’en break your neck, + If ’tis steam that brings on the disaster? + + * * * * + The printer omits four lines here, + skipping the second half of the second octave, before the refrain. + + Oh dear! think of a scheme, odd though it seem— + I’m sure ’twill succeed if you make it by steam. + + + + + + + You think you’ve lost your love + Well, I saw her yesterday + It’s you she's thinking of + And she told me what to say + + + + She says she loves you + And you know that can’t be bad + Yes, she loves you + And you know you should be glad + + + She said you hurt her so + She almost lost her mind + But now she said she knows + You’re not the hurting kind + + + ****** + + + + + +

    Unlike gap, which indicates content that the encoder + cannot or chooses not to represent, ellipsis indicates a + passage explicitly signalled in the source document as absent. The + ellipsis element is not appropriate for every use of + ellipsis points, such as when they indicate that a speaker is + pausing.

    +     + + 3.5.3. Additions, Deletions, and Omissions +     addition 삽입, 첨가 @@ -16702,7 +16785,23 @@ element in the TEI header. 3.12.2.4. Imprint, Size of a Document, and Reprint Information 10.6.6. Languages and Writing Systems - + + provides attributes for selecting particular elements + within a document. + + + use + supplies an XPath selection pattern using the + syntax defined in . The XPath pattern is relative to the context given + in match, which will either be a sibling attribute in the case of + citeStructure or on the parent citeStructure in the case of + citeData. + + + + + + provides attributes for regular-expression matching and replacement. @@ -21270,6 +21369,7 @@ codes used elsewhere in the text. + @@ -24138,15 +24238,15 @@ during the evolution of the encoded representation of that text.

    - - Abstract model violation: Lines may not contain higher-level structural elements such as div. + + Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText. - - Abstract model violation: p and ab may not contain higher-level structural elements such as div. + + Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText. @@ -27808,8 +27908,8 @@ the date of the entire document, not for any subset or part of it.

    - - Abstract model violation: Lines may not contain higher-level divisions such as p or ab. + + Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText. From d111535d72fb840cf7859f7f0191d152093b0954 Mon Sep 17 00:00:00 2001 From: helenasabel Date: Fri, 27 Aug 2021 22:11:56 +0200 Subject: [PATCH 3/3] update of expected results in Test2 --- Test2/expected-results/testPure1.rng | 65 ++++++++++++++----- .../testPure1InvalidInstanceRngMessages.txt | 12 ++-- 2 files changed, 54 insertions(+), 23 deletions(-) diff --git a/Test2/expected-results/testPure1.rng b/Test2/expected-results/testPure1.rng index 773c181fd..3af8fee5e 100644 --- a/Test2/expected-results/testPure1.rng +++ b/Test2/expected-results/testPure1.rng @@ -2407,6 +2407,7 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line; + @@ -2997,15 +2998,6 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line; - - - - - - (use) supplies an XPath selection pattern using the syntax defined in . The XPath pattern is relative to the context given in @match, which will either be a sibling attribute in the case of `<citeStructure>` or on the parent `<citeStructure>` in the case of `<citeData>`. - - - @@ -3017,6 +3009,21 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line; + + + + + + + indicates one or more locations by pointing to a <place> element or other canonical description. + + + + + + + + @@ -3143,8 +3150,8 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant - Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab. + test="(ancestor::tei:l or ancestor::tei:lg) and not(parent::tei:figure or parent::tei:note or ancestor::tei:floatingText)"> + Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText. @@ -3586,6 +3593,20 @@ Sample values include: 1] rubbing (rubbing); 2] mildew (mildew); 3] smoke (smoke + + + (deliberately marked omission) indicates a purposeful marking in the source document signalling that content has been omitted, and may also supply or describe the omitted content. [3.5.3. Additions, Deletions, and Omissions] + + + + + + + + + + + (addition) contains letters, words, or phrases inserted in the source text by an author, scribe, or a previous annotator or corrector. [3.5.3. Additions, Deletions, and Omissions] @@ -4850,6 +4871,15 @@ Sample values include: 1] index; 2] toc; 3] figlist; 4] tablist + + + + + + (use) supplies an XPath selection pattern using the syntax defined in . The XPath pattern is relative to the context given in @match, which will either be a sibling attribute in the case of `<citeStructure>` or on the parent `<citeStructure>` in the case of `<citeData>`. + + + @@ -5893,6 +5923,7 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr + indicates a source unit of measure that is to be converted into another unit indicated in @toUnit. @@ -6821,8 +6852,8 @@ Sample values include: 1] image; 2] character; 3] theme; 4] allusion - Abstract model violation: Lines may not contain higher-level divisions such as p or ab. + test="(ancestor::tei:l or ancestor::tei:lg) and not(parent::tei:figure or parent::tei:note or ancestor::tei:floatingText)"> + Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText. @@ -7511,8 +7542,8 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec - Abstract model violation: Lines may not contain higher-level structural elements such as div. + test="(ancestor::tei:l or ancestor::tei:lg) and not(ancestor::tei:floatingText)"> + Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText. @@ -7521,8 +7552,8 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec - Abstract model violation: p and ab may not contain higher-level structural elements such as div. + test="(ancestor::tei:p or ancestor::tei:ab) and not(ancestor::tei:floatingText)"> + Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText. diff --git a/Test2/expected-results/testPure1InvalidInstanceRngMessages.txt b/Test2/expected-results/testPure1InvalidInstanceRngMessages.txt index cf1d10eaa..e69ec1ff9 100644 --- a/Test2/expected-results/testPure1InvalidInstanceRngMessages.txt +++ b/Test2/expected-results/testPure1InvalidInstanceRngMessages.txt @@ -1,5 +1,5 @@ -/invalidInstances/testPure1InvalidInstance.xml:29:51: error: element "tag" not allowed anywhere; expected the element end-tag, text or element "abbr", "add", "address", "alt", "altGrp", "anchor", "att", "bibl", "biblFull", "binaryObject", "c", "cb", "choice", "cit", "cl", "corr", "date", "del", "desc", "distinct", "email", "emph", "expan", "floatingText", "foreign", "gap", "gb", "gi", "gloss", "graphic", "hi", "idno", "index", "interp", "interpGrp", "l", "label", "lb", "lg", "link", "linkGrp", "list", "listBibl", "m", "measure", "measureGrp", "media", "mentioned", "milestone", "name", "note", "noteGrp", "num", "orgName", "orig", "pb", "pc", "persName", "phr", "placeName", "ptr", "q", "quote", "ref", "reg", "rs", "ruby", "s", "said", "seg", "sic", "soCalled", "span", "spanGrp", "stage", "term", "time", "timeline", "title", "unclear", "unit", "val" or "w" -/invalidInstances/testPure1InvalidInstance.xml:38:33: error: element "joinGrp" not allowed anywhere; expected the element end-tag or element "ab", "alt", "altGrp", "anchor", "argument", "bibl", "biblFull", "byline", "cb", "cit", "closer", "dateline", "desc", "div", "divGen", "docAuthor", "docDate", "epigraph", "floatingText", "gap", "gb", "index", "interp", "interpGrp", "l", "label", "lb", "lg", "link", "linkGrp", "list", "listBibl", "meeting", "milestone", "note", "noteGrp", "p", "pb", "postscript", "q", "quote", "said", "salute", "signed", "sp", "span", "spanGrp", "stage", "timeline" or "trailer" +/invalidInstances/testPure1InvalidInstance.xml:29:51: error: element "tag" not allowed anywhere; expected the element end-tag, text or element "abbr", "add", "address", "alt", "altGrp", "anchor", "att", "bibl", "biblFull", "binaryObject", "c", "cb", "choice", "cit", "cl", "corr", "date", "del", "desc", "distinct", "ellipsis", "email", "emph", "expan", "floatingText", "foreign", "gap", "gb", "gi", "gloss", "graphic", "hi", "idno", "index", "interp", "interpGrp", "l", "label", "lb", "lg", "link", "linkGrp", "list", "listBibl", "m", "measure", "measureGrp", "media", "mentioned", "milestone", "name", "note", "noteGrp", "num", "orgName", "orig", "pb", "pc", "persName", "phr", "placeName", "ptr", "q", "quote", "ref", "reg", "rs", "ruby", "s", "said", "seg", "sic", "soCalled", "span", "spanGrp", "stage", "term", "time", "timeline", "title", "unclear", "unit", "val" or "w" +/invalidInstances/testPure1InvalidInstance.xml:38:33: error: element "joinGrp" not allowed anywhere; expected the element end-tag or element "ab", "alt", "altGrp", "anchor", "argument", "bibl", "biblFull", "byline", "cb", "cit", "closer", "dateline", "desc", "div", "divGen", "docAuthor", "docDate", "ellipsis", "epigraph", "floatingText", "gap", "gb", "index", "interp", "interpGrp", "l", "label", "lb", "lg", "link", "linkGrp", "list", "listBibl", "meeting", "milestone", "note", "noteGrp", "p", "pb", "postscript", "q", "quote", "said", "salute", "signed", "sp", "span", "spanGrp", "stage", "timeline" or "trailer" /invalidInstances/testPure1InvalidInstance.xml:44:34: error: attribute "synch" not allowed here; expected attribute "ana", "cert", "copyOf", "corresp", "decls", "exclude", "hand", "n", "next", "part", "prev", "rend", "rendition", "resp", "sameAs", "select", "source", "style", "xml:base", "xml:id", "xml:lang" or "xml:space" /invalidInstances/testPure1InvalidInstance.xml:50:33: error: attribute "type" not allowed here; expected attribute "ana", "cert", "copyOf", "corresp", "exclude", "n", "next", "prev", "rend", "rendition", "resp", "sameAs", "select", "sortKey", "source", "style", "xml:base", "xml:id", "xml:lang" or "xml:space" /invalidInstances/testPure1InvalidInstance.xml:62:47: error: value of attribute "corresp" is invalid; must be an integer @@ -12,8 +12,8 @@ /invalidInstances/testPure1InvalidInstance.xml:115:60: error: element "biblStruct" not allowed anywhere; expected the element end-tag or element "anchor", "bibl", "biblFull", "cb", "gb", "lb", "listBibl", "milestone" or "pb" /invalidInstances/testPure1InvalidInstance.xml:117:34: error: element "biblStruct" not allowed anywhere; expected the element end-tag or element "anchor", "bibl", "biblFull", "cb", "gb", "lb", "listBibl", "milestone" or "pb" /invalidInstances/testPure1InvalidInstance.xml:127:12: error: element "w" missing required attribute "ana" -/invalidInstances/testPure1InvalidInstance.xml:137:53: error: element "addName" not allowed anywhere; expected the element end-tag, text or element "abbr", "add", "address", "alt", "altGrp", "anchor", "att", "binaryObject", "c", "cb", "choice", "cit", "cl", "corr", "date", "del", "distinct", "email", "emph", "expan", "floatingText", "foreign", "gap", "gb", "gi", "gloss", "graphic", "hi", "idno", "index", "interp", "interpGrp", "lb", "link", "linkGrp", "m", "measure", "measureGrp", "media", "mentioned", "milestone", "name", "note", "noteGrp", "num", "orgName", "orig", "pb", "pc", "persName", "phr", "placeName", "ptr", "q", "quote", "ref", "reg", "rs", "ruby", "s", "said", "seg", "sic", "soCalled", "span", "spanGrp", "term", "time", "timeline", "title", "unclear", "unit", "val" or "w" -/invalidInstances/testPure1InvalidInstance.xml:141:13: error: element "div1" not allowed anywhere; expected the element end-tag or element "alt", "altGrp", "anchor", "argument", "byline", "cb", "closer", "dateline", "div", "divGen", "docAuthor", "docDate", "epigraph", "gap", "gb", "index", "interp", "interpGrp", "lb", "link", "linkGrp", "meeting", "milestone", "note", "noteGrp", "pb", "postscript", "salute", "signed", "span", "spanGrp", "timeline" or "trailer" -/invalidInstances/testPure1InvalidInstance.xml:142:46: error: element "div1" not allowed anywhere; expected the element end-tag or element "alt", "altGrp", "anchor", "argument", "byline", "cb", "closer", "dateline", "div", "divGen", "docAuthor", "docDate", "epigraph", "gap", "gb", "index", "interp", "interpGrp", "lb", "link", "linkGrp", "meeting", "milestone", "note", "noteGrp", "pb", "postscript", "salute", "signed", "span", "spanGrp", "timeline" or "trailer" -/invalidInstances/testPure1InvalidInstance.xml:143:45: error: element "div1" not allowed anywhere; expected the element end-tag or element "alt", "altGrp", "anchor", "argument", "byline", "cb", "closer", "dateline", "div", "divGen", "docAuthor", "docDate", "epigraph", "gap", "gb", "index", "interp", "interpGrp", "lb", "link", "linkGrp", "meeting", "milestone", "note", "noteGrp", "pb", "postscript", "salute", "signed", "span", "spanGrp", "timeline" or "trailer" +/invalidInstances/testPure1InvalidInstance.xml:137:53: error: element "addName" not allowed anywhere; expected the element end-tag, text or element "abbr", "add", "address", "alt", "altGrp", "anchor", "att", "binaryObject", "c", "cb", "choice", "cit", "cl", "corr", "date", "del", "distinct", "ellipsis", "email", "emph", "expan", "floatingText", "foreign", "gap", "gb", "gi", "gloss", "graphic", "hi", "idno", "index", "interp", "interpGrp", "lb", "link", "linkGrp", "m", "measure", "measureGrp", "media", "mentioned", "milestone", "name", "note", "noteGrp", "num", "orgName", "orig", "pb", "pc", "persName", "phr", "placeName", "ptr", "q", "quote", "ref", "reg", "rs", "ruby", "s", "said", "seg", "sic", "soCalled", "span", "spanGrp", "term", "time", "timeline", "title", "unclear", "unit", "val" or "w" +/invalidInstances/testPure1InvalidInstance.xml:141:13: error: element "div1" not allowed anywhere; expected the element end-tag or element "alt", "altGrp", "anchor", "argument", "byline", "cb", "closer", "dateline", "div", "divGen", "docAuthor", "docDate", "ellipsis", "epigraph", "gap", "gb", "index", "interp", "interpGrp", "lb", "link", "linkGrp", "meeting", "milestone", "note", "noteGrp", "pb", "postscript", "salute", "signed", "span", "spanGrp", "timeline" or "trailer" +/invalidInstances/testPure1InvalidInstance.xml:142:46: error: element "div1" not allowed anywhere; expected the element end-tag or element "alt", "altGrp", "anchor", "argument", "byline", "cb", "closer", "dateline", "div", "divGen", "docAuthor", "docDate", "ellipsis", "epigraph", "gap", "gb", "index", "interp", "interpGrp", "lb", "link", "linkGrp", "meeting", "milestone", "note", "noteGrp", "pb", "postscript", "salute", "signed", "span", "spanGrp", "timeline" or "trailer" +/invalidInstances/testPure1InvalidInstance.xml:143:45: error: element "div1" not allowed anywhere; expected the element end-tag or element "alt", "altGrp", "anchor", "argument", "byline", "cb", "closer", "dateline", "div", "divGen", "docAuthor", "docDate", "ellipsis", "epigraph", "gap", "gb", "index", "interp", "interpGrp", "lb", "link", "linkGrp", "meeting", "milestone", "note", "noteGrp", "pb", "postscript", "salute", "signed", "span", "spanGrp", "timeline" or "trailer" /invalidInstances/testPure1InvalidInstance.xml:148:73: error: character content of element "email" invalid; must be equal to "amourdecosmos@gmail.com" or "thevenerablebede@gmail.com"