diff --git a/P5/Source/Guidelines/en/TD-DocumentationElements.xml b/P5/Source/Guidelines/en/TD-DocumentationElements.xml
index d5acac80bc..9cc0888c12 100644
--- a/P5/Source/Guidelines/en/TD-DocumentationElements.xml
+++ b/P5/Source/Guidelines/en/TD-DocumentationElements.xml
@@ -634,18 +634,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 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
@@ -673,13 +678,14 @@ 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.
@@ -698,6 +704,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:
@@ -1837,6 +1893,7 @@ xmlns="http://www.tei-c.org/ns/Examples">
+
diff --git a/P5/Source/Specs/interleave.xml b/P5/Source/Specs/interleave.xml
new file mode 100644
index 0000000000..da14e08487
--- /dev/null
+++ b/P5/Source/Specs/interleave.xml
@@ -0,0 +1,61 @@
+
+
+
+
+ indicates that the constructs referenced by its children occur in any order (i.e. are interleaved)
+
+
+
+
+
+
+
+
+
+
+
+ The interleave element must have at least two child elements
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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.
+
+
+
+ If a TEI description of an XML markup language (often referred
+ to as an ODD
) 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 make use of interleave internally.
+
+
+
+
+
diff --git a/P5/Source/Specs/sequence.xml b/P5/Source/Specs/sequence.xml
index 7b0a5fa0a5..9c725bd5b9 100644
--- a/P5/Source/Specs/sequence.xml
+++ b/P5/Source/Specs/sequence.xml
@@ -19,7 +19,8 @@
-
+
+ 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 b448cf55ac..ea0ecd367e 100644
--- a/P5/p5odds.odd
+++ b/P5/p5odds.odd
@@ -62,7 +62,7 @@ $Id$
@@ -183,10 +183,10 @@ $Id$
if you really want a newline at the end, follow it with U+00A0.
-
- trailing newline not allowed
- leading newline not allowed
-
+
+ trailing newline not allowed
+ leading newline not allowed
+
@@ -627,7 +627,7 @@ $Id$
-
+
@@ -682,6 +682,20 @@ $Id$
+
+
+
+
+
+
+
@@ -740,16 +754,16 @@ $Id$
-
-
-
-
-
- The <altIdent> element should only be used as a child of <elementSpec>, <attDef>, or <valItem>.
-
-
-
-
+
+
+
+
+
+ The <altIdent> element should only be used as a child of <elementSpec>, <attDef>, or <valItem>.
+
+
+
+