diff --git a/Test/expected-results/oddbyexample.odd b/Test/expected-results/oddbyexample.odd index af51a4650..3e543a313 100644 --- a/Test/expected-results/oddbyexample.odd +++ b/Test/expected-results/oddbyexample.odd @@ -169,6 +169,7 @@ + diff --git a/Test/expected-results/test.isosch b/Test/expected-results/test.isosch index ef28fd272..0b2c28ce8 100644 --- a/Test/expected-results/test.isosch +++ b/Test/expected-results/test.isosch @@ -86,25 +86,34 @@ The element indicated by @spanTo () must follow the - + + + Information about a + deprecation should only be present in a specification element + that is being deprecated: that is, only an element that has a + @validUntil attribute should have a child <desc + type="deprecationInfo">. + + + Only one of the attributes @target and @cRef may be supplied on . - + Only one of the attributes @target' and @cRef' may be supplied on - + The content of a "gloss" list should include a sequence of one or more pairs of a label element followed by an item element - + If the @target attribute on is used, the @@ -113,33 +122,33 @@ relatedItem element must be empty or a child element to indicate the related bibliographic item - + Abstract model violation: Lines may not contain lines or lg elements. - + An lg element must contain at least one child l, lg or gap element. - + Abstract model violation: Lines may not contain line groups. - + On , either the @marks attribute should be used, or a paragraph of description provided - + @@ -154,23 +163,23 @@ On , either the @marks attribute should be used, or a paragraph of descri the zone element rather than the path element. - + The @spanTo attribute of is required. - + The @spanTo attribute of is required. - + The @spanTo attribute of is required. - + must have at least one child add and at least one child del @@ -180,41 +189,41 @@ The @spanTo attribute of is required. - + Abstract model violation: Lines 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. - + You must supply at least two values for @target or on - + Abstract model violation: ab may not occur inside paragraphs or other ab elements. - + Abstract model violation: Lines may not contain higher-level divisions such as p or ab. - + You must supply at least two values for @target on diff --git a/Test/expected-results/test.odd.html b/Test/expected-results/test.odd.html index 91067da6b..53a981525 100644 --- a/Test/expected-results/test.odd.html +++ b/Test/expected-results/test.odd.html @@ -147,10 +147,10 @@

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] - att.datable: provides attributes for normalization of elements that contain dates, times, or datable events. [3.5.4. Dates and Times 13.3.6. Dates and Times] + att.datable: provides attributes for normalization of elements that contain dates, times, or datable events. [3.5.4. Dates and Times 13.3.7. Dates and Times] - 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.5.4. Dates and Times 13.3.6. Dates and Times] + 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.5.4. Dates and Times 13.3.7. Dates and Times] 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] @@ -210,7 +210,7 @@

att.internetMedia: provides attributes for specifying the type of a computer resource using a standard taxonomy. - att.lexicographic: provides a set of attributes common to all elements in the dictionary module. [9.2. The Structure of Dictionary Entries] + 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.measurement: provides attributes to represent a regularized or normalized measurement. @@ -222,7 +222,7 @@

att.milestoneUnit: provides an attribute to indicate the type of section which is changing at a specific milestone. [3.10.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.5.1. Referring Strings 13.3.5. Names and Nyms] + att.naming: provides attributes common to elements which refer to named persons, places, organizations etc. [3.5.1. Referring Strings 13.3.6. Names and Nyms] att.notated: provides an attribute to indicate any specialised notation used for element content. @@ -390,7 +390,7 @@

damageSpan: (damaged span of text) marks the beginning of a longer sequence of text which is damaged in some way but still legible. [11.3.3.1. Damage, Illegibility, and Supplied Text] - date: contains a date in any format. [3.5.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.11.2.4. Imprint, Size of a Document, and Reprint Information 15.2.3. The Setting Description 13.3.6. Dates and Times] + date: contains a date in any format. [3.5.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.11.2.4. Imprint, Size of a Document, and Reprint Information 15.2.3. The Setting Description 13.3.7. Dates and Times] dateline: contains a brief description of the place, date, time, etc. of production of a letter, newspaper story, or other work, prefixed or suffixed to it as a kind of heading or trailer. [4.2.2. Openers and Closers] @@ -774,7 +774,7 @@

model.correspDescPart: groups together metadata elements for describing correspondence - model.dateLike: groups elements containing temporal expressions. [3.5.4. Dates and Times 13.3.6. Dates and Times] + model.dateLike: groups elements containing temporal expressions. [3.5.4. Dates and Times 13.3.7. Dates and Times] model.descLike: groups elements which contain a description of their function. diff --git a/Test/expected-results/test.rng b/Test/expected-results/test.rng index f4c06962a..78021c308 100644 --- a/Test/expected-results/test.rng +++ b/Test/expected-results/test.rng @@ -29,6 +29,7 @@ + @@ -1385,44 +1386,6 @@ The element indicated by @spanTo () must follow - - - - - - - - - indicates the kind of information held in this cell or in each cell of this row. -Suggested values include: 1] label; 2] data - - label - labelling or descriptive information only. - data - data values. - - (\p{L}|\p{N}|\p{P}|\p{S})+ - - - - - - - - - indicates the number of rows occupied by this cell or row. - - - - - - - - (columns) indicates the number of columns occupied by this cell or row. - - - - @@ -3554,9 +3517,26 @@ Suggested values include: 1] spoken; 2] thought; 3] written; 4] soCalled; 5] for (description) contains a brief description of the object documented by its parent element, typically a documentation element or an entity. [22.4.1. Description of Components] + + + Information about a + deprecation should only be present in a specification element + that is being deprecated: that is, only an element that has a + @validUntil attribute should have a child <desc + type="deprecationInfo">. + + - + + + + characterizes the element in some sense, using any convenient classification scheme or typology. + + (\p{L}|\p{N}|\p{P}|\p{S})+ + + + @@ -3929,7 +3909,7 @@ Measures] - contains a date in any format. [3.5.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.11.2.4. Imprint, Size of a Document, and Reprint Information 15.2.3. The Setting Description 13.3.6. Dates and Times] + contains a date in any format. [3.5.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.11.2.4. Imprint, Size of a Document, and Reprint Information 15.2.3. The Setting Description 13.3.7. Dates and Times] @@ -3939,6 +3919,7 @@ Measures] + @@ -4080,7 +4061,7 @@ attributes @target and @cRef may be supplied on . - + The content of a "gloss" list should include a sequence of one or more pairs of a label element followed by an item element @@ -4749,7 +4730,7 @@ If the @target attribute on is used, the relatedItem element must be empty - + A relatedItem element should have either a 'target' attribute or a child element to indicate the related bibliographic item @@ -4824,7 +4805,7 @@ relatedItem element must be empty - + An lg element must contain at least one child l, lg or gap element. @@ -6524,7 +6505,7 @@ Sample values include: 1] glued; 2] pinned; 3] sewn defines any line passing through two or more points within a surface element. [11.1. Digital Facsimiles 11.2.2. Embedded Transcription] - + @@ -6570,12 +6551,12 @@ Sample values include: 1] glued; 2] pinned; 3] sewn (added span of text) marks the beginning of a longer sequence of text added by an author, scribe, annotator or corrector (see also add). [11.3.1.4. Additions and Deletions] - + The @spanTo attribute of is required. - + L'attribut spanTo est requis. @@ -6603,13 +6584,13 @@ Sample values include: 1] glued; 2] pinned; 3] sewn (damaged span of text) marks the beginning of a longer sequence of text which is damaged in some way but still legible. [11.3.3.1. Damage, Illegibility, and Supplied Text] - + The @spanTo attribute of is required. - + L'attribut spanTo est requis. @@ -6625,12 +6606,12 @@ The @spanTo attribute of is required. (deleted span of text) marks the beginning of a longer sequence of text deleted, marked as deleted, or otherwise signaled as superfluous or spurious by an author, scribe, annotator, or corrector. [11.3.1.4. Additions and Deletions] - + The @spanTo attribute of is required. - + L'attribut spanTo est requis. @@ -6789,7 +6770,7 @@ Sample values include: 1] header; 2] footer; 3] pageNum (page number) ; 4] lineN - + must have at least one child add and at least one child del @@ -8755,7 +8736,7 @@ Suggested values include: 1] main; 2] sub (subordinate) ; 3] alt (alternate) ; 4 defines an association or hypertextual link among elements or passages, of some type not more precisely specifiable by other elements. [16.1. Links] - + You must supply at least two values for @target or on @@ -8956,7 +8937,7 @@ Suggested values include: 1] d (days) ; 2] h (hours) ; 3] min (minutes) ; 4] s ( - + You must supply at least two values for @target on @@ -9091,6 +9072,7 @@ You must supply at least two values for @target on + @@ -9940,6 +9922,44 @@ Sample values include: 1] cap (capital) ; 2] noHyph (no hyphen) + + + + + + + + + indicates the kind of information held in this cell or in each cell of this row. +Suggested values include: 1] label; 2] data + + label + labelling or descriptive information only. + data + data values. + + (\p{L}|\p{N}|\p{P}|\p{S})+ + + + + + + + + + indicates the number of rows occupied by this cell or row. + + + + + + + + (columns) indicates the number of columns occupied by this cell or row. + + + + contains text displayed in tabular form, in rows and columns. [14.1.1. TEI Tables] diff --git a/Test/expected-results/test15.odd.html b/Test/expected-results/test15.odd.html index 4df35155e..d4f429247 100644 --- a/Test/expected-results/test15.odd.html +++ b/Test/expected-results/test15.odd.html @@ -118,7 +118,6 @@

