diff --git a/P5/Source/Guidelines/en/TD-DocumentationElements.xml b/P5/Source/Guidelines/en/TD-DocumentationElements.xml index 429ec90aab..05d40eba75 100644 --- a/P5/Source/Guidelines/en/TD-DocumentationElements.xml +++ b/P5/Source/Guidelines/en/TD-DocumentationElements.xml @@ -614,17 +614,23 @@ to mark any technical term, thus:

-

Additionally, two wrapper elements are provided to indicate - whether the components listed as their children form a sequence - or an alternation: +

Additionally, three wrapper elements are provided to indicate + whether the components listed as their children form a sequence, + an alternation, or are interleaved: + - These two wrapper elements are also members of att.repeatable. References listed as + Note, however, that current ODD processing software will + not be able to convert a content model that uses interleave + to a DTD.

+

These three wrapper elements are also members of att.repeatable. References listed as children of sequence must appear in the order and - cardinality specified. Only one of the references listed as - children of alternate may appear, although the + cardinality specified whereas references listed as children + of interleave may appear in any order. Only one of the + references listed as children of alternate may appear, although the cardinality of the alternate itself applies. Thus the following fanciful content model permits either any number of ptr elements (except zero) or any number of @@ -652,14 +658,15 @@ to mark any technical term, thus:

-

The sequence and alternate elements may be - used in combination with great expressive power. For example, in +

The sequence, alternate, and interleave + elements may be used in combination with great expressive power. For example, in the following example, which might be imagined as a clean replacement for the content of the choice element, one and only one of the element pairs sic and corr, orig and reg, or - abbr and expan is allowed. - + abbr and expan is allowed, in each case only + in the order specified. + @@ -677,6 +684,56 @@ to mark any technical term, thus: + In the above example, the alternation of element pairs must be + encoded in the order specified (for example, sic and then + corr). In the next example, which also might be + imagined as a clean replacement for the content of the + choice element, this restriction is removed. That is, + one and only one of the element pairs sic and + corr, orig and reg, or abbr + and expan is allowed, but in each case the members + of the pair may occur in either order. + + + + + + + + + + + + + + + + + + +

+

This next example, which might be imagined as a + clean replacement for the content of the person + element, declares that the element must contain one + persName element, either both birth and + death elements (in that order) or a single + floruit element, and one note element in any + order: + + + + + + + + + + + + + + + In the following example, which might be imagined as a clean replacement for the content of the address element, the encoder is given a choice of either: @@ -1844,6 +1901,7 @@ xmlns="http://www.tei-c.org/ns/Examples"> + diff --git a/P5/Source/Specs/alternate.xml b/P5/Source/Specs/alternate.xml index 3ea1baf232..86933fc913 100644 --- a/P5/Source/Specs/alternate.xml +++ b/P5/Source/Specs/alternate.xml @@ -10,18 +10,73 @@ - - - + + + + + + + + + + + + + + + + + + + - - - - The alternate element must have at least two child elements - - - diff --git a/P5/Source/Specs/interleave.xml b/P5/Source/Specs/interleave.xml new file mode 100644 index 0000000000..560e9d2eb4 --- /dev/null +++ b/P5/Source/Specs/interleave.xml @@ -0,0 +1,55 @@ + + + + + indicates that the constructs referenced by its children occur in any order (i.e. are interleaved) + + + + + + + + + + + + + + + + + + + + + +

This example describes a content model that consists of a + mandatory persName element, zero or one of either + placeName or location, and an optional + note element, in any order.

+

To express this content model in a DTD, the original schema + language for XML, one might use +

+ + +

If an ODD file makes use of this element, current processing + software will not be able to generate a DTD from it. For this + reason TEI P5 itself does not currently make use of + interleave internally.

+ + + + + diff --git a/P5/Source/Specs/sequence.xml b/P5/Source/Specs/sequence.xml index 9f68dba887..5942b4a08d 100644 --- a/P5/Source/Specs/sequence.xml +++ b/P5/Source/Specs/sequence.xml @@ -9,19 +9,12 @@ - + - - - - The sequence element must have at least two child elements - - - - - if false, indicates that - component elements of a sequence may occur in any order. + + The preserveOrder on sequence has been deprecated. The interleave element should be used to denote unordered constructs. + if false, indicates that component elements of a sequence may occur in any order. diff --git a/P5/p5odds.odd b/P5/p5odds.odd index 63b968198a..8bc440e9a4 100644 --- a/P5/p5odds.odd +++ b/P5/p5odds.odd @@ -62,7 +62,7 @@ @@ -678,7 +678,7 @@ Uniform Resource Identifier - any form of web address (that is, a URL or a URN) + any form of web address (that is, a URL or a URN) Uniform Resource Locator @@ -691,6 +691,21 @@ + + + + + + + Added per #2463.