correspDesc date del - desc div1 div2 div3 @@ -169,7 +168,7 @@

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

  • correction/@status
  • correction/@method
  • correspAction/@type
  • +
  • desc/@type
  • distinct/@type
  • div/@typ
  • divGen/@type
  • @@ -1213,10 +1246,10 @@

    - + - + @@ -1276,7 +1309,7 @@

    - + @@ -1426,7 +1459,7 @@

    - + @@ -1711,7 +1744,7 @@

    - + diff --git a/Test/expected-results/test15.odd.rnc b/Test/expected-results/test15.odd.rnc index db59b7ad6..3e90dff26 100644 --- a/Test/expected-results/test15.odd.rnc +++ b/Test/expected-results/test15.odd.rnc @@ -18,7 +18,8 @@ macro.paraContent = | lg | model.lLike)* macro.limitedContent = (text | model.limitedPhrase | model.inter)* -macro.phraseSeq = (text | model.gLike | model.phrase | model.global)* +macro.phraseSeq = + (text | model.gLike | model.qLike | model.phrase | model.global)* macro.phraseSeq.limited = (text | model.limitedPhrase | model.global)* macro.specialPara = (text @@ -1033,32 +1034,6 @@ sch:pattern [ "\x{a}" ~ " " ] -att.tableDecoration.attributes = - att.tableDecoration.attribute.role, - att.tableDecoration.attribute.rows, - att.tableDecoration.attribute.cols -att.tableDecoration.attribute.role = - - ## indicates the kind of information held in this cell or in each cell of this row. - ## Suggested values include: 1] label; 2] data - [ a:defaultValue = "data" ] - attribute role { - - ## labelling or descriptive information only. - "label" - | - ## data values. - "data" - | xsd:token { pattern = "(\p{L}|\p{N}|\p{P}|\p{S})+" } - }? -att.tableDecoration.attribute.rows = - - ## indicates the number of rows occupied by this cell or row. - [ a:defaultValue = "1" ] attribute rows { xsd:nonNegativeInteger }? -att.tableDecoration.attribute.cols = - - ## (columns) indicates the number of columns occupied by this cell or row. - [ a:defaultValue = "1" ] attribute cols { xsd:nonNegativeInteger }? att.timed.attributes = att.timed.attribute.start, att.timed.attribute.end att.timed.attribute.start = @@ -1820,10 +1795,38 @@ desc = ## (description) contains a brief description of the object documented by its parent element, typically a documentation element or an entity. [22.4.1. Description of Components] element desc { - macro.limitedContent, + macro.limitedContent + >> sch:pattern [ + id = + "test15-desc-deprecationInfo-only-in-deprecated-constraint-rule-9" + "\x{a}" ~ + " " + sch:rule [ + context = "tei:desc[ @type eq 'deprecationInfo']" + "\x{a}" ~ + " " + sch:assert [ + test = "../@validUntil" + "Information about a\x{a}" ~ + " deprecation should only be present in a specification element\x{a}" ~ + " that is being deprecated: that is, only an element that has a\x{a}" ~ + " @validUntil attribute should have a child .' + ] + "\x{a}" ~ + " " + ] + "\x{a}" ~ + " " + ], att.global.attributes, att.translatable.attributes, - att.typed.attributes, + att.typed.attribute.subtype, + + ## characterizes the element in some sense, using any convenient classification scheme or typology. + attribute type { + xsd:token { pattern = "(\p{L}|\p{N}|\p{P}|\p{S})+" } + }?, empty } gloss = @@ -2120,10 +2123,11 @@ unit = } date = - ## contains a date in any format. [3.5.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.11.2.4. Imprint, Size of a Document, and Reprint Information 15.2.3. The Setting Description 13.3.6. Dates and Times] + ## contains a date in any format. [3.5.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.11.2.4. Imprint, Size of a Document, and Reprint Information 15.2.3. The Setting Description 13.3.7. Dates and Times] element date { (text | model.gLike | model.phrase | model.global)*, att.global.attributes, + att.canonical.attributes, att.datable.attributes, att.editLike.attributes, att.dimensions.attributes, @@ -2247,7 +2251,7 @@ ref = (model.divBottom, model.global*)*) >> sch:pattern [ id = - "test15-list-gloss-list-must-have-labels-constraint-rule-9" + "test15-list-gloss-list-must-have-labels-constraint-rule-10" "\x{a}" ~ " " sch:rule [ @@ -2728,7 +2732,7 @@ relatedItem = " " ] >> sch:pattern [ - id = "test15-relatedItem-targetorcontent1-constraint-assert-7" + id = "test15-relatedItem-targetorcontent1-constraint-assert-8" "\x{a}" ~ " " sch:rule [ @@ -2796,7 +2800,7 @@ lg = | lg)*, (model.divBottom, model.global*)*) >> sch:pattern [ - id = "test15-lg-atleast1oflggapl-constraint-assert-8" + id = "test15-lg-atleast1oflggapl-constraint-assert-9" "\x{a}" ~ " " sch:rule [ @@ -4373,7 +4377,7 @@ link = element link { empty >> sch:pattern [ - id = "test15-link-linkTargets3-constraint-assert-9" + id = "test15-link-linkTargets3-constraint-assert-10" "\x{a}" ~ " " sch:rule [ @@ -4589,7 +4593,7 @@ join = element join { ((model.descLike | model.certLike)*) >> sch:pattern [ - id = "test15-join-joinTargets3-constraint-assert-10" + id = "test15-join-joinTargets3-constraint-assert-11" "\x{a}" ~ " " sch:rule [ @@ -4692,6 +4696,32 @@ altGrp = }?, empty } +att.tableDecoration.attributes = + att.tableDecoration.attribute.role, + att.tableDecoration.attribute.rows, + att.tableDecoration.attribute.cols +att.tableDecoration.attribute.role = + + ## indicates the kind of information held in this cell or in each cell of this row. + ## Suggested values include: 1] label; 2] data + [ a:defaultValue = "data" ] + attribute role { + + ## labelling or descriptive information only. + "label" + | + ## data values. + "data" + | xsd:token { pattern = "(\p{L}|\p{N}|\p{P}|\p{S})+" } + }? +att.tableDecoration.attribute.rows = + + ## indicates the number of rows occupied by this cell or row. + [ a:defaultValue = "1" ] attribute rows { xsd:nonNegativeInteger }? +att.tableDecoration.attribute.cols = + + ## (columns) indicates the number of columns occupied by this cell or row. + [ a:defaultValue = "1" ] attribute cols { xsd:nonNegativeInteger }? table = ## contains text displayed in tabular form, in rows and columns. [14.1.1. TEI Tables] diff --git a/Test/expected-results/test21.odd.rnc b/Test/expected-results/test21.odd.rnc index 2df6d7319..ddf3d9178 100644 --- a/Test/expected-results/test21.odd.rnc +++ b/Test/expected-results/test21.odd.rnc @@ -18,7 +18,8 @@ macro.paraContent = | lg | model.lLike)* macro.limitedContent = (text | model.limitedPhrase | model.inter)* -macro.phraseSeq = (text | model.gLike | model.phrase | model.global)* +macro.phraseSeq = + (text | model.gLike | model.qLike | model.phrase | model.global)* macro.phraseSeq.limited = (text | model.limitedPhrase | model.global)* macro.specialPara = (text @@ -1500,6 +1501,7 @@ model.listLike = | listPerson | listPlace | listRelation + | listObject | listNym model.listLike_alternation = \list @@ -1508,6 +1510,7 @@ model.listLike_alternation = | listPerson | listPlace | listRelation + | listObject | listNym model.listLike_sequence = \list, @@ -1516,6 +1519,7 @@ model.listLike_sequence = listPerson, listPlace, listRelation, + listObject, listNym model.listLike_sequenceOptional = \list?, @@ -1524,6 +1528,7 @@ model.listLike_sequenceOptional = listPerson?, listPlace?, listRelation?, + listObject?, listNym? model.listLike_sequenceOptionalRepeatable = \list*, @@ -1532,6 +1537,7 @@ model.listLike_sequenceOptionalRepeatable = listPerson*, listPlace*, listRelation*, + listObject*, listNym* model.listLike_sequenceRepeatable = \list+, @@ -1540,6 +1546,7 @@ model.listLike_sequenceRepeatable = listPerson+, listPlace+, listRelation+, + listObject+, listNym+ model.noteLike = note model.lLike = l @@ -1769,6 +1776,7 @@ model.nameLike = | model.placeStateLike | rs | model.persNamePart + | objectName | idno model.nameLike_alternation = model.nameLike.agent_alternation @@ -1776,6 +1784,7 @@ model.nameLike_alternation = | model.placeStateLike_alternation | rs | model.persNamePart_alternation + | objectName | idno model.nameLike_sequence = model.nameLike.agent_sequence, @@ -1783,6 +1792,7 @@ model.nameLike_sequence = model.placeStateLike_sequence, rs, model.persNamePart_sequence, + objectName, idno model.nameLike_sequenceOptional = model.nameLike.agent_sequenceOptional?, @@ -1790,6 +1800,7 @@ model.nameLike_sequenceOptional = model.placeStateLike_sequenceOptional?, rs?, model.persNamePart_sequenceOptional?, + objectName?, idno? model.nameLike_sequenceOptionalRepeatable = model.nameLike.agent_sequenceOptionalRepeatable*, @@ -1797,6 +1808,7 @@ model.nameLike_sequenceOptionalRepeatable = model.placeStateLike_sequenceOptionalRepeatable*, rs*, model.persNamePart_sequenceOptionalRepeatable*, + objectName*, idno* model.nameLike_sequenceRepeatable = model.nameLike.agent_sequenceRepeatable+, @@ -1804,6 +1816,7 @@ model.nameLike_sequenceRepeatable = model.placeStateLike_sequenceRepeatable+, rs+, model.persNamePart_sequenceRepeatable+, + objectName+, idno+ model.global = model.global.meta @@ -1820,6 +1833,7 @@ model.biblPart = | relatedItem | textLang | listRelation + | objectIdentifier | edition | extent | availability @@ -1906,6 +1920,7 @@ model.correspActionPart = model.correspContextPart = model.ptrLike | model.pLike | note model.correspDescPart = note | correspAction | correspContext model.resourceLike = facsimile | sourceDoc | \text +model.objectLike = object | listObject att.personal.attributes = att.naming.attributes, att.personal.attribute.full, @@ -2199,10 +2214,43 @@ desc = ## (description) contient une courte description de l'objet documenté par son élément parent, qui comprend son utilisation prévue, son but, ou son application là où c'est approprié. [22.4.1. Description of Components] element desc { - macro.limitedContent, + macro.limitedContent + >> sch:pattern [ + id = + "test21-desc-deprecationInfo-only-in-deprecated-constraint-rule-10" + "\x{a}" ~ + " " + sch:rule [ + context = "tei:desc[ @type eq 'deprecationInfo']" + "\x{a}" ~ + " " + sch:assert [ + test = "../@validUntil" + "Information about a\x{a}" ~ + " deprecation should only be present in a specification element\x{a}" ~ + " that is being deprecated: that is, only an element that has a\x{a}" ~ + " @validUntil attribute should have a child .' + ] + "\x{a}" ~ + " " + ] + "\x{a}" ~ + " " + ], att.global.attributes, att.translatable.attributes, - att.typed.attributes, + att.typed.attribute.subtype, + + ## caractérise l'élément en utilisant n'importe quel système ou typologie de classification approprié. + attribute type { + + ## first type + "A" + | + ## second type + "B" + }?, empty } gloss = @@ -2499,10 +2547,11 @@ unit = } date = - ## (date) contient une date exprimée dans n'importe quel format. [3.5.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.11.2.4. Imprint, Size of a Document, and Reprint Information 15.2.3. The Setting Description 13.3.6. Dates and Times] + ## (date) contient une date exprimée dans n'importe quel format. [3.5.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.11.2.4. Imprint, Size of a Document, and Reprint Information 15.2.3. The Setting Description 13.3.7. Dates and Times] element date { (text | model.gLike | model.phrase | model.global)*, att.global.attributes, + att.canonical.attributes, att.datable.attributes, att.editLike.attributes, att.dimensions.attributes, @@ -2640,7 +2689,7 @@ ref = (model.divBottom, model.global*)*) >> sch:pattern [ id = - "test21-list-gloss-list-must-have-labels-constraint-rule-10" + "test21-list-gloss-list-must-have-labels-constraint-rule-11" "\x{a}" ~ " " sch:rule [ @@ -3141,7 +3190,7 @@ relatedItem = " " ] >> sch:pattern [ - id = "test21-relatedItem-targetorcontent1-constraint-assert-7" + id = "test21-relatedItem-targetorcontent1-constraint-assert-8" "\x{a}" ~ " " sch:rule [ @@ -3209,7 +3258,7 @@ lg = | lg)*, (model.divBottom, model.global*)*) >> sch:pattern [ - id = "test21-lg-atleast1oflggapl-constraint-assert-8" + id = "test21-lg-atleast1oflggapl-constraint-assert-9" "\x{a}" ~ " " sch:rule [ @@ -4227,7 +4276,7 @@ relation = element relation { (desc?) >> sch:pattern [ - id = "test21-relation-reforkeyorname-constraint-assert-9" + id = "test21-relation-reforkeyorname-constraint-assert-10" "\x{a}" ~ " " sch:rule [ @@ -4423,9 +4472,84 @@ trait = att.dimensions.attributes, empty } +objectName = + + ## (name of an object) contains a proper noun or noun phrase used to refer to an object. [13.2.4. Object Names] + element objectName { + macro.phraseSeq, + att.datable.attributes, + att.editLike.attributes, + att.global.attributes, + att.personal.attributes, + att.typed.attributes, + empty + } +object = + + ## contains a description of a single identifiable physical object. [13.3.5. Objects] + element object { + (objectIdentifier+, + model.headLike*, + (model.pLike* | (msContents?, physDesc?, history?, additional?)), + (model.noteLike | model.biblLike | linkGrp | link)*, + object?), + att.global.attributes, + att.sortable.attributes, + att.typed.attributes, + att.declaring.attributes, + att.docStatus.attributes, + att.canonical.attributes, + empty + } +listObject = + + ## (list of objects) contains a list of descriptions, each of which provides information about an identifiable physical object. [13.3.5. Objects] + element listObject { + (model.headLike*, model.objectLike+, (relation | listRelation)*), + att.global.attributes, + att.typed.attributes, + att.declarable.attributes, + att.sortable.attributes, + empty + } +objectIdentifier = + + ## (object identifier) groups one or more identifiers or pieces of locating information concerning a single object. [13.3.5. Objects] + element objectIdentifier { + ((model.placeNamePart + | institution + | repository + | collection + | idno + | msName + | objectName + | altIdentifier + | address)*) + >> sch:pattern [ + id = + "test21-objectIdentifier-objectIdentifier_minimal-constraint-report-14" + "\x{a}" ~ + " " + sch:rule [ + context = "tei:objectIdentifier" + "\x{a}" ~ + " " + sch:report [ + test = "not(count(*) gt 0)" + "An objectIdentifier must contain at minimum a single piece of locating or identifying information." + ] + "\x{a}" ~ + " " + ] + "\x{a}" ~ + " " + ], + att.global.attributes, + empty + } nym = - ## (nom canonique) contient la définition de tout nom ou partie de nom dans leur forme canonique. [13.3.5. Names and Nyms] + ## (nom canonique) contient la définition de tout nom ou partie de nom dans leur forme canonique. [13.3.6. Names and Nyms] element nym { (model.entryPart*, model.pLike*, nym*), att.global.attributes, @@ -4440,7 +4564,7 @@ nym = } listNym = - ## (liste de noms canoniques) contient une liste de noms normalisés pour tous types d'objets. [13.3.5. Names and Nyms] + ## (liste de noms canoniques) contient une liste de noms normalisés pour tous types d'objets. [13.3.6. Names and Nyms] element listNym { (model.headLike*, (nym | listNym)+, (relation | listRelation)*), att.global.attributes, @@ -4782,7 +4906,7 @@ quotation = element quotation { (model.pLike*) >> sch:pattern [ - id = "test21-quotation-quotationContents-constraint-report-14" + id = "test21-quotation-quotationContents-constraint-report-15" "\x{a}" ~ " " sch:rule [ @@ -5384,7 +5508,7 @@ link = element link { empty >> sch:pattern [ - id = "test21-link-linkTargets3-constraint-assert-10" + id = "test21-link-linkTargets3-constraint-assert-11" "\x{a}" ~ " " sch:rule [ @@ -5425,7 +5549,7 @@ ab = macro.paraContent >> sch:pattern [ id = - "test21-ab-abstractModel-structure-ab-constraint-report-15" + "test21-ab-abstractModel-structure-ab-constraint-report-16" "\x{a}" ~ " " sch:rule [ @@ -5446,7 +5570,7 @@ ab = " " ] >> sch:pattern [ - id = "test21-ab-abstractModel-structure-l-constraint-report-16" + id = "test21-ab-abstractModel-structure-l-constraint-report-17" "\x{a}" ~ " " sch:rule [ @@ -5621,7 +5745,7 @@ join = element join { ((model.descLike | model.certLike)*) >> sch:pattern [ - id = "test21-join-joinTargets3-constraint-assert-11" + id = "test21-join-joinTargets3-constraint-assert-12" "\x{a}" ~ " " sch:rule [ @@ -5770,7 +5894,7 @@ catchwords = macro.phraseSeq >> sch:pattern [ id = - "test21-catchwords-catchword_in_msDesc-constraint-assert-12" + "test21-catchwords-catchword_in_msDesc-constraint-assert-13" "\x{a}" ~ " " sch:rule [ @@ -5778,11 +5902,10 @@ catchwords = "\x{a}" ~ " " sch:assert [ - test = "ancestor::tei:msDesc" - role = "nonfatal" - "WARNING: deprecated use of element — The " + test = "ancestor::tei:msDesc or ancestor::tei:egXML" + "The " sch:name [ ] - " element will not be allowed outside of msDesc as of 2018-10-01." + " element should not be used outside of msDesc." ] "\x{a}" ~ " " @@ -5799,7 +5922,7 @@ dimensions = element dimensions { ((dim | model.dimLike)*) >> sch:pattern [ - id = "test21-dimensions-duplicateDim-constraint-report-17" + id = "test21-dimensions-duplicateDim-constraint-report-18" "\x{a}" ~ " " sch:rule [ @@ -5821,7 +5944,7 @@ dimensions = " " ] >> sch:pattern [ - id = "test21-dimensions-duplicateDim-constraint-report-18" + id = "test21-dimensions-duplicateDim-constraint-report-19" "\x{a}" ~ " " sch:rule [ @@ -5843,7 +5966,7 @@ dimensions = " " ] >> sch:pattern [ - id = "test21-dimensions-duplicateDim-constraint-report-19" + id = "test21-dimensions-duplicateDim-constraint-report-20" "\x{a}" ~ " " sch:rule [ @@ -5988,7 +6111,7 @@ secFol = element secFol { macro.phraseSeq >> sch:pattern [ - id = "test21-secFol-secFol_in_msDesc-constraint-assert-13" + id = "test21-secFol-secFol_in_msDesc-constraint-assert-14" "\x{a}" ~ " " sch:rule [ @@ -5996,11 +6119,10 @@ secFol = "\x{a}" ~ " " sch:assert [ - test = "ancestor::tei:msDesc" - role = "nonfatal" - "WARNING: deprecated use of element — The " + test = "ancestor::tei:msDesc or ancestor::tei:egXML" + "The " sch:name [ ] - " element will not be allowed outside of msDesc as of 2018-10-01." + " element should not be used outside of msDesc." ] "\x{a}" ~ " " @@ -6018,7 +6140,7 @@ signatures = macro.specialPara >> sch:pattern [ id = - "test21-signatures-signatures_in_msDesc-constraint-assert-14" + "test21-signatures-signatures_in_msDesc-constraint-assert-15" "\x{a}" ~ " " sch:rule [ @@ -6026,11 +6148,10 @@ signatures = "\x{a}" ~ " " sch:assert [ - test = "ancestor::tei:msDesc" - role = "nonfatal" - "WARNING: deprecated use of element — The " + test = "ancestor::tei:msDesc or ancestor::tei:egXML" + "The " sch:name [ ] - " element will not be allowed outside of msDesc as of 2018-10-01." + " element should not be used outside of msDesc." ] "\x{a}" ~ " " @@ -6069,10 +6190,10 @@ msIdentifier = institution?, repository?, collection*, - idno?), - (msName | altIdentifier)*) + idno*), + (msName | objectName | altIdentifier)*) >> sch:pattern [ - id = "test21-msIdentifier-msId_minimal-constraint-report-20" + id = "test21-msIdentifier-msId_minimal-constraint-report-21" "\x{a}" ~ " " sch:rule [ @@ -6081,8 +6202,8 @@ msIdentifier = " " sch:report [ test = - "not(parent::tei:msPart) and (local-name(*[1])='idno' or local-name(*[1])='altIdentifier' or normalize-space(.)='')" - "An msIdentifier must contain either a repository or location of some type, or a manuscript name" + "not(parent::tei:msPart) and (local-name(*[1])='idno' or local-name(*[1])='altIdentifier' or normalize-space(.)='')" + "An msIdentifier must contain either a repository or location." ] "\x{a}" ~ " " @@ -6242,7 +6363,7 @@ rubric = } summary = - ## contains an overview of the available information concerning some aspect of an item (for example, its intellectual content, history, layout, typography etc.) as a complement or alternative to the more detailed information carried by more specific elements. [10.6. Intellectual Content] + ## contains an overview of the available information concerning some aspect of an item or object (for example, its intellectual content, history, layout, typography etc.) as a complement or alternative to the more detailed information carried by more specific elements. [10.6. Intellectual Content] element summary { macro.specialPara, att.global.attributes, empty } physDesc = @@ -6381,7 +6502,7 @@ typeNote = } scriptDesc = - ## contains a description of the scripts used in a manuscript or similar source. [10.7.2.1. Writing] + ## contains a description of the scripts used in a manuscript or other object. [10.7.2.1. Writing] element scriptDesc { (model.pLike+ | (summary?, scriptNote+)), att.global.attributes, @@ -6729,7 +6850,7 @@ path = element path { empty >> sch:pattern [ - id = "test21-path-pathmustnotbeclosed-constraint-rule-11" + id = "test21-path-pathmustnotbeclosed-constraint-rule-12" "\x{a}" ~ " " sch:rule [ @@ -6817,7 +6938,7 @@ addSpan = element addSpan { empty >> sch:pattern [ - id = "test21-addSpan-spanTo-constraint-assert-15" + id = "test21-addSpan-spanTo-constraint-assert-16" "\x{a}" ~ " " sch:rule [ @@ -6837,7 +6958,7 @@ addSpan = " " ] >> sch:pattern [ - id = "test21-addSpan-spanTo_fr-constraint-assert-16" + id = "test21-addSpan-spanTo_fr-constraint-assert-17" "\x{a}" ~ " " sch:rule [ @@ -6863,7 +6984,7 @@ addSpan = ## indique la fin d'un passage introduit par l'élément portant cet attribut. attribute spanTo { xsd:anyURI } >> sch:pattern [ - id = "test21-addSpan-spanTo-spanTo-2-constraint-rule-12" + id = "test21-addSpan-spanTo-spanTo-2-constraint-rule-13" "\x{a}" ~ " " sch:rule [ @@ -6905,7 +7026,7 @@ damageSpan = element damageSpan { empty >> sch:pattern [ - id = "test21-damageSpan-spanTo-constraint-assert-18" + id = "test21-damageSpan-spanTo-constraint-assert-19" "\x{a}" ~ " " sch:rule [ @@ -6926,7 +7047,7 @@ damageSpan = " " ] >> sch:pattern [ - id = "test21-damageSpan-spanTo_fr-constraint-assert-19" + id = "test21-damageSpan-spanTo_fr-constraint-assert-20" "\x{a}" ~ " " sch:rule [ @@ -6955,7 +7076,7 @@ delSpan = element delSpan { empty >> sch:pattern [ - id = "test21-delSpan-spanTo-constraint-assert-20" + id = "test21-delSpan-spanTo-constraint-assert-21" "\x{a}" ~ " " sch:rule [ @@ -6975,7 +7096,7 @@ delSpan = " " ] >> sch:pattern [ - id = "test21-delSpan-spanTo_fr-constraint-assert-21" + id = "test21-delSpan-spanTo_fr-constraint-assert-22" "\x{a}" ~ " " sch:rule [ @@ -7111,7 +7232,7 @@ subst = element subst { ((add | del | model.milestoneLike)+) >> sch:pattern [ - id = "test21-subst-substContents1-constraint-assert-22" + id = "test21-subst-substContents1-constraint-assert-23" "\x{a}" ~ " " sch:rule [ @@ -7371,7 +7492,7 @@ group = (model.divBottom, model.global*)*)?) >> sch:pattern [ id = - "test21-div-abstractModel-structure-l-constraint-report-22" + "test21-div-abstractModel-structure-l-constraint-report-23" "\x{a}" ~ " " sch:rule [ @@ -7392,7 +7513,7 @@ group = ] >> sch:pattern [ id = - "test21-div-abstractModel-structure-p-constraint-report-23" + "test21-div-abstractModel-structure-p-constraint-report-24" "\x{a}" ~ " " sch:rule [ diff --git a/Test/expected-results/test30.dtd b/Test/expected-results/test30.dtd index 06701cb0e..93b26aeff 100644 --- a/Test/expected-results/test30.dtd +++ b/Test/expected-results/test30.dtd @@ -14,10 +14,6 @@ - - - - @@ -60,6 +56,10 @@ + + + + @@ -118,6 +118,11 @@ source CDATA #IMPLIED'> + + + + + @@ -497,18 +502,6 @@ schemeVersion %teidata.versionNumber; #IMPLIED'> - - - - - - @@ -675,11 +668,11 @@ to %teidata.word; #IMPLIED'> - - - - - + + + + + @@ -860,21 +853,21 @@ to %teidata.word; #IMPLIED'> - - - - - + + + + + - - - - - + + + + + @@ -975,6 +968,11 @@ to %teidata.word; #IMPLIED'> + + + + + @@ -1085,6 +1083,18 @@ points CDATA #IMPLIED'> %Tatt.coordinated.attribute.lrx; %Tatt.coordinated.attribute.lry; %Tatt.coordinated.attribute.points;'> + + + + + + @@ -1123,7 +1133,7 @@ xml:space (default|preserve) #IMPLIED'> - + @@ -1550,11 +1560,12 @@ type %teidata.enumerated; #IMPLIED > %Tatt.damaged.attributes; %Tatt.typed.attributes; %Tatt.spanning.attributes; > - + + %Tatt.typed.attribute.subtype; +type %teidata.enumerated; #IMPLIED > @@ -2151,7 +2163,7 @@ ordered %teidata.truthValue; "true" > %Tatt.typed.attributes; %Tatt.declarable.attributes; %Tatt.sortable.attributes; > - + %Tatt.typed.attributes; %Tatt.declarable.attributes; %Tatt.sortable.attributes; > + + + + @@ -2351,7 +2371,7 @@ Measures] --> %Tatt.ranging.attributes; type %teidata.enumerated; #IMPLIED value %teidata.numeric; #IMPLIED > - + %Tatt.typed.attributes; %Tatt.sortable.attributes; parts CDATA #IMPLIED > + + + + + + + + + + + + diff --git a/Test/expected-results/test30.rnc b/Test/expected-results/test30.rnc index d921b08f5..4451decae 100644 --- a/Test/expected-results/test30.rnc +++ b/Test/expected-results/test30.rnc @@ -20,7 +20,7 @@ Tmacro.paraContent = | Tmodel.lLike)* Tmacro.limitedContent = (text | Tmodel.limitedPhrase | Tmodel.inter)* Tmacro.phraseSeq = - (text | Tmodel.gLike | Tmodel.phrase | Tmodel.global)* + (text | Tmodel.gLike | Tmodel.qLike | Tmodel.phrase | Tmodel.global)* Tmacro.phraseSeq.limited = (text | Tmodel.limitedPhrase | Tmodel.global)* Tmacro.specialPara = @@ -1055,32 +1055,6 @@ sch:pattern [ "\x{a}" ~ " " ] -Tatt.tableDecoration.attributes = - Tatt.tableDecoration.attribute.role, - Tatt.tableDecoration.attribute.rows, - Tatt.tableDecoration.attribute.cols -Tatt.tableDecoration.attribute.role = - - ## indicates the kind of information held in this cell or in each cell of this row. - ## Suggested values include: 1] label; 2] data - [ a:defaultValue = "data" ] - attribute role { - - ## labelling or descriptive information only. - "label" - | - ## data values. - "data" - | xsd:token { pattern = "(\p{L}|\p{N}|\p{P}|\p{S})+" } - }? -Tatt.tableDecoration.attribute.rows = - - ## indicates the number of rows occupied by this cell or row. - [ a:defaultValue = "1" ] attribute rows { xsd:nonNegativeInteger }? -Tatt.tableDecoration.attribute.cols = - - ## (columns) indicates the number of columns occupied by this cell or row. - [ a:defaultValue = "1" ] attribute cols { xsd:nonNegativeInteger }? Tatt.timed.attributes = Tatt.timed.attribute.start, Tatt.timed.attribute.end Tatt.timed.attribute.start = @@ -1469,6 +1443,7 @@ Tmodel.listLike = | TlistPerson | TlistPlace | TlistRelation + | TlistObject | TlistNym | Ttable Tmodel.listLike_alternation = @@ -1478,6 +1453,7 @@ Tmodel.listLike_alternation = | TlistPerson | TlistPlace | TlistRelation + | TlistObject | TlistNym | Ttable Tmodel.listLike_sequence = @@ -1487,6 +1463,7 @@ Tmodel.listLike_sequence = TlistPerson, TlistPlace, TlistRelation, + TlistObject, TlistNym, Ttable Tmodel.listLike_sequenceOptional = @@ -1496,6 +1473,7 @@ Tmodel.listLike_sequenceOptional = TlistPerson?, TlistPlace?, TlistRelation?, + TlistObject?, TlistNym?, Ttable? Tmodel.listLike_sequenceOptionalRepeatable = @@ -1505,6 +1483,7 @@ Tmodel.listLike_sequenceOptionalRepeatable = TlistPerson*, TlistPlace*, TlistRelation*, + TlistObject*, TlistNym*, Ttable* Tmodel.listLike_sequenceRepeatable = @@ -1514,6 +1493,7 @@ Tmodel.listLike_sequenceRepeatable = TlistPerson+, TlistPlace+, TlistRelation+, + TlistObject+, TlistNym+, Ttable+ Tmodel.noteLike = Tnote @@ -1765,6 +1745,7 @@ Tmodel.nameLike = | Trs | Tidno | Tmodel.persNamePart + | TobjectName Tmodel.nameLike_alternation = Tmodel.nameLike.agent_alternation | Tmodel.offsetLike_alternation @@ -1772,34 +1753,39 @@ Tmodel.nameLike_alternation = | Trs | Tidno | Tmodel.persNamePart_alternation + | TobjectName Tmodel.nameLike_sequence = Tmodel.nameLike.agent_sequence, Tmodel.offsetLike_sequence, Tmodel.placeStateLike_sequence, Trs, Tidno, - Tmodel.persNamePart_sequence + Tmodel.persNamePart_sequence, + TobjectName Tmodel.nameLike_sequenceOptional = Tmodel.nameLike.agent_sequenceOptional?, Tmodel.offsetLike_sequenceOptional?, Tmodel.placeStateLike_sequenceOptional?, Trs?, Tidno?, - Tmodel.persNamePart_sequenceOptional? + Tmodel.persNamePart_sequenceOptional?, + TobjectName? Tmodel.nameLike_sequenceOptionalRepeatable = Tmodel.nameLike.agent_sequenceOptionalRepeatable*, Tmodel.offsetLike_sequenceOptionalRepeatable*, Tmodel.placeStateLike_sequenceOptionalRepeatable*, Trs*, Tidno*, - Tmodel.persNamePart_sequenceOptionalRepeatable* + Tmodel.persNamePart_sequenceOptionalRepeatable*, + TobjectName* Tmodel.nameLike_sequenceRepeatable = Tmodel.nameLike.agent_sequenceRepeatable+, Tmodel.offsetLike_sequenceRepeatable+, Tmodel.placeStateLike_sequenceRepeatable+, Trs+, Tidno+, - Tmodel.persNamePart_sequenceRepeatable+ + Tmodel.persNamePart_sequenceRepeatable+, + TobjectName+ Tmodel.global = Tmodel.global.meta | Tmodel.milestoneLike @@ -1820,6 +1806,7 @@ Tmodel.biblPart = | Textent | Tavailability | TlistRelation + | TobjectIdentifier Tmodel.frontPart = Tmodel.frontPart.drama | TlistBibl | TdivGen | TtitlePage Tmodel.addrPart = @@ -1900,6 +1887,7 @@ Tmodel.correspActionPart = Tmodel.correspContextPart = Tmodel.ptrLike | Tmodel.pLike | Tnote Tmodel.correspDescPart = Tnote | TcorrespAction | TcorrespContext Tmodel.resourceLike = Tfacsimile | TsourceDoc | Ttext +Tmodel.objectLike = Tobject | TlistObject Tatt.personal.attributes = Tatt.naming.attributes, Tatt.personal.attribute.full, @@ -2172,10 +2160,38 @@ Tdesc = ## (description) contains a brief description of the object documented by its parent element, typically a documentation element or an entity. [22.4.1. Description of Components] element desc { - Tmacro.limitedContent, + Tmacro.limitedContent + >> sch:pattern [ + id = + "testbasic-desc-deprecationInfo-only-in-deprecated-constraint-rule-10" + "\x{a}" ~ + " " + sch:rule [ + context = "tei:desc[ @type eq 'deprecationInfo']" + "\x{a}" ~ + " " + sch:assert [ + test = "../@validUntil" + "Information about a\x{a}" ~ + " deprecation should only be present in a specification element\x{a}" ~ + " that is being deprecated: that is, only an element that has a\x{a}" ~ + " @validUntil attribute should have a child .' + ] + "\x{a}" ~ + " " + ] + "\x{a}" ~ + " " + ], Tatt.global.attributes, Tatt.translatable.attributes, - Tatt.typed.attributes, + Tatt.typed.attribute.subtype, + + ## characterizes the element in some sense, using any convenient classification scheme or typology. + attribute type { + xsd:token { pattern = "(\p{L}|\p{N}|\p{P}|\p{S})+" } + }?, empty } Tgloss = @@ -2472,10 +2488,11 @@ Tunit = } Tdate = - ## contains a date in any format. [3.5.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.11.2.4. Imprint, Size of a Document, and Reprint Information 15.2.3. The Setting Description 13.3.6. Dates and Times] + ## contains a date in any format. [3.5.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.11.2.4. Imprint, Size of a Document, and Reprint Information 15.2.3. The Setting Description 13.3.7. Dates and Times] element date { (text | Tmodel.gLike | Tmodel.phrase | Tmodel.global)*, Tatt.global.attributes, + Tatt.canonical.attributes, Tatt.datable.attributes, Tatt.editLike.attributes, Tatt.dimensions.attributes, @@ -2599,7 +2616,7 @@ Tlist = (Tmodel.divBottom, Tmodel.global*)*) >> sch:pattern [ id = - "testbasic-list-gloss-list-must-have-labels-constraint-rule-10" + "testbasic-list-gloss-list-must-have-labels-constraint-rule-11" "\x{a}" ~ " " sch:rule [ @@ -3116,7 +3133,7 @@ TrelatedItem = ] >> sch:pattern [ id = - "testbasic-relatedItem-targetorcontent1-constraint-assert-7" + "testbasic-relatedItem-targetorcontent1-constraint-assert-8" "\x{a}" ~ " " sch:rule [ @@ -3189,7 +3206,7 @@ Tlg = | Tlg)*, (Tmodel.divBottom, Tmodel.global*)*) >> sch:pattern [ - id = "testbasic-lg-atleast1oflggapl-constraint-assert-8" + id = "testbasic-lg-atleast1oflggapl-constraint-assert-9" "\x{a}" ~ " " sch:rule [ @@ -5053,7 +5070,7 @@ Trelation = element relation { (Tdesc?) >> sch:pattern [ - id = "testbasic-relation-reforkeyorname-constraint-assert-9" + id = "testbasic-relation-reforkeyorname-constraint-assert-10" "\x{a}" ~ " " sch:rule [ @@ -5249,9 +5266,78 @@ Ttrait = Tatt.dimensions.attributes, empty } +TobjectName = + + ## (name of an object) contains a proper noun or noun phrase used to refer to an object. [13.2.4. Object Names] + element objectName { + Tmacro.phraseSeq, + Tatt.datable.attributes, + Tatt.editLike.attributes, + Tatt.global.attributes, + Tatt.personal.attributes, + Tatt.typed.attributes, + empty + } +Tobject = + + ## contains a description of a single identifiable physical object. [13.3.5. Objects] + element object { + (TobjectIdentifier+, + Tmodel.headLike*, + (Tmodel.pLike* | empty), + (Tmodel.noteLike | Tmodel.biblLike | TlinkGrp | Tlink)*, + Tobject?), + Tatt.global.attributes, + Tatt.sortable.attributes, + Tatt.typed.attributes, + Tatt.declaring.attributes, + Tatt.docStatus.attributes, + Tatt.canonical.attributes, + empty + } +TlistObject = + + ## (list of objects) contains a list of descriptions, each of which provides information about an identifiable physical object. [13.3.5. Objects] + element listObject { + (Tmodel.headLike*, + Tmodel.objectLike+, + (Trelation | TlistRelation)*), + Tatt.global.attributes, + Tatt.typed.attributes, + Tatt.declarable.attributes, + Tatt.sortable.attributes, + empty + } +TobjectIdentifier = + + ## (object identifier) groups one or more identifiers or pieces of locating information concerning a single object. [13.3.5. Objects] + element objectIdentifier { + ((Tmodel.placeNamePart | Tidno | TobjectName | Taddress)*) + >> sch:pattern [ + id = + "testbasic-objectIdentifier-objectIdentifier_minimal-constraint-report-15" + "\x{a}" ~ + " " + sch:rule [ + context = "tei:objectIdentifier" + "\x{a}" ~ + " " + sch:report [ + test = "not(count(*) gt 0)" + "An objectIdentifier must contain at minimum a single piece of locating or identifying information." + ] + "\x{a}" ~ + " " + ] + "\x{a}" ~ + " " + ], + Tatt.global.attributes, + empty + } Tnym = - ## (canonical name) contains the definition for a canonical name or name component of any kind. [13.3.5. Names and Nyms] + ## (canonical name) contains the definition for a canonical name or name component of any kind. [13.3.6. Names and Nyms] element nym { (Tmodel.entryPart*, Tmodel.pLike*, Tnym*), Tatt.global.attributes, @@ -5266,7 +5352,7 @@ Tnym = } TlistNym = - ## (list of canonical names) contains a list of nyms, that is, standardized names for any thing. [13.3.5. Names and Nyms] + ## (list of canonical names) contains a list of nyms, that is, standardized names for any thing. [13.3.6. Names and Nyms] element listNym { (Tmodel.headLike*, (Tnym | TlistNym)+, @@ -5420,7 +5506,7 @@ Tpath = element path { empty >> sch:pattern [ - id = "testbasic-path-pathmustnotbeclosed-constraint-rule-11" + id = "testbasic-path-pathmustnotbeclosed-constraint-rule-12" "\x{a}" ~ " " sch:rule [ @@ -5508,7 +5594,7 @@ TaddSpan = element addSpan { empty >> sch:pattern [ - id = "testbasic-addSpan-spanTo-constraint-assert-10" + id = "testbasic-addSpan-spanTo-constraint-assert-11" "\x{a}" ~ " " sch:rule [ @@ -5528,7 +5614,7 @@ TaddSpan = " " ] >> sch:pattern [ - id = "testbasic-addSpan-spanTo_fr-constraint-assert-11" + id = "testbasic-addSpan-spanTo_fr-constraint-assert-12" "\x{a}" ~ " " sch:rule [ @@ -5569,7 +5655,7 @@ TdamageSpan = element damageSpan { empty >> sch:pattern [ - id = "testbasic-damageSpan-spanTo-constraint-assert-12" + id = "testbasic-damageSpan-spanTo-constraint-assert-13" "\x{a}" ~ " " sch:rule [ @@ -5590,7 +5676,7 @@ TdamageSpan = " " ] >> sch:pattern [ - id = "testbasic-damageSpan-spanTo_fr-constraint-assert-13" + id = "testbasic-damageSpan-spanTo_fr-constraint-assert-14" "\x{a}" ~ " " sch:rule [ @@ -5619,7 +5705,7 @@ TdelSpan = element delSpan { empty >> sch:pattern [ - id = "testbasic-delSpan-spanTo-constraint-assert-14" + id = "testbasic-delSpan-spanTo-constraint-assert-15" "\x{a}" ~ " " sch:rule [ @@ -5639,7 +5725,7 @@ TdelSpan = " " ] >> sch:pattern [ - id = "testbasic-delSpan-spanTo_fr-constraint-assert-15" + id = "testbasic-delSpan-spanTo_fr-constraint-assert-16" "\x{a}" ~ " " sch:rule [ @@ -5771,7 +5857,7 @@ Tsubst = element subst { ((Tadd | Tdel | Tmodel.milestoneLike)+) >> sch:pattern [ - id = "testbasic-subst-substContents1-constraint-assert-16" + id = "testbasic-subst-substContents1-constraint-assert-17" "\x{a}" ~ " " sch:rule [ @@ -5952,6 +6038,32 @@ Tundo = }?, empty } +Tatt.tableDecoration.attributes = + Tatt.tableDecoration.attribute.role, + Tatt.tableDecoration.attribute.rows, + Tatt.tableDecoration.attribute.cols +Tatt.tableDecoration.attribute.role = + + ## indicates the kind of information held in this cell or in each cell of this row. + ## Suggested values include: 1] label; 2] data + [ a:defaultValue = "data" ] + attribute role { + + ## labelling or descriptive information only. + "label" + | + ## data values. + "data" + | xsd:token { pattern = "(\p{L}|\p{N}|\p{P}|\p{S})+" } + }? +Tatt.tableDecoration.attribute.rows = + + ## indicates the number of rows occupied by this cell or row. + [ a:defaultValue = "1" ] attribute rows { xsd:nonNegativeInteger }? +Tatt.tableDecoration.attribute.cols = + + ## (columns) indicates the number of columns occupied by this cell or row. + [ a:defaultValue = "1" ] attribute cols { xsd:nonNegativeInteger }? Ttable = ## contains text displayed in tabular form, in rows and columns. [14.1.1. TEI Tables] @@ -6038,7 +6150,7 @@ Tlink = element link { empty >> sch:pattern [ - id = "testbasic-link-linkTargets3-constraint-assert-17" + id = "testbasic-link-linkTargets3-constraint-assert-18" "\x{a}" ~ " " sch:rule [ @@ -6079,7 +6191,7 @@ Tab = Tmacro.paraContent >> sch:pattern [ id = - "testbasic-ab-abstractModel-structure-ab-constraint-report-16" + "testbasic-ab-abstractModel-structure-ab-constraint-report-17" "\x{a}" ~ " " sch:rule [ @@ -6101,7 +6213,7 @@ Tab = ] >> sch:pattern [ id = - "testbasic-ab-abstractModel-structure-l-constraint-report-17" + "testbasic-ab-abstractModel-structure-l-constraint-report-18" "\x{a}" ~ " " sch:rule [ @@ -6255,7 +6367,7 @@ Tjoin = element join { ((Tmodel.descLike | Tmodel.certLike)*) >> sch:pattern [ - id = "testbasic-join-joinTargets3-constraint-assert-18" + id = "testbasic-join-joinTargets3-constraint-assert-19" "\x{a}" ~ " " sch:rule [ @@ -6448,7 +6560,7 @@ Tdiv = (Tmodel.divBottom, Tmodel.global*)*)?) >> sch:pattern [ id = - "testbasic-div-abstractModel-structure-l-constraint-report-18" + "testbasic-div-abstractModel-structure-l-constraint-report-19" "\x{a}" ~ " " sch:rule [ @@ -6469,7 +6581,7 @@ Tdiv = ] >> sch:pattern [ id = - "testbasic-div-abstractModel-structure-p-constraint-report-19" + "testbasic-div-abstractModel-structure-p-constraint-report-20" "\x{a}" ~ " " sch:rule [ @@ -6856,7 +6968,7 @@ Tplatypus = ## attribute bill { "duck" }?) >> sch:pattern [ - id = "testbasic-platypus-bill-silly-test-constraint-report-21" + id = "testbasic-platypus-bill-silly-test-constraint-report-22" "\x{a}" ~ " " sch:rule [ @@ -6889,7 +7001,7 @@ TMenu = } start = TTEI | Tdiv sch:pattern [ - id = "testbasic-outerconstraint-constraint-rule-12" + id = "testbasic-outerconstraint-constraint-rule-13" "\x{a}" ~ " " sch:rule [ diff --git a/Test/expected-results/test33.rnc b/Test/expected-results/test33.rnc index d263b2fec..04bea27b7 100644 --- a/Test/expected-results/test33.rnc +++ b/Test/expected-results/test33.rnc @@ -22,7 +22,11 @@ tei_macro.paraContent = tei_macro.limitedContent = (text | tei_model.limitedPhrase | tei_model.inter)* tei_macro.phraseSeq = - (text | tei_model.gLike | tei_model.phrase | tei_model.global)* + (text + | tei_model.gLike + | tei_model.qLike + | tei_model.phrase + | tei_model.global)* tei_macro.phraseSeq.limited = (text | tei_model.limitedPhrase | tei_model.global)* tei_macro.specialPara = @@ -1914,10 +1918,38 @@ tei_desc = ## (description) contains a brief description of the object documented by its parent element, typically a documentation element or an entity. [22.4.1. Description of Components] element tei:desc { - tei_macro.limitedContent, + tei_macro.limitedContent + >> sch:pattern [ + id = + "foo-desc-deprecationInfo-only-in-deprecated-constraint-rule-9" + "\x{a}" ~ + " " + sch:rule [ + context = "tei:desc[ @type eq 'deprecationInfo']" + "\x{a}" ~ + " " + sch:assert [ + test = "../@validUntil" + "Information about a\x{a}" ~ + " deprecation should only be present in a specification element\x{a}" ~ + " that is being deprecated: that is, only an element that has a\x{a}" ~ + " @validUntil attribute should have a child .' + ] + "\x{a}" ~ + " " + ] + "\x{a}" ~ + " " + ], tei_att.global.attributes, tei_att.translatable.attributes, - tei_att.typed.attributes, + tei_att.typed.attribute.subtype, + + ## characterizes the element in some sense, using any convenient classification scheme or typology. + attribute type { + xsd:token { pattern = "(\p{L}|\p{N}|\p{P}|\p{S})+" } + }?, empty } tei_gloss = @@ -2226,10 +2258,11 @@ tei_unit = } tei_date = - ## contains a date in any format. [3.5.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.11.2.4. Imprint, Size of a Document, and Reprint Information 15.2.3. The Setting Description 13.3.6. Dates and Times] + ## contains a date in any format. [3.5.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.11.2.4. Imprint, Size of a Document, and Reprint Information 15.2.3. The Setting Description 13.3.7. Dates and Times] element tei:date { (text | tei_model.gLike | tei_model.phrase | tei_model.global)*, tei_att.global.attributes, + tei_att.canonical.attributes, tei_att.datable.attributes, tei_att.editLike.attributes, tei_att.dimensions.attributes, @@ -2352,7 +2385,7 @@ tei_list = (tei_label, tei_model.global*, tei_item, tei_model.global*)+)), (tei_model.divBottom, tei_model.global*)*) >> sch:pattern [ - id = "foo-list-gloss-list-must-have-labels-constraint-rule-9" + id = "foo-list-gloss-list-must-have-labels-constraint-rule-10" "\x{a}" ~ " " sch:rule [ @@ -2870,7 +2903,7 @@ tei_relatedItem = " " ] >> sch:pattern [ - id = "foo-relatedItem-targetorcontent1-constraint-assert-7" + id = "foo-relatedItem-targetorcontent1-constraint-assert-8" "\x{a}" ~ " " sch:rule [ @@ -2945,7 +2978,7 @@ tei_lg = | tei_lg)*, (tei_model.divBottom, tei_model.global*)*) >> sch:pattern [ - id = "foo-lg-atleast1oflggapl-constraint-assert-8" + id = "foo-lg-atleast1oflggapl-constraint-assert-9" "\x{a}" ~ " " sch:rule [ @@ -4572,7 +4605,7 @@ tei_link = element tei:link { empty >> sch:pattern [ - id = "foo-link-linkTargets3-constraint-assert-9" + id = "foo-link-linkTargets3-constraint-assert-10" "\x{a}" ~ " " sch:rule [ @@ -4787,7 +4820,7 @@ tei_join = element tei:join { ((tei_model.descLike | tei_model.certLike)*) >> sch:pattern [ - id = "foo-join-joinTargets3-constraint-assert-10" + id = "foo-join-joinTargets3-constraint-assert-11" "\x{a}" ~ " " sch:rule [ diff --git a/Test/expected-results/test34.combined.json b/Test/expected-results/test34.combined.json index 1bfec56ec..9a4247a49 100644 --- a/Test/expected-results/test34.combined.json +++ b/Test/expected-results/test34.combined.json @@ -2527,6 +2527,7 @@ "model.publicationStmtPart.detail" ], "atts" : [ "att.global", + "att.canonical", "att.datable", "att.editLike", "att.dimensions", @@ -2627,8 +2628,8 @@ "type" : "elementSpec", "module" : "core", "desc" : - [ "contains a brief description of the object documented by its parent element, typically a documentation\n element or an entity.<\/desc>" ], - "shortDesc" : "(description) contains a brief description of the object documented by its parent element, typically a documentation\n element or an entity.", + [ "contains a brief\n description of the object documented by its parent element,\n typically a documentation element or an entity.<\/desc>" ], + "shortDesc" : "(description) contains a brief\n description of the object documented by its parent element,\n typically a documentation element or an entity.", "gloss" : [ "description<\/gloss>" ], "altIdent" : @@ -2644,7 +2645,35 @@ "unknown" : [ ] }, "attributes" : - [ ], + [ + { "onElement" : true, + "ident" : "type", + "mode" : "change", + "ns" : "", + "usage" : "def", + "desc" : + [ ], + "shortDesc" : "", + "gloss" : + [ ], + "altIdent" : + [ ], + "valDesc" : + [ ], + "datatype" : + { }, + "valList" : + { "type" : "", + "valItem" : + [ + { "ident" : "deprecationInfo", + "desc" : + [ "This element\n\t describes why or how its parent element is being deprecated,\n\t typically including recommendations for alternate\n\t encoding.<\/desc>" ], + "shortDesc" : "(deprecation\n\t information) This element\n\t describes why or how its parent element is being deprecated,\n\t typically including recommendations for alternate\n\t encoding.", + "gloss" : + [ "deprecation\n\t information<\/gloss>" ], + "altIdent" : + [ ] } ] } } ], "content" : [ { "type" : "macroRef", @@ -16516,8 +16545,8 @@ "module" : "tei", "type" : "", "desc" : - [ "defines attribute values which contain an XPath expression.<\/desc>" ], - "shortDesc" : "defines attribute values which contain an XPath expression.", + [ "defines attribute values\nwhich contain an XPath expression.<\/desc>" ], + "shortDesc" : "defines attribute values\nwhich contain an XPath expression.", "gloss" : [ ] } ], "macroRefs" : diff --git a/Test/expected-results/test34.odd.html b/Test/expected-results/test34.odd.html index ad2469aac..962f724f3 100644 --- a/Test/expected-results/test34.odd.html +++ b/Test/expected-results/test34.odd.html @@ -92,30 +92,57 @@

    - + - + @@ -944,7 +1043,7 @@

    - + @@ -1091,7 +1190,7 @@

    - + @@ -1370,7 +1469,7 @@

    - + diff --git a/Test/expected-results/test34.rnc b/Test/expected-results/test34.rnc index 04ec51970..79f87a4af 100644 --- a/Test/expected-results/test34.rnc +++ b/Test/expected-results/test34.rnc @@ -23,7 +23,11 @@ tei_macro.paraContent = tei_macro.limitedContent = (text | tei_model.limitedPhrase | tei_model.inter)* tei_macro.phraseSeq = - (text | tei_model.gLike | tei_model.phrase | tei_model.global)* + (text + | tei_model.gLike + | tei_model.qLike + | tei_model.phrase + | tei_model.global)* tei_macro.phraseSeq.limited = (text | tei_model.limitedPhrase | tei_model.global)* tei_macro.specialPara = @@ -1919,10 +1923,38 @@ tei_desc = ## (description) contains a brief description of the object documented by its parent element, typically a documentation element or an entity. [22.4.1. Description of Components] element desc { - tei_macro.limitedContent, + tei_macro.limitedContent + >> sch:pattern [ + id = + "foo-desc-deprecationInfo-only-in-deprecated-constraint-rule-9" + "\x{a}" ~ + " " + sch:rule [ + context = "tei:desc[ @type eq 'deprecationInfo']" + "\x{a}" ~ + " " + sch:assert [ + test = "../@validUntil" + "Information about a\x{a}" ~ + " deprecation should only be present in a specification element\x{a}" ~ + " that is being deprecated: that is, only an element that has a\x{a}" ~ + " @validUntil attribute should have a child .' + ] + "\x{a}" ~ + " " + ] + "\x{a}" ~ + " " + ], tei_att.global.attributes, tei_att.translatable.attributes, - tei_att.typed.attributes, + tei_att.typed.attribute.subtype, + + ## characterizes the element in some sense, using any convenient classification scheme or typology. + attribute type { + xsd:token { pattern = "(\p{L}|\p{N}|\p{P}|\p{S})+" } + }?, empty } tei_gloss = @@ -2231,10 +2263,11 @@ tei_unit = } tei_date = - ## contains a date in any format. [3.5.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.11.2.4. Imprint, Size of a Document, and Reprint Information 15.2.3. The Setting Description 13.3.6. Dates and Times] + ## contains a date in any format. [3.5.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.11.2.4. Imprint, Size of a Document, and Reprint Information 15.2.3. The Setting Description 13.3.7. Dates and Times] element date { (text | tei_model.gLike | tei_model.phrase | tei_model.global)*, tei_att.global.attributes, + tei_att.canonical.attributes, tei_att.datable.attributes, tei_att.editLike.attributes, tei_att.dimensions.attributes, @@ -2357,7 +2390,7 @@ tei_list = (tei_label, tei_model.global*, tei_item, tei_model.global*)+)), (tei_model.divBottom, tei_model.global*)*) >> sch:pattern [ - id = "foo-list-gloss-list-must-have-labels-constraint-rule-9" + id = "foo-list-gloss-list-must-have-labels-constraint-rule-10" "\x{a}" ~ " " sch:rule [ @@ -2875,7 +2908,7 @@ tei_relatedItem = " " ] >> sch:pattern [ - id = "foo-relatedItem-targetorcontent1-constraint-assert-7" + id = "foo-relatedItem-targetorcontent1-constraint-assert-8" "\x{a}" ~ " " sch:rule [ @@ -2950,7 +2983,7 @@ tei_lg = | tei_lg)*, (tei_model.divBottom, tei_model.global*)*) >> sch:pattern [ - id = "foo-lg-atleast1oflggapl-constraint-assert-8" + id = "foo-lg-atleast1oflggapl-constraint-assert-9" "\x{a}" ~ " " sch:rule [ @@ -4575,7 +4608,7 @@ tei_link = element link { empty >> sch:pattern [ - id = "foo-link-linkTargets3-constraint-assert-9" + id = "foo-link-linkTargets3-constraint-assert-10" "\x{a}" ~ " " sch:rule [ @@ -4790,7 +4823,7 @@ tei_join = element join { ((tei_model.descLike | tei_model.certLike)*) >> sch:pattern [ - id = "foo-join-joinTargets3-constraint-assert-10" + id = "foo-join-joinTargets3-constraint-assert-11" "\x{a}" ~ " " sch:rule [ diff --git a/Test/expected-results/test35.rnc b/Test/expected-results/test35.rnc index 1ebad5c93..24c220e70 100644 --- a/Test/expected-results/test35.rnc +++ b/Test/expected-results/test35.rnc @@ -21,7 +21,11 @@ tei_macro.paraContent = tei_macro.limitedContent = (text | tei_model.limitedPhrase | tei_model.inter)* tei_macro.phraseSeq = - (text | tei_model.gLike | tei_model.phrase | tei_model.global)* + (text + | tei_model.gLike + | tei_model.qLike + | tei_model.phrase + | tei_model.global)* tei_macro.phraseSeq.limited = (text | tei_model.limitedPhrase | tei_model.global)* tei_macro.specialPara = @@ -1913,10 +1917,38 @@ tei_desc = ## (description) contains a brief description of the object documented by its parent element, typically a documentation element or an entity. [22.4.1. Description of Components] element tei:desc { - tei_macro.limitedContent, + tei_macro.limitedContent + >> sch:pattern [ + id = + "foo-desc-deprecationInfo-only-in-deprecated-constraint-rule-9" + "\x{a}" ~ + " " + sch:rule [ + context = "tei:desc[ @type eq 'deprecationInfo']" + "\x{a}" ~ + " " + sch:assert [ + test = "../@validUntil" + "Information about a\x{a}" ~ + " deprecation should only be present in a specification element\x{a}" ~ + " that is being deprecated: that is, only an element that has a\x{a}" ~ + " @validUntil attribute should have a child .' + ] + "\x{a}" ~ + " " + ] + "\x{a}" ~ + " " + ], tei_att.global.attributes, tei_att.translatable.attributes, - tei_att.typed.attributes, + tei_att.typed.attribute.subtype, + + ## characterizes the element in some sense, using any convenient classification scheme or typology. + attribute type { + xsd:token { pattern = "(\p{L}|\p{N}|\p{P}|\p{S})+" } + }?, empty } tei_gloss = @@ -2225,10 +2257,11 @@ tei_unit = } tei_date = - ## contains a date in any format. [3.5.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.11.2.4. Imprint, Size of a Document, and Reprint Information 15.2.3. The Setting Description 13.3.6. Dates and Times] + ## contains a date in any format. [3.5.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.11.2.4. Imprint, Size of a Document, and Reprint Information 15.2.3. The Setting Description 13.3.7. Dates and Times] element tei:date { (text | tei_model.gLike | tei_model.phrase | tei_model.global)*, tei_att.global.attributes, + tei_att.canonical.attributes, tei_att.datable.attributes, tei_att.editLike.attributes, tei_att.dimensions.attributes, @@ -2351,7 +2384,7 @@ tei_list = (tei_label, tei_model.global*, tei_item, tei_model.global*)+)), (tei_model.divBottom, tei_model.global*)*) >> sch:pattern [ - id = "foo-list-gloss-list-must-have-labels-constraint-rule-9" + id = "foo-list-gloss-list-must-have-labels-constraint-rule-10" "\x{a}" ~ " " sch:rule [ @@ -2869,7 +2902,7 @@ tei_relatedItem = " " ] >> sch:pattern [ - id = "foo-relatedItem-targetorcontent1-constraint-assert-7" + id = "foo-relatedItem-targetorcontent1-constraint-assert-8" "\x{a}" ~ " " sch:rule [ @@ -2944,7 +2977,7 @@ tei_lg = | tei_lg)*, (tei_model.divBottom, tei_model.global*)*) >> sch:pattern [ - id = "foo-lg-atleast1oflggapl-constraint-assert-8" + id = "foo-lg-atleast1oflggapl-constraint-assert-9" "\x{a}" ~ " " sch:rule [ @@ -4555,7 +4588,7 @@ tei_link = element tei:link { empty >> sch:pattern [ - id = "foo-link-linkTargets3-constraint-assert-9" + id = "foo-link-linkTargets3-constraint-assert-10" "\x{a}" ~ " " sch:rule [ @@ -4770,7 +4803,7 @@ tei_join = element tei:join { ((tei_model.descLike | tei_model.certLike)*) >> sch:pattern [ - id = "foo-join-joinTargets3-constraint-assert-10" + id = "foo-join-joinTargets3-constraint-assert-11" "\x{a}" ~ " " sch:rule [ diff --git a/Test/expected-results/testdrama.compiled.xml b/Test/expected-results/testdrama.compiled.xml index 811bf4269..6bce8bf8d 100644 --- a/Test/expected-results/testdrama.compiled.xml +++ b/Test/expected-results/testdrama.compiled.xml @@ -44,7 +44,7 @@

    In the following example from Hamlet, speeches (sp) in the body of the play are linked to castItem elements in the castList using the who attribute.

    - + Bernardo @@ -68,6 +68,7 @@

    Pour un discours transcrit, identifiera typiquement un participant ou un groupe participant ; dans d'autres contextes, pointera vers n'importe quel élément person identifié.

    +

    転記された音声の場合,これは通常,参加者または参加者グループを識別する.他のコンテキストでは,識別されたperson要素を指し示す.

    @@ -127,6 +128,7 @@ fournit des attributs qui peuvent être utilisés pour associer une représentation telle qu'un nom ou un titre à l'information canonique concernant l'objet nommé ou auquel il est fait référence. + 名前やタイトルのような表現を参照対象についての典拠情報と関連付けるのに利用する属性を提供する. provides an externally-defined means of identifying the entity (or entities) being @@ -134,16 +136,17 @@ fournit un moyen, défini de façon externe, d'identifier l'entité (ou les entités) nommé(es), en utilisant une valeur codée d'un certain type. + 何らかのコード化された値を用いて,名付けられたエンティティを識別する外部的に定義された手段を提供する. - + [New Zealand Parliament, Legislative Council] - + Victor Hugo @@ -164,17 +167,20 @@

    La valeur peut être un identifiant unique dans une base de données, ou toute autre chaîne définie de façon externe identifiant le référent.

    +

    値はデータベースにおけるユニークな識別子や、外部で定義された指示対象を特定するなんらかの文字列であってよい。key属性の値に関してさだまった構文は提案されていない。なぜならば、それぞれのプロジェクトのやりかたに完全に依存するからである。同様の理由によって、データの相互交換においてこの属性は推奨されない。在るプロジェクトで用いられた値が他のプロジェクトの値と異なることを保証できないからである。そのような場面における魔法石的対処は、RFC4151に定義されるタグURIを値とするref属性を用いて、標準的なウェブにおける習慣にしたがってmagic tokenを使うことである。

    reference référence + 参照 provides an explicit means of locating a full definition or identity for the entity being named by means of one or more URIs. fournit un moyen explicite de localiser une définition complète de l'entité nommée au moyen d'un ou plusieurs URIs. + 一つ以上のURIを用いて,名付けられたエンティティの完全な定義かIDを参照するための明確な手段を提供する. - + Seamus Heaney @@ -184,6 +190,7 @@

    La valeur doit pointer directement vers un ou plusieurs éléments XML au moyen d'un ou plusieurs URIs, séparés par un espace. Si plus d'un URI est fourni, cela implique que le nom identifie plusieurs entités distinctes.

    +

    値は1つまたは複数のXML要素あるいは、空白によって区切られた1つまたは複数のURIを指し示すものでなければならない。1つ以上の値が与えられているときは、その名前が複数の異るエンティティに対応することを示唆する。

    @@ -416,6 +423,7 @@ The MS. was lost in transmission by mail from fournit un attribut pour indiquer si un élément est consideré ou pas comme marquant la fin d'un mot orthographique, comme le fait une espace. + 当該要素が空白と同じ方法で正字トークンの終わりを示すとみなされるかどうかを示す属性を提供する. indicates whether or not the element @@ -424,6 +432,7 @@ le fait une espace. indique si l'élément qui porte cet attribut peut être considéré comme une espace blanc indiquant la fin d'un mot orthographique. + この属性を持つ要素が空白と同じ方法で正字トークンの終わりを示すとみなされるべきかどうかを示す。 @@ -433,6 +442,7 @@ of any adjacent whitespace l'élément qui porte cet attribut peut être considéré comme indiquant la fin d'un mot orthographique + この属性を持つ要素は,隣接する任意の空白の存在に関係なく,隣接する正字法トークンの終わりをマークするとみなされる。 the element bearing this attribute is considered @@ -441,10 +451,12 @@ of any adjacent whitespace l'élément qui porte cet attribut ne peut être pas considéré comme indiquant la fin d'un mot orthographique + この属性を持つ要素は,隣接する空白の存在に関係なく,隣接する正字法トークンの終わりをマークしないとみなされる。 the encoding does not take any position on this issue. l'encodage ne prends aucune position sur la question. + 当該符号化はこの問題に関していかなる立場もとらない. @@ -471,6 +483,7 @@ Elements provides an attribute which may be used to supply a canonical reference as a means of identifying the target of a pointer. + ポインタのターゲットを識別する手段としてcanonical referenceを提供するために使用される属性を提供する。 canonical reference @@ -478,13 +491,13 @@ Elements referencia canónica référence canonique riferimento canonico + 正規化参照 specifies the destination of the pointer by supplying a canonical reference expressed using the scheme defined in a refsDecl element in the TEI header TEI 헤더의 refsDecl 요소에서 정의된 체계의 표준 참조를 이용하여 포인터의 목적지를 명시한다. 用元素refsDecl在TEI標頭內所定義的標準參照來說明指標所指位置。 - TEIヘダー内の要素refsDeclで定義されているスキームにある, - 標準的な参照により,当該ポインタの参照場所を示す. + TEIヘダー内の要素refsDeclで定義されているスキームにある, 正規化された参照により,当該ポインタの参照場所を示す. précise la cible du pointeur en fournissant une référence canonique issue d'un modèle défini par un élément refsDecldans l'En-tête TEI. @@ -500,7 +513,7 @@ Elements that when the algorithm for the resolution of canonical references (described in section 16.2.5. Canonical References) is applied to it the result is a valid URI reference to the - intended target

    + intended target.

    The refsDecl to use may be indicated with the decls attribute.

    Currently these Guidelines only provide for a single canonical reference to be encoded on any given ptr element.

    @@ -513,10 +526,8 @@ Elements directeurs ne permettent que l'encodage d'une unique référence canonique pour tout élément ptr donné.

    - -

    要素refsDeclは,属性declsを伴い,使用され るだろう.

    -

    現行ガイドラインでは,要素ptrは,ひつとの標準的な参照 をとることを想定している.

    -
    + +

    16.2.5. Canonical References 節での正規化参照を解決するためのアルゴリズムが適用される時にその結果が対象への正しいURI参照となるように, cRef の値は作られるべきである

    refsDecldecls 属性とともに示されてもよい.現行のガイドラインが ptr 要素に渡すのは,単一の符号化された正規化参照のみである.

    @@ -565,7 +576,7 @@ Elements

    Examples of W3C date, time, and date & time formats.

    - +

    24 Oct 45 September 24th, 1996 at 3:25 in the morning @@ -582,7 +593,7 @@ Elements - +

    24 Oct 45 24 septembre 1996 à 3h 25 du matin @@ -750,7 +761,7 @@ Elements 3.5.4. Dates and Times - 13.3.6. Dates and Times + 13.3.7. Dates and Times provides attributes for normalization of elements that contain @@ -865,7 +876,7 @@ belongs, but this element has no textual content. 3.5.4. Dates and Times - 13.3.6. Dates and Times + 13.3.7. Dates and Times provides the dcr:datacat and @@ -2678,7 +2689,7 @@ this name in the form of a set of whitespace-separated values, for example the o 3.5.1. Referring Strings - 13.3.5. Names and Nyms + 13.3.6. Names and Nyms provides an attribute to indicate any specialised notation used for element content. @@ -3769,12 +3780,14 @@ portion of an ODD document. provides attributes for specifying the specific part of a bibliographic item being cited. + 引用された書誌の特定箇所を指示するための属性を提供する. identifie le type d'information que transmet l'élément, par exemple colonnes, pages, volume, inscription, etc. identifies the unit of information conveyed by the element, e.g. columns, pages, volume, entry. + 当該要素が伝える情報の単位を特定する.たとえば,カラム (columns),頁 (pages),巻 (volume),エントリ (entry) 等. @@ -3784,7 +3797,7 @@ portion of an ODD document. 권수를 포함한다. 該元素標記的內容為冊號。 el elemento contiene el número de volumen. - 当該要素の巻番号を示す. + 巻番号を含む. l'élément contient un numéro de volume. l'elemento contiene il numero del volume. @@ -3794,7 +3807,7 @@ portion of an ODD document. 호, 또는 권과 호를 포함한다. 該元素標記的內容為一期刊號或冊號與期刊號。 el elemento contiene el número de la edición, o los números del volumen y de la edición. - 当該要素は,発行番号,巻番と号番を示す. + 号番号かまたは巻と号の番号を含む. l'élément contient un numéro de livraison ou bien un numéro de volume et de livraison. l'elemento contiene l'indicazione del numero della pubblicazione @@ -3807,14 +3820,14 @@ portion of an ODD document. 페이지 번호 또는 페이지 범위를 포함한다. 該元素標記的內容為一頁數或頁數範圍。 el elemento contiene una página o un intervalo de páginas. - - 当該要素は,ページ番号またはページ範囲を示す. + ページ番号またはページ範囲を含む. l'élément contient un nombre de pages ou l'étendue de sélection des pages. l'elemento contiene l'indicazione di pagina o pagine the element contains a line number or line range. + 行番号か行範囲を含む. @@ -3825,7 +3838,7 @@ portion of an ODD document. and/or title) 장 표시(숫자와/또는 제목)를 포함한다. el elemento contiene la indicación del capítulo (número y/o el título) - 当該要素は,章の識別子(番号や名前)を示す. + 章の識別子(番号やタイトル)を含む. l'élément contient une indication de chapitre (le numéro et/ou le titre) l'elemento contiene un'indicazione di capitolo (numero e/o titolo @@ -3835,25 +3848,29 @@ portion of an ODD document. 책 또는 모음집의 부분을 식별한다. 該元素標明的內容為單書或集合作品的一部份。 el elemento identifica una parte de un libro o de una colección. - 当該要素は,書籍や叢書の部分を特定する. + 書籍や叢書の部分を特定する. l'élément identifie une partie d'un livre ou une anthologie. l'elemento identifica una parte di un libro o di una raccolta the element identifies a column. + 一つのカラムを特定する. the element identifies an entry number or label in a list of entries. + エントリのリスト中の番号やラベルを特定する. specifies the starting point of the range of units indicated by the unit attribute. + unit属性で指定された時間単位の幅における開始点を表す. specifies the end-point of the range of units indicated by the unit attribute. + unit属性で指定された時間単位の幅における終点を表す. @@ -4001,7 +4018,7 @@ or corporate bodies. 3.5.4. Dates and Times - 13.3.6. Dates and Times + 13.3.7. Dates and Times groups elements which denote a number, a quantity, a measurement, or similar piece of text @@ -5293,6 +5310,7 @@ and appear multiple times. + @@ -5581,86 +5599,6 @@ integer value used as a count. seule la représentation de dateTime sera employée.

    - - defines the range of attribute values available for representation of a duration in time - using ISO 8601 standard formats - ISO 8601 표준 형식을 사용하여 시간의 지속을 나타내는 속성 값 범위를 정의한다. - 以ISO 8601標準格式定義表示一段持續性時間的屬性值範圍 - ISO 8601にある標準形式を使い,時間幅を表現する当該属性値の範囲を定義 する. - définit la gamme de valeurs d'attributs exprimant une durée temporaraire utilisant le norme ISO 8601. - define la gama de valores de atributos posibles para - representar la duración en el tiempo usando formatos estàndards ISO 8601. - - - - - - - - - - - a day and a half - - - - - a fortnight - - - - - - - - - - une journee et demie - - - - - une quinzaine - - - - - - - - -

    A duration is expressed as a sequence of number-letter pairs, preceded by the letter P; the - letter gives the unit and may be Y (year), M (month), D (day), H (hour), M (minute), or S - (second), in that order. The numbers are all unsigned integers, except for the last, which may - have a decimal component (using either . or , as the decimal point; - the latter is preferred). If any number is 0, then that number-letter - pair may be omitted. If any of the H (hour), M (minute), or S (second) number-letter pairs are - present, then the separator T must precede the first time - number-letter pair.

    -

    For complete details, see ISO 8601 Data elements and interchange formats — Information - interchange — Representation of dates and times.

    -
    - -

    時間幅は,先頭文字Pに続いて,数値-文字のペア列で示される. 文字は単位を示している.Y(年), M(月), D(日), H(時間), M(分), S(秒) - の順番になる.数値は符号のない整数である.但し,最後に10進数の 表記記号(小数点を示す.または,.後者が望 - ましい)をとることはある.数値が0の場合, 数値-文字のペアは省略されることがある. H(時間), M(分), - S(秒)が数値-文字のペアを作る場合,区切子 Tを先頭にして時間を示す数値-文字 のペアを示す必要がある.

    -

    詳細については,ISO 8601Data elements and interchange formats - Information interchange - - Representation of dates and timesを参照のこと.

    -
    - -

    Une durée est exprimée par une suite de paires alphanumériques, précédée par la lettre P ; - la lettre donne l'unité et peut être Y (année), M (mois), D (jour), H (heure), M (minute), ou - S (seconde), dans cet ordre. Les nombres sont des entiers sans - signe, à l'exception du dernier, - qui peut comporter une décimale (en utilisant soit . soit , pour la - virgule ; la dernière possibilité est préférable). Si un nombre est 0, - alors la paire alphanumérique peut être omise. Si les paires alphanumériques H (heure), M - (minute), ou S (seconde) sont présentes, alors le séparateur T doit précéder la - première paire alphanumérique time.

    -

    Pour des détails complets, voir ISO 8601 Data elements and interchange formats — - Information interchange — Representation of dates and times.

    -
    defines the range of attribute values available for representation of a duration in time using W3C datatypes. W3C 데이터 유형을 사용해서 시간 지속을 나타내는 속성 값 범위를 정의한다. @@ -6340,15 +6278,20 @@ resource, either within the current document or elsewhere.

    - defines attribute values which contain an XPath expression. - - - - -

    Any XPath expression using the syntax -defined in -

    - +defines attribute values +which contain an XPath expression. + + + + +

    Any XPath expression using the syntax + defined in .

    +

    When writing programs that evaluate XPath expressions, + programmers should be mindful of the possibility of malicious code + injection attacks. For further information about XPath injection + attacks, see the article at + OWASP.

    +
    defines the range of attribute values expressed as a single word or token. @@ -6601,7 +6544,87 @@ one initial. 13.2.1. Personal Names -
    + + defines the range of attribute values available for representation of a duration in time + using ISO 8601 standard formats + ISO 8601 표준 형식을 사용하여 시간의 지속을 나타내는 속성 값 범위를 정의한다. + 以ISO 8601標準格式定義表示一段持續性時間的屬性值範圍 + ISO 8601にある標準形式を使い,時間幅を表現する当該属性値の範囲を定義 する. + définit la gamme de valeurs d'attributs exprimant une durée temporaraire utilisant le norme ISO 8601. + define la gama de valores de atributos posibles para + representar la duración en el tiempo usando formatos estàndards ISO 8601. + + + + + + + + + + + a day and a half + + + + + a fortnight + + + + + + + + + + une journee et demie + + + + + une quinzaine + + + + + + + + +

    A duration is expressed as a sequence of number-letter pairs, preceded by the letter P; the + letter gives the unit and may be Y (year), M (month), D (day), H (hour), M (minute), or S + (second), in that order. The numbers are all unsigned integers, except for the last, which may + have a decimal component (using either . or , as the decimal point; + the latter is preferred). If any number is 0, then that number-letter + pair may be omitted. If any of the H (hour), M (minute), or S (second) number-letter pairs are + present, then the separator T must precede the first time + number-letter pair.

    +

    For complete details, see ISO 8601 Data elements and interchange formats — Information + interchange — Representation of dates and times.

    +
    + +

    時間幅は,先頭文字Pに続いて,数値-文字のペア列で示される. 文字は単位を示している.Y(年), M(月), D(日), H(時間), M(分), S(秒) + の順番になる.数値は符号のない整数である.但し,最後に10進数の 表記記号(小数点を示す.または,.後者が望 + ましい)をとることはある.数値が0の場合, 数値-文字のペアは省略されることがある. H(時間), M(分), + S(秒)が数値-文字のペアを作る場合,区切子 Tを先頭にして時間を示す数値-文字 のペアを示す必要がある.

    +

    詳細については,ISO 8601Data elements and interchange formats - Information interchange - + Representation of dates and timesを参照のこと.

    +
    + +

    Une durée est exprimée par une suite de paires alphanumériques, précédée par la lettre P ; + la lettre donne l'unité et peut être Y (année), M (mois), D (jour), H (heure), M (minute), ou + S (seconde), dans cet ordre. Les nombres sont des entiers sans + signe, à l'exception du dernier, + qui peut comporter une décimale (en utilisant soit . soit , pour la + virgule ; la dernière possibilité est préférable). Si un nombre est 0, + alors la paire alphanumérique peut être omise. Si les paires alphanumériques H (heure), M + (minute), ou S (seconde) sont présentes, alors le séparateur T doit précéder la + première paire alphanumérique time.

    +

    Pour des détails complets, voir ISO 8601 Data elements and interchange formats — + Information interchange — Representation of dates and times.

    +
    +
    provides an attribute to indicate the type of section which is changing at a specific milestone. @@ -7855,7 +7878,7 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...
    3.3.3. Quotation - + description 기술 描述 @@ -7864,8 +7887,9 @@ Ce ne seroyt que bon que nous rendissiez noz cloches...
    descrizione description Beschreibung - contains a brief description of the object documented by its parent element, typically a documentation - element or an entity. + contains a brief + description of the object documented by its parent element, + typically a documentation element or an entity. 요소, 속성, 또는 속성 값의 목적과 적용에 대한 간단한 기술을 포함한다. 包含一段簡短描述,說明一元素、屬性、或屬性值的應用與目的。 当該要素,属性,属性値を採用した目的の簡単な解説を示す. @@ -7876,8 +7900,10 @@ Ce ne seroyt que bon que nous rendissiez noz cloches... aplicación de un elemento, atributo o valor de un atributo. contiene una breve descrizione dello scopo o dell'applicazione di un elemento, attributo, o valore di attributo. - enthält eine kurze Beschreibung des Objekts, das von seinem übergeordneten Element annotiert - wird, üblicherweise einem Dokumentationselement oder einer Einheit. + enthält eine kurze + Beschreibung des Objekts, das von seinem übergeordneten Element + annotiert wird, üblicherweise einem Dokumentationselement oder einer + Einheit. @@ -7888,6 +7914,54 @@ Ce ne seroyt que bon que nous rendissiez noz cloches... + + A desc with + a type of deprecationInfo should only occur + when its parent element is being deprecated. Furthermore, it + should always occur in an element that is being deprecated when + desc is a valid child of that element. + + + Information about a + deprecation should only be present in a specification element + that is being deprecated: that is, only an element that has a + @validUntil attribute should have a child <desc + type="deprecationInfo">. + + + + + + + + deprecation + information + This element + describes why or how its parent element is being deprecated, + typically including recommendations for alternate + encoding. + + + + + + contains the + whole of a TEI encoded corpus, comprising a single corpus + header and one or more TEI elements, each + containing a single text header and a text. + The + TEI element is now permitted to nest directly + within a TEI element. Thus the recommended + encoding of a corpus is to use TEI with a + type of corpus as the outermost + element of a set of TEI documents that are to be treated + as a single corpus. + + + + + + contains a brief description of the purpose and intended use of a documentation element, or a brief characterisation of a parent entity @@ -8853,12 +8927,12 @@ Normalization adición aggiunta Hinzufügung + 書き入れ contains letters, words, or phrases inserted in the source text by an author, scribe, or a previous annotator or corrector. 저자, 전사자, 부호화 작업자 또는 수정작업자에 의해 텍스트에 삽입된 문자, 단어, 또는 구를 포함한다. 包含由作者、抄寫者、註解者、或更正者在文本中插入的字母、單字或詞彙。 - 著者,筆写者,注釈者,校正者による,文字,単語,句レベルでのテキスト - 挿入を示す. + 著者,筆写者,注釈者,校正者によって挿入された文字,単語,句を示す. contient des lettres, des mots ou des phrases insérés dans le texte par un auteur, un copiste, un annotateur ou un correcteur. @@ -8915,11 +8989,9 @@ Normalization casos, cualquiera de los elementos corr o supplied son más convenientes.

    - +

    - 要素addは,編集者や符号化する人による追加情報を符号化する - ために使うべきではない.この場合は,要素corrまたは - suppliedを使うべきである. + 元のソースを表現しようとしているdiplomatic editionでは,add要素は,編集者や符号化する人が作成した現在のTEI電子版への追加には使用しないでください.このような場合は,corrまたはsupplied要素のいずれかをお勧めします.そのような追加や再構成が原文の一部とみなされる以前の編集上の訂正を含む歴史的テキストのTEI版では,プロジェクトの編集理念に応じて,addの使用が適切かもしれません.

    @@ -10309,6 +10381,7 @@ Measures + @@ -10386,7 +10459,7 @@ Measures 2.6. The Revision Description 3.11.2.4. Imprint, Size of a Document, and Reprint Information 15.2.3. The Setting Description - 13.3.6. Dates and Times + 13.3.7. Dates and Times temps @@ -10447,10 +10520,11 @@ Measures abreviatura abbreviazione Abkürzung + 省略形 contains an abbreviation of any sort. 어떤 종류의 약어를 포함한다. 包含任何形式的縮寫。 - 名称の省略 + あらゆる種類の名称の省略を一つ含む. contient une abréviation quelconque. contiene una abreviatura de cualquier clase. contiene un'abbreviazione di qualsiasi genere. @@ -10695,9 +10769,8 @@ Measures abréviations ne sont pas transcrites directement mais développées sans commentaires, alors l'en-tête TEI doit le mentionner.

    - -

    要素abbrは,必須ではない.必要であれば,符号化する人は元 テキストにある省略形を,何もタグを付けずに転記することもできる. - 省略形が元資料から直接転記されたものではなく,かつ要素 expandedで符号化されている場合には,TEIヘダーにそのこ とを記述すべきである. + +

    省略形が暗黙的に戻される場合,これは一つのnormalization要素かp要素とともにeditorialDeclに記述されるべきである.

    @@ -13018,6 +13091,7 @@ Elements niveau analytique nivel analítico. livello analitico + 分析レベル contains bibliographic elements describing an item (e.g. an article or poem) published within a monograph or journal and not as an independent publication. 독립 출판이 아닌, 단행본 또는 학술지 내에 포함되어 출판된 항목(예를 들어, 논문 또는 시)을 @@ -13082,9 +13156,9 @@ Elements biblStruct, où il faut l'utiliser pour encoder la description bibliographique d'une partie composante.

    - -

    タイトルや権利者(著者,編者など)を,任意の順番で示してよい.

    -

    要素analyticは,要素biblStructの内容として高々1 回出現する.分析レベルの書誌情報項目においては必須である.

    + +

    タイトルや権利者(著者,編者など)を,任意の順番で示してよい.

    +

    要素analyticは,要素biblStruct内でのみ使用することができる.分析レベルの書誌情報項目においては必須である.

    3.11.2.1. Analytic, Monographic, and Series Levels @@ -20494,6 +20568,7 @@ codes used elsewhere in the text. información de la aplicación informations d'application informazioni su applicazione + アプリケーション情報 records information about an application which has edited the TEI file. TEI 파일을 편집한 애플리케이션에 관한 정보를 기록한다. @@ -20512,7 +20587,7 @@ codes used elsewhere in the text. - + @@ -20562,7 +20637,7 @@ codes used elsewhere in the text. 버전 또는 표시명과 상관없이 애플리케이션의 확인소를 제공한다. proporciona un identificador para la aplicación, independientemente de su número de versión o el nombre de la visualización. - 当該ソフトウェアの識別子を示す.これは,版番号や表示名とは異なる. + 当該ソフトウェアの識別子を示す.これは,版番号や表示名とは異なる. fournit un identifiant pour l'application, indépendamment de son numéro de version ou du nom affiché. indica un identificatore per l'applicazione, @@ -20575,7 +20650,7 @@ codes used elsewhere in the text. 확인소 또는 표시명과 상관없이 애플리케이션의 버전을 제공한다. Suministra un número de versión para la aplicación, independientemente de su identificador o el nombre de la visualización. - 当該ソフトウェアの版番号を示す.識別子や表示名とは異なる. + 当該ソフトウェアの版番号を示す.識別子や表示名とは異なる. fournit un numéro de version pour l'application, indépendamment de son identifiant ou du nom affiché. indica un numero di versione per l'applicazione, @@ -20584,7 +20659,7 @@ codes used elsewhere in the text. - + @@ -20599,7 +20674,7 @@ codes used elsewhere in the text. ptr elements.

    - + @@ -20609,7 +20684,7 @@ codes used elsewhere in the text. - + @@ -20804,6 +20879,7 @@ elements of profileDesc unless these are documenting multiple texts. contains a summary or formal abstract prefixed to an existing source document by the encoder. + 符号化する人によって既存の元文書の前に付加された要約または正式な要約を含む. @@ -20837,6 +20913,7 @@ elements of profileDesc unless these are documenting multiple texts.div within the front, as it should for a born-digital document.

    +

    この要素は,元資料で要約が利用できない場合にのみ使用されます. 元文書に既に存在する任意の要約は,ボーンデジタル文書の場合と同じように,front内のdivとして符号化する必要があります.

    2.4.4. Abstracts @@ -22327,12 +22404,13 @@ during the evolution of the encoded representation of that text.

    TEI-Dokument documento TEI documento TEI + TEI文書 contains a single TEI-conformant document, combining a single TEI header with one or more members of the model.resourceLike class. Multiple TEI elements may be combined to form a teiCorpus element. TEI 헤더와 텍스트로 구성된 단일 TEI 구조 문서를 포함한다. 독립 요소 또는 teiCorpus 요소의 부분. 包含符合TEI標準的單一文件,由一個TEI標頭及一份文本組成,可單獨出現或是作為元素teiCorpus的一部分。 - TEIに準拠する文書 + 一つ以上のmodel.resourceLikeクラスを持つ一つのTEIヘッダを持つ,単一のTEI準拠文書を含む.teiCorpusエレメントには複数のTEI要素が含まれてもよい. contient un seul document conforme à la TEI, qui comprend un en-tête TEI et un texte, soit de façon isolée, soit comme partie d’un élément teiCorpus. @@ -22370,7 +22448,7 @@ during the evolution of the encoded representation of that text.

    which this document is valid. TEI 스키마의 버전 TEI架構的版本 - TEIスキームの版を示す. + 当該文書が妥当(に符号化される)TEIスキームの版を示す. la version majeure du schéma TEI gibt die Versionsnummer der TEI-Richtlinien an, gegen die dieses Dokument validiert wird. Versión del esquema TEI @@ -22391,10 +22469,13 @@ during the evolution of the encoded representation of that text.

    um ein TEI-Dokument einer bestimmten Version der P5-Richtlinien zuzuordnen, sofern keine genauere Zuordnung durch das Attribut source im assoziierten schemaSpec-Element angegeben ist.

    + +

    ガイドラインのメジャーな版は,長い間,P(ProposalのP)と数字からなる名前で呼ばれてきました.このリリースは,P5と呼ばれる5番目のメジャーな版のなかの多くのリリースのひとつです.この属性は,schemaSpecsource属性によってより適切に関連づけられていない場合,任意のTEI文書を特定のP5ガイドラインのリリースと関連づけることができる

    +
    - + @@ -22419,7 +22500,7 @@ during the evolution of the encoded representation of that text.

    - + @@ -22445,7 +22526,7 @@ during the evolution of the encoded representation of that text.

    - + @@ -22469,7 +22550,7 @@ during the evolution of the encoded representation of that text.

    - + @@ -22500,9 +22581,9 @@ TEI namespace http://www.tei-c.org/ns/1.0 on it, using

    Cet élément est obligatoire.

    - +

    - 当該要素は必須である. + 当該要素は必須であり,xmlns 属性を用いてTEIの名前空間 http://www.tei-c.org/ns/1.0 を指定することになっている.

    @@ -24657,7 +24738,7 @@ it may optionally be tagged using the docAuthor element.

    a subdivision of a text. 텍스트의 하위 구역에서 서술된 주제에 대한 형식적 목록 또는 산문체 기술 規則列表或文字敘述,說明文本分段內容包含的主題。 - 下位部分にあるテキストのトピックを整形のリストまたは散文で示す. + 下位部分にあるテキストのトピックを整形のリストまたは散文説明を含む. liste formelle ou description en texte libre des sujets traités dans une subdivision d’un texte beinhaltet eine systematische Aufzählung oder eine Prosabeschreibung der Themen, die in einem @@ -26832,6 +26913,7 @@ the date of the entire document, not for any subset or part of it.

    bloc anonyme bloque anónimo blocco anonimo + 無名ブロック contains any arbitrary component-level unit of text, acting as an anonymous container for phrase or inter level elements analogous to, but without the semantic baggage of, a paragraph. 의미적 부담 없이, 문단과 유사한 구 또는 상호층위 요소에 대한 익명 전달체로 기능하는 임의적 성분-층위 단위를 포함한다. 包含文件中任何隨機組合性層次的單元,匿名收容類似一個段落、但不包含段落語義的字詞或中間層元素。 @@ -26898,6 +26980,7 @@ the date of the entire document, not for any subset or part of it.

    punto de anclaje punto di ancoraggio Ankerpunkt + アンカーポイント attaches an identifier to a point within a text, whether or not it corresponds with a textual element. 텍스트적 요소와의 일치여부와 상관없이 텍스트 내의 특정 지점에 확인소를 부착한다. 在文件中某一位置附上識別符碼,無論該位置是否符合一個文字性元素。 @@ -26913,13 +26996,13 @@ the date of the entire document, not for any subset or part of it.

    - + The anchor is here somewhere. Help me find it. - + L'ancre est ici quelque part. Aidez-moi à la trouver. @@ -26927,7 +27010,7 @@ the date of the entire document, not for any subset or part of it.

    - + 此錨點指向這 請搜尋此處 @@ -27609,6 +27692,7 @@ You must supply at least two values for @target on alternative alternancia alternanza + 代替選択肢 identifies an alternation or a set of choices among elements or passages. 요소나 단락 사이의 교체 또는 선택 집합을 식별한다. 標明一個替換,或是元素或段落之間的一組不同選擇。 @@ -27651,6 +27735,7 @@ You must supply at least two values for @target on esclusivo indica que la alternancia es exclusiva, es decir, que aparece sólo una de las posibles alternativas. + 単一選択 indicates that the alternation is exclusive, i.e. that at most one of the alternatives occurs. indique que l'alternative est @@ -27670,6 +27755,7 @@ You must supply at least two values for @target on non exclusif inclusivo inclusivo + 複数選択 indicates that the alternation is not exclusive, i.e. that one or more of the alternatives occur. 교체가 배타적이 아님을 나타낸다. 즉, 교체집합 중 하나 이상이 @@ -27694,8 +27780,7 @@ You must supply at least two values for @target on 대응하는 교체가능성이 발생할 확률을 말한다. modeincl이라면, 각 가중치는 적어도 다른 교체가능집합 중 하나가 발생한 상태에서 대응하는 교체가능성이 발생할 확률이다. 若屬性mode的屬性值是excl,則每個weight皆表明相對應替換的可能性。若屬性mode的屬性值是incl,則每個weight皆表明,在至少一個其他替換存在的前提下,相對應替換的可能性 - 属性modeの値がexclの場合,該当する選択肢 の出現度を示す. - 属性modeの値がinclの場合,該当する選択肢の 少なくとも1つが出現する場合の出現度を示す. + 属性modeの値がexclの場合,各重みは対応する代替が発生する確率を示す. 属性modeの値がinclの場合,他の選択肢の少なくとも1つが発生した場合に対応する代替が発生する確率を示す. Si l'attribut mode a la valeur excl, chacune des valeurs de l'attribut weights établit la probabilité que l'option correspondante soit vraie. Si l'attribut mode @@ -27724,10 +27809,8 @@ You must supply at least two values for @target on incl, la somme des poids doit se situer entre 0 et le nombre des alternants.

    - -

    属性modeの値がexclの場合,各選択肢の出 - 現度の合計は1になる必要がある.属性mode値が inclの場合,各出現度は,0から1の範囲である必要があ る. -

    + +

    属性modeの値がexclの場合,重みの合計は1でなければならない.属性mode値が inclの場合,重みの合計は0から代替数の範囲内になければならない.

    @@ -27751,6 +27834,7 @@ You must supply at least two values for @target on groupe d'alternatives grupo de alternancia gruppo di alternanza + 代替選択肢グループ groups a collection of alt elements and possibly pointers. 교체 요소 및 가능한 포인터의 집합군 匯集一群替換元素和可能指標。 @@ -27797,6 +27881,7 @@ You must supply at least two values for @target on esclusivo indica que la alternancia es exclusiva, es decir, que aparece sólo una de las posibles alternativas. + 排他的 indicates that the alternation is exclusive, i.e. that at most one of the alternatives occurs. 교체가 배타적임을 나타낸다. 즉, 기껏해야 교체집합 중 하나가 @@ -27819,6 +27904,7 @@ You must supply at least two values for @target on indica que la alternancia no es exclusiva, es decir, que pueden aparecer una o más de las posibles alternativas. + 複数可 indicates that the alternation is not exclusive, i.e. that one or more of the alternatives occur. 교체가 배타적이 아님을 표시한다. 즉, 교체집합 중 하나 이상이 @@ -29121,7 +29207,7 @@ either a single role or a list of non-speaking roles. 배역 목록에 나타나는 배우의 이름 角色名單中的演員姓名。 Nombre de un actor que aparece dentro de la lista del reparto. - 登場人物リスト中にある役者名を示す. + 登場人物リスト中の役者名を示す. Nom d'un acteur apparaissant dans une distribution. nome di un attore che appare nella lista dei personaggi. diff --git a/debian-tei-xsl/debian/changelog b/debian-tei-xsl/debian/changelog index c062cfb82..4af063d4b 100644 --- a/debian-tei-xsl/debian/changelog +++ b/debian-tei-xsl/debian/changelog @@ -1,3 +1,9 @@ +tei-xsl (7.47.0) natty; urgency=low + + * new release from upstream + + -- TEI Tue, 29 Jan 2019 11:51:27 -0500 + tei-xsl (7.46.0) natty; urgency=low * new release from upstream
    EstadoOpcional
    Tipo de datosteidata.enumerated
    <div typ="verse">  <head>Night in Tarras</head>  <lg type="stanza">   <l>At evening tramping on the hot white road</l> @@ -339,7 +338,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 @@ -699,7 +698,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> @@ -809,30 +808,57 @@

    @@ -847,6 +873,10 @@

    header: change + distributor + edition + extent + geoDecl handNote licence rendition @@ -874,6 +904,8 @@

    div5 div6 div7 + docAuthor + docDate docEdition epigraph imprimatur @@ -1010,7 +1042,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>
    att.citing: provides attributes for specifying the specific part of a bibliographic item being cited. [1.3.1. Attribute Classes]
    att.datable: atributos para registrar expresiones temporales normalizadas. [3.5.4. Dates and Times 13.3.6. Dates and Times]att.datable: atributos para registrar expresiones temporales normalizadas. [3.5.4. Dates and Times 13.3.7. Dates and Times]
    att.datable.w3c: proporciona atributos para la normalización de elementos que contienen eventos datables. [3.5.4. Dates and Times 13.3.6. Dates and Times]att.datable.w3c: proporciona atributos para la normalización de elementos que contienen eventos datables. [3.5.4. Dates and Times 13.3.7. Dates and Times]
    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.milestoneUnit: provides an attribute to indicate the type of section which is changing at a specific milestone. [3.10.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.5.1. Referring Strings 13.3.5. Names and Nyms]att.naming: identifica los atributos comunes a los elementos que se refieren a personas, lugares, organizaciones, etc. indicados por nombre [3.5.1. Referring Strings 13.3.6. Names and Nyms]
    att.notated: provides an attribute to indicate any specialised notation used for element content.creation: contiene información sobre la creación del texto. [2.4.1. Creation 2.4. The Profile Description]
    date: contiene una fecha en cualquier formato. [3.5.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.11.2.4. Imprint, Size of a Document, and Reprint Information 15.2.3. The Setting Description 13.3.6. Dates and Times]date: contiene una fecha en cualquier formato. [3.5.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.11.2.4. Imprint, Size of a Document, and Reprint Information 15.2.3. The Setting Description 13.3.7. Dates and Times]
    dateline: contiene una breve descripción de lugar, fecha, hora, etc. de producción de una carta, un artículo periodístico u otro tipo de texto; viene antepuesto o pospuesto a este como elemento de abertura o clausura. [4.2.2. Openers and Closers]model.correspDescPart: groups together metadata elements for describing correspondence
    model.dateLike: agrupa elementos que contienen expresiones temporales. [3.5.4. Dates and Times 13.3.6. Dates and Times]model.dateLike: agrupa elementos que contienen expresiones temporales. [3.5.4. Dates and Times 13.3.7. Dates and Times]
    model.descLike: groups elements which contain a description of their function.att.citing: provides attributes for specifying the specific part of a bibliographic item being cited. [1.3.1. Attribute Classes]
    att.datable: provides attributes for normalization of elements that contain dates, times, or datable events. [3.5.4. Dates and Times 13.3.6. Dates and Times]att.datable: provides attributes for normalization of elements that contain dates, times, or datable events. [3.5.4. Dates and Times 13.3.7. Dates and Times]
    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.5.4. Dates and Times 13.3.6. Dates and Times]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.5.4. Dates and Times 13.3.7. Dates and Times]
    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.milestoneUnit: provides an attribute to indicate the type of section which is changing at a specific milestone. [3.10.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.5.1. Referring Strings 13.3.5. Names and Nyms]att.naming: provides attributes common to elements which refer to named persons, places, organizations etc. [3.5.1. Referring Strings 13.3.6. Names and Nyms]
    att.notated: provides an attribute to indicate any specialised notation used for element content.creation: contains information about the creation of a text. [2.4.1. Creation 2.4. The Profile Description]
    date: contains a date in any format. [3.5.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.11.2.4. Imprint, Size of a Document, and Reprint Information 15.2.3. The Setting Description 13.3.6. Dates and Times]date: contains a date in any format. [3.5.4. Dates and Times 2.2.4. Publication, Distribution, Licensing, etc. 2.6. The Revision Description 3.11.2.4. Imprint, Size of a Document, and Reprint Information 15.2.3. The Setting Description 13.3.7. Dates and Times]
    dateline: contains a brief description of the place, date, time, etc. of production of a letter, newspaper story, or other work, prefixed or suffixed to it as a kind of heading or trailer. [4.2.2. Openers and Closers]model.correspDescPart: groups together metadata elements for describing correspondence
    model.dateLike: groups elements containing temporal expressions. [3.5.4. Dates and Times 13.3.6. Dates and Times]model.dateLike: groups elements containing temporal expressions. [3.5.4. Dates and Times 13.3.7. Dates and Times]
    model.descLike: groups elements which contain a description of their function.