From c7b29cbd8fdcc2cfaea6f09441ab6f8567b37e70 Mon Sep 17 00:00:00 2001 From: vvasuki Date: Sun, 10 May 2020 21:07:56 +0530 Subject: [PATCH 01/23] Fix formatting --- markdown/tei-to-markdown.xsl | 322 ++++++++++++++++++----------------- 1 file changed, 162 insertions(+), 160 deletions(-) diff --git a/markdown/tei-to-markdown.xsl b/markdown/tei-to-markdown.xsl index f30b83b76..25e4d6f6f 100644 --- a/markdown/tei-to-markdown.xsl +++ b/markdown/tei-to-markdown.xsl @@ -1,12 +1,12 @@ - + - + - - - - -

This software is dual-licensed: - -1. Distributed under a Creative Commons Attribution-ShareAlike 3.0 -Unported License http://creativecommons.org/licenses/by-sa/3.0/ - -2. http://www.opensource.org/licenses/BSD-2-Clause - - - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - -* Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - -* Redistributions in binary form must reproduce the above copyright -notice, this list of conditions and the following disclaimer in the -documentation and/or other materials provided with the distribution. - -This software is provided by the copyright holders and contributors -"as is" and any express or implied warranties, including, but not -limited to, the implied warranties of merchantability and fitness for -a particular purpose are disclaimed. In no event shall the copyright -holder or contributors be liable for any direct, indirect, incidental, -special, exemplary, or consequential damages (including, but not -limited to, procurement of substitute goods or services; loss of use, -data, or profits; or business interruption) however caused and on any -theory of liability, whether in contract, strict liability, or tort -(including negligence or otherwise) arising in any way out of the use -of this software, even if advised of the possibility of such damage. -

-

Author: See AUTHORS

- -

Copyright: 2013, TEI Consortium

- - - - - - - - - - - - - - - - - - - - - - - - - - _ - - _ - - - _ - - _ - - - ‘ - - ’ - - - - - - - - - - - - - --- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - * - - - - - - - - # - ## - ### - #### - ##### - # - - - - - - - - - - - - 1. - * - - - - + + + +

This software is dual-licensed: + + 1. Distributed under a Creative Commons Attribution-ShareAlike 3.0 + Unported License http://creativecommons.org/licenses/by-sa/3.0/ + + 2. http://www.opensource.org/licenses/BSD-2-Clause + + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + This software is provided by the copyright holders and contributors + "as is" and any express or implied warranties, including, but not + limited to, the implied warranties of merchantability and fitness for + a particular purpose are disclaimed. In no event shall the copyright + holder or contributors be liable for any direct, indirect, incidental, + special, exemplary, or consequential damages (including, but not + limited to, procurement of substitute goods or services; loss of use, + data, or profits; or business interruption) however caused and on any + theory of liability, whether in contract, strict liability, or tort + (including negligence or otherwise) arising in any way out of the use + of this software, even if advised of the possibility of such damage. +

+

Author: See AUTHORS

+ +

Copyright: 2013, TEI Consortium

+ + + + + + + + + + + + + + + + + + + + + + + + + + _ + + _ + + + _ + + _ + + + ‘ + + ’ + + + + + + + + + + + + + --- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + * + + + + + + + + + # + ## + ### + #### + ##### + # + + + + + + + + + + + + 1. + * + + + + - + + + + + - - From f3f687e1f3bd49300b577393f7638f73c4e5b10e Mon Sep 17 00:00:00 2001 From: vvasuki Date: Sun, 10 May 2020 21:50:03 +0530 Subject: [PATCH 02/23] CU --- markdown/tei-to-markdown-sarit.xsl | 14 ++++++++++++++ markdown/tei-to-markdown.xsl | 14 +++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 markdown/tei-to-markdown-sarit.xsl diff --git a/markdown/tei-to-markdown-sarit.xsl b/markdown/tei-to-markdown-sarit.xsl new file mode 100644 index 000000000..59a7a1f4c --- /dev/null +++ b/markdown/tei-to-markdown-sarit.xsl @@ -0,0 +1,14 @@ + + + + + +++( + + )+++ + + + diff --git a/markdown/tei-to-markdown.xsl b/markdown/tei-to-markdown.xsl index 25e4d6f6f..e44bb1882 100644 --- a/markdown/tei-to-markdown.xsl +++ b/markdown/tei-to-markdown.xsl @@ -189,7 +189,19 @@ - + + ** + + ** + + + + + + + + + From e35859d379871aa14d46bd9a672369cb2dc16f06 Mon Sep 17 00:00:00 2001 From: vvasuki Date: Sun, 10 May 2020 22:11:48 +0530 Subject: [PATCH 03/23] CU --- markdown/tei-to-markdown.xsl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/markdown/tei-to-markdown.xsl b/markdown/tei-to-markdown.xsl index e44bb1882..1540e9e05 100644 --- a/markdown/tei-to-markdown.xsl +++ b/markdown/tei-to-markdown.xsl @@ -189,6 +189,12 @@ + + “ + + ” + + ** From c9d6cf07f4e16fd5726c3c801dbb2a45c181dfe0 Mon Sep 17 00:00:00 2001 From: vvasuki Date: Sun, 10 May 2020 22:27:33 +0530 Subject: [PATCH 04/23] CU --- markdown/tei-to-markdown.xsl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/markdown/tei-to-markdown.xsl b/markdown/tei-to-markdown.xsl index 1540e9e05..e18b89307 100644 --- a/markdown/tei-to-markdown.xsl +++ b/markdown/tei-to-markdown.xsl @@ -213,6 +213,12 @@ + + \[ + + \] + + From d1222e2f9c721ec874c48ee3e1e6cdf084fe2412 Mon Sep 17 00:00:00 2001 From: vvasuki Date: Mon, 11 May 2020 06:43:30 +0530 Subject: [PATCH 05/23] CU --- markdown/tei-to-markdown-sarit.xsl | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 markdown/tei-to-markdown-sarit.xsl diff --git a/markdown/tei-to-markdown-sarit.xsl b/markdown/tei-to-markdown-sarit.xsl deleted file mode 100644 index 59a7a1f4c..000000000 --- a/markdown/tei-to-markdown-sarit.xsl +++ /dev/null @@ -1,14 +0,0 @@ - - - - - +++( - - )+++ - - - From d9666759ccd4701babc19129b6a16e0def316cc0 Mon Sep 17 00:00:00 2001 From: David Maus Date: Thu, 5 Nov 2020 20:18:57 +0100 Subject: [PATCH 06/23] Ignore pb when target in @facs does not exist Fix #476 --- tools/makegraphicsanttask.xsl | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/makegraphicsanttask.xsl b/tools/makegraphicsanttask.xsl index a245859ba..5b307bc54 100644 --- a/tools/makegraphicsanttask.xsl +++ b/tools/makegraphicsanttask.xsl @@ -91,6 +91,7 @@ of this software, even if advised of the possibility of such damage. + From bb08baa3c297d34e2c13208fce7450e94b72b570 Mon Sep 17 00:00:00 2001 From: David Maus Date: Thu, 5 Nov 2020 20:56:36 +0100 Subject: [PATCH 07/23] Add warning message about missing @facs target --- tools/makegraphicsanttask.xsl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/makegraphicsanttask.xsl b/tools/makegraphicsanttask.xsl index 5b307bc54..8d868c855 100644 --- a/tools/makegraphicsanttask.xsl +++ b/tools/makegraphicsanttask.xsl @@ -91,7 +91,9 @@ of this software, even if advised of the possibility of such damage. - + + The target '' is not defined in this document + From a49172553489cf0dfe49ea26cbb4c5915efc5a67 Mon Sep 17 00:00:00 2001 From: David Maus Date: Sat, 14 Nov 2020 08:34:12 +0100 Subject: [PATCH 08/23] Relocate test for undefined reference in @facs --- tools/makegraphicsanttask.xsl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/makegraphicsanttask.xsl b/tools/makegraphicsanttask.xsl index 8d868c855..ee3c4d52f 100644 --- a/tools/makegraphicsanttask.xsl +++ b/tools/makegraphicsanttask.xsl @@ -91,13 +91,13 @@ of this software, even if advised of the possibility of such damage. - - The target '' is not defined in this document - + + The target '' is not defined in this document + From df0aeb77242583b2fbd494dae5aaeb7d57f4978e Mon Sep 17 00:00:00 2001 From: David Maus Date: Sat, 14 Nov 2020 08:34:48 +0100 Subject: [PATCH 09/23] Gracefully handle case of undetermined source file name --- tools/makegraphicsanttask.xsl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/makegraphicsanttask.xsl b/tools/makegraphicsanttask.xsl index ee3c4d52f..1f01288ff 100644 --- a/tools/makegraphicsanttask.xsl +++ b/tools/makegraphicsanttask.xsl @@ -118,6 +118,9 @@ of this software, even if advised of the possibility of such damage. + + Unable to determine source file name of ''" + From e9bb141ef4433e5ab6fc2c7b92d822d42cb5f6e5 Mon Sep 17 00:00:00 2001 From: David Maus Date: Sat, 14 Nov 2020 08:35:48 +0100 Subject: [PATCH 10/23] Port changes from makegraphicsanttask.xsl --- epub/epub-common.xsl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/epub/epub-common.xsl b/epub/epub-common.xsl index ae9ac0e0d..afb378ba1 100644 --- a/epub/epub-common.xsl +++ b/epub/epub-common.xsl @@ -538,6 +538,9 @@ of this software, even if advised of the possibility of such damage. + + The target '' is not defined in this document + @@ -558,6 +561,9 @@ of this software, even if advised of the possibility of such damage. + + Unable to determine source file name of ''" + From c1b5f980c6189d1e49f8cecb4b9256339496c031 Mon Sep 17 00:00:00 2001 From: vvasuki Date: Mon, 8 Nov 2021 10:08:44 +0530 Subject: [PATCH 11/23] Fix regression, better note and ref handling. --- markdown/tei-to-markdown.xsl | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/markdown/tei-to-markdown.xsl b/markdown/tei-to-markdown.xsl index 830ec4f83..42a39818b 100644 --- a/markdown/tei-to-markdown.xsl +++ b/markdown/tei-to-markdown.xsl @@ -204,7 +204,7 @@ - + @@ -214,10 +214,20 @@ - - \[ + + + \[ + + \] + + + + + [ - \] + ]( + + ) @@ -242,7 +252,7 @@ ##### # - + @@ -294,7 +304,7 @@ 1. - * + * From d90c4c655b8fa25b20e9bb30c739cbc474815c54 Mon Sep 17 00:00:00 2001 From: vvasuki Date: Mon, 8 Nov 2021 10:16:32 +0530 Subject: [PATCH 12/23] Update test --- Test/mdtest2.md | 74 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 48 insertions(+), 26 deletions(-) diff --git a/Test/mdtest2.md b/Test/mdtest2.md index 1a38f5aef..e7941b523 100644 --- a/Test/mdtest2.md +++ b/Test/mdtest2.md @@ -9,7 +9,7 @@ I have endeavoured in this Ghostly little book, to raise the Ghost of an Idea, w Their faithful Friend and Servant, C.D. December, 1843. # Contents. Stave I -* Marley's ghost 1 +* Marley's ghost [1](#S1) Stave II * The first of the three spirits Stave III @@ -18,23 +18,33 @@ Stave IV * The last of the spirits Stave V * The end of it - + *(Bits of) A CHRISTMAS CAROL, and other things # Simple rendition tests Who-e debel you? — he at last said — you no speak-e, damme, I kill-e. And so saying, the lighted tomahawk began flourishing about me in the dark. Who-e debel you? — he at last said — you no speak-e, damme, I kill-e. And so saying, the lighted tomahawk began flourishing about me in the dark. -EffectExamplehiThis is hi rend="special" tagemphThis is emph taghiThis is hi tagtypewriterThis is typewriter effectboldThis is bold effectnormalweightThis is normalweight effectsmallcapsThis is smallcaps effectallcapsThis is allcaps effectstrikethroughThis is strikethrough effectdoublestrikethroughThis is doublestrikethrough effectcolor(red)This is color(red) effectunderlineThis is underline effectwavyunderlineThis is wavyunderline effectdoubleunderlineThis is doubleunderline effectsubscriptThis is subscript effectsuperscriptThis is superscript effectbold italic red, done separatelyrend test 1bold italic smallcapsrend test 1 Cairns 2003: 11. My work is Muellner 1996. +EffectExamplehiThis is hi rend="special" tagemphThis is emph taghiThis is hi tagtypewriterThis is typewriter effectboldThis is **bold** effectnormalweightThis is normalweight effectsmallcapsThis is smallcaps effectallcapsThis is allcaps effectstrikethroughThis is strikethrough effectdoublestrikethroughThis is doublestrikethrough effectcolor(red)This is color(red) effectunderlineThis is underline effectwavyunderlineThis is wavyunderline effectdoubleunderlineThis is doubleunderline effectsubscriptThis is subscript effectsuperscriptThis is superscript effectbold italic red, done separately**rend test 1**bold italic smallcapsrend test 1 +\[Cairns 2003: 11. My work is Muellner 1996.\] + # Quotations -A paragraph with a footnote containing a block-level objectWe start with a quotation:This is the way the world endsThis is the way the world endsThis is the way the world endsNot with a bang but a whimper. which is from TS Eliot's Hollow men +A paragraph with a footnote containing a block-level object +\[We start with a quotation: +This is the way the world ends +This is the way the world ends +This is the way the world ends +Not with a bang but a whimper. + + which is from TS Eliot's Hollow men\] + Consider quotations: This is a quote which is run on within the text and will have quote marks of some kind around it. Another quotation: This is a block quote set off as such from the rest of the text -Here, by contrast is an inline quotation. Another strange thing about quotes is this: You can put line breaksto determine where the line breaksInside a block! +Here, by contrast is an “inline quotation”. Another strange thing about quotes is this: You can put line breaksto determine where the line breaksInside a block! # Use of xml:lang @@ -64,11 +74,19 @@ I am changed: I'll go sell all my land. # Footnotes and endnotes -## 1 Zur Entstehung der Philosophischen UntersuchungenZu Textauszeichnungen und Siglen siehe die Legende. +## 1 Zur Entstehung der Philosophischen Untersuchungen +\[Zu Textauszeichnungen und Siglen siehe die Legende.\] + -Iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismodIt is time to begin the beguine. Iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod +Iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod +\[It is time to begin the beguine.\] + Iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod -Iriure dolor in hendrerit in vulputateNot Vulture velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blanditNot Blandings praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod +Iriure dolor in hendrerit in vulputate +\[Not Vulture\] + velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit +\[Not Blandings\] + praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod # Assorted elements and links @@ -76,24 +94,24 @@ Fit the first The emph element is used for linguistic emphasis. highlighting (so Now for some links! We will start by cross-referring to a later section. -Here is a simple ptr to it: . Here is a simple ref, a reference to it. +Here is a simple ptr to it: . Here is a simple ref, a [reference to it](#P1). -An external link as ref and as ptr: . +An [external link](http://www.bbc.co.uk) as ref and as ptr: . # Tables Tables may have cells that span multiple columns and rows. -ImageDescriptionCamera directionSVG, JPEG, GIF or PNG formatAll pictures were taken on Jun 27, 2007 ![graphic](nature1.jpg "graphic")Mountain flowers. north![graphic](nature2.jpg "graphic")Sunset over a secondary ridge.north-east![graphic](nature3.jpg "graphic")Glacier lake at 2100m altitude.eastSpans HorizontallyHeader 3Spans HorizontallySpans VerticallyabcdeSpans bothfggijSpans Horizontallyklmno +ImageDescriptionCamera directionSVG, JPEG, GIF or PNG formatAll pictures were taken on Jun 27, 2007 ![graphic](nature1.jpg "graphic")Mountain flowers. north![graphic](nature2.jpg "graphic")Sunset over a secondary ridge.north-east![graphic](nature3.jpg "graphic")Glacier lake at 2100m altitude.eastSpans **Horizontally**Header 3Spans **Horizontally**Spans **Vertically**abcdeSpans **both**fggijSpans **Horizontally**klmno # Lists -Various sorts of list are legal within paragraphs, and you can reference items in lists... -1. Dogs +Various sorts of list are legal within paragraphs, and you can reference [items in lists](#birds)... +1.Dogs -1. Zebras +1.Zebras -1. Birds +1.Birds -1. Cats +1.Cats 100 * first item @@ -276,7 +294,11 @@ It's not my business, Scrooge returned. It's enough for a man to understand his Seeing clearly that it would be useless to pursue their point, the gentlemen withdrew. Scrooge resumed his labours with an improved opinion of himself, and in a more facetious temper than was usual with him. -Foggier yet, and colder! Piercing, searching, biting cold. If the good Saint Dunstan had but nipped the Evil Spirit's nose with a touch of such weather as that, test of a note instead of using his familiar weapons, then indeed he would have roared to lusty purpose. The owner of one scant young nose, gnawed and mumbled by the hungry cold as bones are gnawed by dogs, stooped down at Scrooge's keyhole to regale him with a Christmas carol: but at the first sound of God bless you, merry gentleman! May nothing you dismay! Scrooge seized the ruler with such energy of action that the singer fled in terror, leaving the keyhole to the fog and even more congenial frost. +Foggier yet, and colder! Piercing, searching, biting cold. If the good Saint Dunstan had but nipped the Evil Spirit's nose with a touch of such weather as that, +\[test of a note\] + instead of using his familiar weapons, then indeed he would have roared to lusty purpose. The owner of one scant young nose, gnawed and mumbled by the hungry cold as bones are gnawed by dogs, stooped down at Scrooge's keyhole to regale him with a Christmas carol: but at the first sound of “God bless you, merry gentleman! +May nothing you dismay! +” Scrooge seized the ruler with such energy of action that the singer fled in terror, leaving the keyhole to the fog and even more congenial frost. # Linking @@ -286,24 +308,24 @@ Foggier yet, and colder! Piercing, searching, biting cold. If the good Saint Dun -Fred +[Fred](psn:fred) -Jones 76 +[Jones 76](bibl:Jones76) # Testing preservation of ID Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet. With references to -* Quotation +* [Quotation](#thisQuotation) -* Citation +* [Citation](#thisCitation) -* Paragraph +* [Paragraph](#thisParagraph) -* Reference +* [Reference](#thisReference) -* Anchor +* [Anchor](#movingAnchor) -* Title +* [Title](#thisTitle) I wonder what are the xml-ids preserved in a transformation to XHTML, in particular in the case of quotations. So, let’s try : @@ -324,6 +346,6 @@ an egXML in a list: # divs with no heads -Ampersands: Fit the first& Fit the first& more Fit the first& more Fit the first&& Fit the first" Fit the first @ http://www.example.com/?foo=bar&bar=foo. +Ampersands: Fit the first& Fit the first& more Fit the first& more Fit the first&& Fit the first" Fit the first @ [http://www.example.com/?foo=bar&bar=foo](http://www.example.com/?foo=bar&bar=foo). Ampersands: Fit the first& Fit the first& more Fit the first& more Fit the first&& Fit the first" (as opposed to ") Fit the first @ http://www.example.com/?foo=bar&bar=foo. Fit the second From f1dddfb9cb8d2e657edf8b51f4234be69bf45790 Mon Sep 17 00:00:00 2001 From: helenasabel Date: Fri, 28 Jan 2022 21:57:43 +0100 Subject: [PATCH 13/23] added descendant axis instruction to process all constraintSpec elements --- odds/odd2odd.xsl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/odds/odd2odd.xsl b/odds/odd2odd.xsl index c483db72d..d0b889b51 100644 --- a/odds/odd2odd.xsl +++ b/odds/odd2odd.xsl @@ -2015,7 +2015,9 @@ of this software, even if advised of the possibility of such damage. - + + From a8e754eef0e6a946ad53cc5618417b3d53d59132 Mon Sep 17 00:00:00 2001 From: martindholmes Date: Mon, 14 Feb 2022 08:49:44 -0800 Subject: [PATCH 14/23] Adding @classpathref to all xslt calls per issue #544. --- common/teianttasks.xml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/common/teianttasks.xml b/common/teianttasks.xml index ab06d6c17..e80bea307 100644 --- a/common/teianttasks.xml +++ b/common/teianttasks.xml @@ -72,7 +72,7 @@ unzip ODT template Get names of graphics files and write an ant task - + @@ -89,7 +89,7 @@ XSLT generate files for oo - + @@ -144,19 +144,19 @@ fix Word .rels file - + Fix Word styles file - + Get names of graphics files and write an ant task - + @@ -174,7 +174,7 @@ Generate new files for docx using XSL @{xsl} - + @@ -237,7 +237,7 @@ XSLT generate ePub files in ${outputTempDir} - + @@ -296,7 +296,7 @@ XSLT generate ePub files in ${outputTempDir} - + @@ -314,7 +314,7 @@ XSLT generate HTML files (language ${lang}, style ${teitohtml}, in @{in}, out @{out}) - + @@ -352,7 +352,7 @@ XSLT generate @{type} files - + @@ -385,7 +385,7 @@ Do ODD expand processing (schema ${selectedSchema}) - + @@ -402,7 +402,7 @@ - + @@ -424,7 +424,7 @@ Do ODD expand processing and conversion to TEI Lite (schema ${selectedSchema}) - + @@ -438,7 +438,7 @@ - + From f51a496a645a43adca8df0b35585383f6967b068 Mon Sep 17 00:00:00 2001 From: helenasabel Date: Tue, 15 Feb 2022 21:08:06 +0100 Subject: [PATCH 15/23] update of p5subset (and tests) after changes to attribute ident --- Test/expected-results/test.epub | Bin 384784 -> 383589 bytes Test/expected-results/test.isosch | 35 ++-- Test/expected-results/test.rng | 71 ++++---- Test/expected-results/test.xml.odt | Bin 367117 -> 367116 bytes Test/expected-results/test.xml.odt.listing | 26 +-- Test/expected-results/test15.odd.html | 8 +- Test/expected-results/test15.odd.rnc | 32 ++-- Test/expected-results/test21.odd.rnc | 54 +++--- Test/expected-results/test3.html | 4 +- Test/expected-results/test30.rnc | 46 ++--- Test/expected-results/test33.rnc | 35 ++-- Test/expected-results/test34.combined.json | 4 +- Test/expected-results/test34.rnc | 35 ++-- Test/expected-results/test35.rnc | 35 ++-- Test/expected-results/test4.html | 4 +- Test/expected-results/testdrama.compiled.xml | 120 ++++++------- Test2/expected-results/testPure1.rng | 94 +++++----- source/p5subset.xml | 175 ++++++++++--------- 18 files changed, 417 insertions(+), 361 deletions(-) diff --git a/Test/expected-results/test.epub b/Test/expected-results/test.epub index 79e8b572fb13020cfca2120cd502f7809282e2dc..b3e218a14698e1ec6fd42c758893a03b89e12af7 100644 GIT binary patch delta 31650 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 delta 32944 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 diff --git a/Test/expected-results/test.isosch b/Test/expected-results/test.isosch index 8661aabac..0f1316866 100644 --- a/Test/expected-results/test.isosch +++ b/Test/expected-results/test.isosch @@ -52,7 +52,7 @@ @targetLang should only be used on if @target is specified. - + The element indicated by @spanTo () must follow the current element @@ -66,16 +66,16 @@ The element indicated by @spanTo () must follow the - + - + Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements. - + - + Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText. @@ -134,7 +134,7 @@ 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. @@ -147,7 +147,7 @@ relatedItem element must be empty must contain at least one child l, lg, or gap element. - + Abstract model violation: Lines may not contain line groups. @@ -189,18 +189,17 @@ 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. - + The @spanTo attribute of is required. @@ -211,14 +210,14 @@ The @spanTo attribute of is required. must have at least one child add and at least one child del or surplus - + Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText. - + Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText. @@ -231,16 +230,16 @@ The @spanTo attribute of is required. - + - + 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, unless ab is a child of figure or note, or is a descendant of floatingText. diff --git a/Test/expected-results/test.rng b/Test/expected-results/test.rng index 9add73396..e66a5e390 100644 --- a/Test/expected-results/test.rng +++ b/Test/expected-results/test.rng @@ -1391,7 +1391,7 @@ Suggested values include: 1] top; 2] bottom; 3] margin; 4] opposite; 5] overleaf - + The element indicated by @spanTo () must follow the current element @@ -3414,18 +3414,18 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant (paragraph) marks paragraphs in prose. [3.1. Paragraphs 7.2.5. Speech Contents] - + - + Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements. - + - + - + Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText. - + @@ -4978,11 +4978,11 @@ relatedItem element must be empty - + - + Abstract model violation: Lines may not contain lines or lg elements. - + @@ -5030,11 +5030,11 @@ relatedItem element must be empty must contain at least one child l, lg, or gap element. - + - + Abstract model violation: Lines may not contain line groups. - + @@ -6913,12 +6913,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. @@ -6946,15 +6946,14 @@ 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. + The @spanTo attribute of is required. - + - L'attribut spanTo est requis. + L'attribut spanTo est requis. @@ -6968,14 +6967,14 @@ 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. + The @spanTo attribute of is required. - + - L'attribut spanTo est requis. + L'attribut spanTo est requis. @@ -8144,18 +8143,18 @@ Suggested values include: 1] initial; 2] final - + - + Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText. - + - + - + Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText. - + @@ -9164,18 +9163,18 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat (anonymous block) 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. [16.3. Blocks, Segments, and Anchors] - + - + 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, unless ab is a child of figure or note, or is a descendant of floatingText. - + diff --git a/Test/expected-results/test.xml.odt b/Test/expected-results/test.xml.odt index 61d3141ff0284efdbe2efe0f769f5f3d9cf63157..3753df8cca4ef6221c4c786d336a1f49be2abcae 100644 GIT binary patch delta 2188 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 Schematron -
<s:report test="(ancestor::tei:l or ancestor::tei:lg) and not(ancestor::tei:floatingText)"> Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText. </s:report>
+
<sch:report test="(ancestor::tei:l or ancestor::tei:lg) and not(ancestor::tei:floatingText)"> Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText. </sch:report>
@@ -597,7 +597,7 @@

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

Schematron -
<s:report test="not(ancestor::tei:floatingText) and (ancestor::tei:p or ancestor::tei:ab) and not(parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )"> Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements. </s:report>
+
<sch:report test=" (ancestor::tei:ab or ancestor::tei:p) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )"> Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements. </sch:report>
@@ -1016,7 +1016,7 @@

Schematron -
<s:report test="(ancestor::tei:l or ancestor::tei:lg) and not(parent::tei:figure or parent::tei:note or ancestor::tei:floatingText)"> Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText. </s:report>
+
<sch:report test=" (ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )"> Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText. </sch:report>
diff --git a/Test/expected-results/test15.odd.rnc b/Test/expected-results/test15.odd.rnc index 75088d7f8..c84752725 100644 --- a/Test/expected-results/test15.odd.rnc +++ b/Test/expected-results/test15.odd.rnc @@ -1086,7 +1086,8 @@ att.spanning.attribute.spanTo = ## indicates the end of a span initiated by the element bearing this attribute. attribute spanTo { xsd:anyURI }? sch:pattern [ - id = "test15-att.spanning-spanTo-spanTo-2-constraint-rule-8" + id = + "test15-att.spanning-spanTo-spanTo-points-to-following-constraint-rule-8" "\x{a}" ~ " " sch:rule [ @@ -1768,7 +1769,8 @@ p = element para { macro.paraContent >> sch:pattern [ - id = "test15-p-abstractModel-structure-p-constraint-report-5" + id = + "test15-p-abstractModel-structure-p-in-ab-or-p-constraint-report-5" "\x{a}" ~ " " sch:rule [ @@ -1777,7 +1779,7 @@ p = " " sch:report [ test = - "not(ancestor::tei:floatingText) and (ancestor::tei:p or ancestor::tei:ab) and not(parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )" + " (ancestor::tei:ab or ancestor::tei:p) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )" "\x{a}" ~ " Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.\x{a}" ~ " " @@ -1789,7 +1791,8 @@ p = " " ] >> sch:pattern [ - id = "test15-p-abstractModel-structure-l-constraint-report-6" + id = + "test15-p-abstractModel-structure-p-in-l-or-lg-constraint-report-6" "\x{a}" ~ " " sch:rule [ @@ -1798,7 +1801,7 @@ p = " " sch:report [ test = - "(ancestor::tei:l or ancestor::tei:lg) and not(parent::tei:figure or parent::tei:note or ancestor::tei:floatingText)" + " (ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )" "\x{a}" ~ " Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.\x{a}" ~ " " @@ -3060,7 +3063,8 @@ l = element l { ((text | model.gLike | model.phrase | model.inter | model.global)*) >> sch:pattern [ - id = "test15-l-abstractModel-structure-l-constraint-report-11" + id = + "test15-l-abstractModel-structure-l-in-l-constraint-report-11" "\x{a}" ~ " " sch:rule [ @@ -3117,7 +3121,8 @@ lg = " " ] >> sch:pattern [ - id = "test15-lg-abstractModel-structure-l-constraint-report-12" + id = + "test15-lg-abstractModel-structure-lg-in-l-constraint-report-12" "\x{a}" ~ " " sch:rule [ @@ -4484,7 +4489,7 @@ floatingText = (model.divBottom, model.global*)*)?) >> sch:pattern [ id = - "test15-div-abstractModel-structure-l-constraint-report-14" + "test15-div-abstractModel-structure-div-in-l-or-lg-constraint-report-14" "\x{a}" ~ " " sch:rule [ @@ -4506,7 +4511,7 @@ floatingText = ] >> sch:pattern [ id = - "test15-div-abstractModel-structure-p-constraint-report-15" + "test15-div-abstractModel-structure-div-in-ab-or-p-constraint-report-15" "\x{a}" ~ " " sch:rule [ @@ -4989,7 +4994,7 @@ ab = macro.paraContent >> sch:pattern [ id = - "test15-ab-abstractModel-structure-ab-constraint-report-16" + "test15-ab-abstractModel-structure-ab-in-ab-or-p-constraint-report-16" "\x{a}" ~ " " sch:rule [ @@ -4998,7 +5003,7 @@ ab = " " sch:report [ test = - "not(ancestor::tei:floatingText) and (ancestor::tei:p or ancestor::tei:ab) and not(parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure)" + " (ancestor::tei:p or ancestor::tei:ab) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )" "\x{a}" ~ " Abstract model violation: ab may not occur inside paragraphs or other ab elements.\x{a}" ~ " " @@ -5010,7 +5015,8 @@ ab = " " ] >> sch:pattern [ - id = "test15-ab-abstractModel-structure-l-constraint-report-17" + id = + "test15-ab-abstractModel-structure-ab-in-l-or-lg-constraint-report-17" "\x{a}" ~ " " sch:rule [ @@ -5019,7 +5025,7 @@ ab = " " sch:report [ test = - "(ancestor::tei:l or ancestor::tei:lg) and not(parent::tei:figure or parent::tei:note or ancestor::tei:floatingText)" + " (ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )" "\x{a}" ~ " Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.\x{a}" ~ " " diff --git a/Test/expected-results/test21.odd.rnc b/Test/expected-results/test21.odd.rnc index 98ebf95f8..08fc0f7d2 100644 --- a/Test/expected-results/test21.odd.rnc +++ b/Test/expected-results/test21.odd.rnc @@ -1131,7 +1131,8 @@ att.spanning.attribute.spanTo = ## indique la fin d'un passage introduit par l'élément portant cet attribut. attribute spanTo { xsd:anyURI }? sch:pattern [ - id = "test21-att.spanning-spanTo-spanTo-2-constraint-rule-8" + id = + "test21-att.spanning-spanTo-spanTo-points-to-following-constraint-rule-8" "\x{a}" ~ " " sch:rule [ @@ -2167,7 +2168,8 @@ p = attribute * { text }* }*) >> sch:pattern [ - id = "test21-p-abstractModel-structure-p-constraint-report-5" + id = + "test21-p-abstractModel-structure-p-in-ab-or-p-constraint-report-5" "\x{a}" ~ " " sch:rule [ @@ -2176,7 +2178,7 @@ p = " " sch:report [ test = - "not(ancestor::tei:floatingText) and (ancestor::tei:p or ancestor::tei:ab) and not(parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )" + " (ancestor::tei:ab or ancestor::tei:p) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )" "\x{a}" ~ " Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.\x{a}" ~ " " @@ -2188,7 +2190,8 @@ p = " " ] >> sch:pattern [ - id = "test21-p-abstractModel-structure-l-constraint-report-6" + id = + "test21-p-abstractModel-structure-p-in-l-or-lg-constraint-report-6" "\x{a}" ~ " " sch:rule [ @@ -2197,7 +2200,7 @@ p = " " sch:report [ test = - "(ancestor::tei:l or ancestor::tei:lg) and not(parent::tei:figure or parent::tei:note or ancestor::tei:floatingText)" + " (ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )" "\x{a}" ~ " Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.\x{a}" ~ " " @@ -3513,7 +3516,8 @@ l = element l { ((text | model.gLike | model.phrase | model.inter | model.global)*) >> sch:pattern [ - id = "test21-l-abstractModel-structure-l-constraint-report-11" + id = + "test21-l-abstractModel-structure-l-in-l-constraint-report-11" "\x{a}" ~ " " sch:rule [ @@ -3570,7 +3574,8 @@ lg = " " ] >> sch:pattern [ - id = "test21-lg-abstractModel-structure-l-constraint-report-12" + id = + "test21-lg-abstractModel-structure-lg-in-l-constraint-report-12" "\x{a}" ~ " " sch:rule [ @@ -6180,7 +6185,7 @@ ab = macro.paraContent >> sch:pattern [ id = - "test21-ab-abstractModel-structure-ab-constraint-report-17" + "test21-ab-abstractModel-structure-ab-in-ab-or-p-constraint-report-17" "\x{a}" ~ " " sch:rule [ @@ -6189,7 +6194,7 @@ ab = " " sch:report [ test = - "not(ancestor::tei:floatingText) and (ancestor::tei:p or ancestor::tei:ab) and not(parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure)" + " (ancestor::tei:p or ancestor::tei:ab) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )" "\x{a}" ~ " Abstract model violation: ab may not occur inside paragraphs or other ab elements.\x{a}" ~ " " @@ -6201,7 +6206,8 @@ ab = " " ] >> sch:pattern [ - id = "test21-ab-abstractModel-structure-l-constraint-report-18" + id = + "test21-ab-abstractModel-structure-ab-in-l-or-lg-constraint-report-18" "\x{a}" ~ " " sch:rule [ @@ -6210,7 +6216,7 @@ ab = " " sch:report [ test = - "(ancestor::tei:l or ancestor::tei:lg) and not(parent::tei:figure or parent::tei:note or ancestor::tei:floatingText)" + " (ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )" "\x{a}" ~ " Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.\x{a}" ~ " " @@ -7835,7 +7841,8 @@ addSpan = element addSpan { empty >> sch:pattern [ - id = "test21-addSpan-spanTo-constraint-assert-22" + id = + "test21-addSpan-addSpan-requires-spanTo-constraint-assert-22" "\x{a}" ~ " " sch:rule [ @@ -7855,7 +7862,8 @@ addSpan = " " ] >> sch:pattern [ - id = "test21-addSpan-spanTo_fr-constraint-assert-23" + id = + "test21-addSpan-addSpan-requires-spanTo-fr-constraint-assert-23" "\x{a}" ~ " " sch:rule [ @@ -7881,7 +7889,8 @@ 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-16" + id = + "test21-addSpan-spanTo-spanTo-points-to-following-constraint-rule-16" "\x{a}" ~ " " sch:rule [ @@ -7923,7 +7932,8 @@ damageSpan = element damageSpan { empty >> sch:pattern [ - id = "test21-damageSpan-spanTo-constraint-assert-25" + id = + "test21-damageSpan-damageSpan-requires-spanTo-constraint-assert-25" "\x{a}" ~ " " sch:rule [ @@ -7932,7 +7942,6 @@ damageSpan = " " sch:assert [ test = "@spanTo" - "\x{a}" ~ "The @spanTo attribute of " sch:name [ ] " is required." @@ -7944,7 +7953,8 @@ damageSpan = " " ] >> sch:pattern [ - id = "test21-damageSpan-spanTo_fr-constraint-assert-26" + id = + "test21-damageSpan-damageSpan-requires-spanTo-fr-constraint-assert-26" "\x{a}" ~ " " sch:rule [ @@ -7973,7 +7983,8 @@ delSpan = element delSpan { empty >> sch:pattern [ - id = "test21-delSpan-spanTo-constraint-assert-27" + id = + "test21-delSpan-delSpan-requires-spanTo-constraint-assert-27" "\x{a}" ~ " " sch:rule [ @@ -7993,7 +8004,8 @@ delSpan = " " ] >> sch:pattern [ - id = "test21-delSpan-spanTo_fr-constraint-assert-28" + id = + "test21-delSpan-delSpan-requires-spanTo-fr-constraint-assert-28" "\x{a}" ~ " " sch:rule [ @@ -8398,7 +8410,7 @@ group = (model.divBottom, model.global*)*)?) >> sch:pattern [ id = - "test21-div-abstractModel-structure-l-constraint-report-24" + "test21-div-abstractModel-structure-div-in-l-or-lg-constraint-report-24" "\x{a}" ~ " " sch:rule [ @@ -8420,7 +8432,7 @@ group = ] >> sch:pattern [ id = - "test21-div-abstractModel-structure-p-constraint-report-25" + "test21-div-abstractModel-structure-div-in-ab-or-p-constraint-report-25" "\x{a}" ~ " " sch:rule [ diff --git a/Test/expected-results/test3.html b/Test/expected-results/test3.html index 4411d8db1..37da4485f 100644 --- a/Test/expected-results/test3.html +++ b/Test/expected-results/test3.html @@ -1,5 +1,5 @@ - + @@ -14,7 +14,7 @@
-

Test3

+

Test3

Table of contents

diff --git a/Test/expected-results/test30.rnc b/Test/expected-results/test30.rnc index cf294bc28..763bbcfdc 100644 --- a/Test/expected-results/test30.rnc +++ b/Test/expected-results/test30.rnc @@ -1108,7 +1108,8 @@ Tatt.spanning.attribute.spanTo = ## indicates the end of a span initiated by the element bearing this attribute. attribute spanTo { xsd:anyURI }? sch:pattern [ - id = "testbasic-att.spanning-spanTo-spanTo-2-constraint-rule-8" + id = + "testbasic-att.spanning-spanTo-spanTo-points-to-following-constraint-rule-8" "\x{a}" ~ " " sch:rule [ @@ -2141,7 +2142,7 @@ Tp = Tmacro.paraContent >> sch:pattern [ id = - "testbasic-p-abstractModel-structure-p-constraint-report-5" + "testbasic-p-abstractModel-structure-p-in-ab-or-p-constraint-report-5" "\x{a}" ~ " " sch:rule [ @@ -2150,7 +2151,7 @@ Tp = " " sch:report [ test = - "not(ancestor::tei:floatingText) and (ancestor::tei:p or ancestor::tei:ab) and not(parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )" + " (ancestor::tei:ab or ancestor::tei:p) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )" "\x{a}" ~ " Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.\x{a}" ~ " " @@ -2163,7 +2164,7 @@ Tp = ] >> sch:pattern [ id = - "testbasic-p-abstractModel-structure-l-constraint-report-6" + "testbasic-p-abstractModel-structure-p-in-l-or-lg-constraint-report-6" "\x{a}" ~ " " sch:rule [ @@ -2172,7 +2173,7 @@ Tp = " " sch:report [ test = - "(ancestor::tei:l or ancestor::tei:lg) and not(parent::tei:figure or parent::tei:note or ancestor::tei:floatingText)" + " (ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )" "\x{a}" ~ " Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.\x{a}" ~ " " @@ -3468,7 +3469,7 @@ Tl = | Tmodel.global)*) >> sch:pattern [ id = - "testbasic-l-abstractModel-structure-l-constraint-report-11" + "testbasic-l-abstractModel-structure-l-in-l-constraint-report-11" "\x{a}" ~ " " sch:rule [ @@ -3526,7 +3527,7 @@ Tlg = ] >> sch:pattern [ id = - "testbasic-lg-abstractModel-structure-l-constraint-report-12" + "testbasic-lg-abstractModel-structure-lg-in-l-constraint-report-12" "\x{a}" ~ " " sch:rule [ @@ -6309,7 +6310,8 @@ TaddSpan = element addSpan { empty >> sch:pattern [ - id = "testbasic-addSpan-spanTo-constraint-assert-16" + id = + "testbasic-addSpan-addSpan-requires-spanTo-constraint-assert-16" "\x{a}" ~ " " sch:rule [ @@ -6329,7 +6331,8 @@ TaddSpan = " " ] >> sch:pattern [ - id = "testbasic-addSpan-spanTo_fr-constraint-assert-17" + id = + "testbasic-addSpan-addSpan-requires-spanTo-fr-constraint-assert-17" "\x{a}" ~ " " sch:rule [ @@ -6370,7 +6373,8 @@ TdamageSpan = element damageSpan { empty >> sch:pattern [ - id = "testbasic-damageSpan-spanTo-constraint-assert-18" + id = + "testbasic-damageSpan-damageSpan-requires-spanTo-constraint-assert-18" "\x{a}" ~ " " sch:rule [ @@ -6379,7 +6383,6 @@ TdamageSpan = " " sch:assert [ test = "@spanTo" - "\x{a}" ~ "The @spanTo attribute of " sch:name [ ] " is required." @@ -6391,7 +6394,8 @@ TdamageSpan = " " ] >> sch:pattern [ - id = "testbasic-damageSpan-spanTo_fr-constraint-assert-19" + id = + "testbasic-damageSpan-damageSpan-requires-spanTo-fr-constraint-assert-19" "\x{a}" ~ " " sch:rule [ @@ -6420,7 +6424,8 @@ TdelSpan = element delSpan { empty >> sch:pattern [ - id = "testbasic-delSpan-spanTo-constraint-assert-20" + id = + "testbasic-delSpan-delSpan-requires-spanTo-constraint-assert-20" "\x{a}" ~ " " sch:rule [ @@ -6440,7 +6445,8 @@ TdelSpan = " " ] >> sch:pattern [ - id = "testbasic-delSpan-spanTo_fr-constraint-assert-21" + id = + "testbasic-delSpan-delSpan-requires-spanTo-fr-constraint-assert-21" "\x{a}" ~ " " sch:rule [ @@ -6914,7 +6920,7 @@ Tab = Tmacro.paraContent >> sch:pattern [ id = - "testbasic-ab-abstractModel-structure-ab-constraint-report-18" + "testbasic-ab-abstractModel-structure-ab-in-ab-or-p-constraint-report-18" "\x{a}" ~ " " sch:rule [ @@ -6923,7 +6929,7 @@ Tab = " " sch:report [ test = - "not(ancestor::tei:floatingText) and (ancestor::tei:p or ancestor::tei:ab) and not(parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure)" + " (ancestor::tei:p or ancestor::tei:ab) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )" "\x{a}" ~ " Abstract model violation: ab may not occur inside paragraphs or other ab elements.\x{a}" ~ " " @@ -6936,7 +6942,7 @@ Tab = ] >> sch:pattern [ id = - "testbasic-ab-abstractModel-structure-l-constraint-report-19" + "testbasic-ab-abstractModel-structure-ab-in-l-or-lg-constraint-report-19" "\x{a}" ~ " " sch:rule [ @@ -6945,7 +6951,7 @@ Tab = " " sch:report [ test = - "(ancestor::tei:l or ancestor::tei:lg) and not(parent::tei:figure or parent::tei:note or ancestor::tei:floatingText)" + " (ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )" "\x{a}" ~ " Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.\x{a}" ~ " " @@ -7494,7 +7500,7 @@ Tdiv = (Tmodel.divBottom, Tmodel.global*)*)?) >> sch:pattern [ id = - "testbasic-div-abstractModel-structure-l-constraint-report-20" + "testbasic-div-abstractModel-structure-div-in-l-or-lg-constraint-report-20" "\x{a}" ~ " " sch:rule [ @@ -7516,7 +7522,7 @@ Tdiv = ] >> sch:pattern [ id = - "testbasic-div-abstractModel-structure-p-constraint-report-21" + "testbasic-div-abstractModel-structure-div-in-ab-or-p-constraint-report-21" "\x{a}" ~ " " sch:rule [ diff --git a/Test/expected-results/test33.rnc b/Test/expected-results/test33.rnc index 41ba5d748..737f1ad62 100644 --- a/Test/expected-results/test33.rnc +++ b/Test/expected-results/test33.rnc @@ -1094,7 +1094,8 @@ tei_att.spanning.attribute.spanTo = ## indicates the end of a span initiated by the element bearing this attribute. attribute spanTo { xsd:anyURI }? sch:pattern [ - id = "foo-att.spanning-spanTo-spanTo-2-constraint-rule-8" + id = + "foo-att.spanning-spanTo-spanTo-points-to-following-constraint-rule-8" "\x{a}" ~ " " sch:rule [ @@ -1871,7 +1872,8 @@ tei_p = element tei:p { tei_macro.paraContent >> sch:pattern [ - id = "foo-p-abstractModel-structure-p-constraint-report-5" + id = + "foo-p-abstractModel-structure-p-in-ab-or-p-constraint-report-5" "\x{a}" ~ " " sch:rule [ @@ -1880,7 +1882,7 @@ tei_p = " " sch:report [ test = - "not(ancestor::tei:floatingText) and (ancestor::tei:p or ancestor::tei:ab) and not(parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )" + " (ancestor::tei:ab or ancestor::tei:p) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )" "\x{a}" ~ " Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.\x{a}" ~ " " @@ -1892,7 +1894,8 @@ tei_p = " " ] >> sch:pattern [ - id = "foo-p-abstractModel-structure-l-constraint-report-6" + id = + "foo-p-abstractModel-structure-p-in-l-or-lg-constraint-report-6" "\x{a}" ~ " " sch:rule [ @@ -1901,7 +1904,7 @@ tei_p = " " sch:report [ test = - "(ancestor::tei:l or ancestor::tei:lg) and not(parent::tei:figure or parent::tei:note or ancestor::tei:floatingText)" + " (ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )" "\x{a}" ~ " Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.\x{a}" ~ " " @@ -3221,7 +3224,8 @@ tei_l = | tei_model.inter | tei_model.global)*) >> sch:pattern [ - id = "foo-l-abstractModel-structure-l-constraint-report-11" + id = + "foo-l-abstractModel-structure-l-in-l-constraint-report-11" "\x{a}" ~ " " sch:rule [ @@ -3281,7 +3285,8 @@ tei_lg = " " ] >> sch:pattern [ - id = "foo-lg-abstractModel-structure-l-constraint-report-12" + id = + "foo-lg-abstractModel-structure-lg-in-l-constraint-report-12" "\x{a}" ~ " " sch:rule [ @@ -4682,7 +4687,8 @@ tei_div = tei_model.global*)*)), (tei_model.divBottom, tei_model.global*)*)?) >> sch:pattern [ - id = "foo-div-abstractModel-structure-l-constraint-report-14" + id = + "foo-div-abstractModel-structure-div-in-l-or-lg-constraint-report-14" "\x{a}" ~ " " sch:rule [ @@ -4703,7 +4709,8 @@ tei_div = " " ] >> sch:pattern [ - id = "foo-div-abstractModel-structure-p-constraint-report-15" + id = + "foo-div-abstractModel-structure-div-in-ab-or-p-constraint-report-15" "\x{a}" ~ " " sch:rule [ @@ -5207,7 +5214,8 @@ tei_ab = element tei:ab { tei_macro.paraContent >> sch:pattern [ - id = "foo-ab-abstractModel-structure-ab-constraint-report-16" + id = + "foo-ab-abstractModel-structure-ab-in-ab-or-p-constraint-report-16" "\x{a}" ~ " " sch:rule [ @@ -5216,7 +5224,7 @@ tei_ab = " " sch:report [ test = - "not(ancestor::tei:floatingText) and (ancestor::tei:p or ancestor::tei:ab) and not(parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure)" + " (ancestor::tei:p or ancestor::tei:ab) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )" "\x{a}" ~ " Abstract model violation: ab may not occur inside paragraphs or other ab elements.\x{a}" ~ " " @@ -5228,7 +5236,8 @@ tei_ab = " " ] >> sch:pattern [ - id = "foo-ab-abstractModel-structure-l-constraint-report-17" + id = + "foo-ab-abstractModel-structure-ab-in-l-or-lg-constraint-report-17" "\x{a}" ~ " " sch:rule [ @@ -5237,7 +5246,7 @@ tei_ab = " " sch:report [ test = - "(ancestor::tei:l or ancestor::tei:lg) and not(parent::tei:figure or parent::tei:note or ancestor::tei:floatingText)" + " (ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )" "\x{a}" ~ " Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.\x{a}" ~ " " diff --git a/Test/expected-results/test34.combined.json b/Test/expected-results/test34.combined.json index 157bcd486..94fcb3351 100644 --- a/Test/expected-results/test34.combined.json +++ b/Test/expected-results/test34.combined.json @@ -16713,8 +16713,8 @@ "ns" : "", "usage" : "opt", "desc" : - [ "indicates the end of a span initiated by the element\n\tbearing this attribute.<\/desc>" ], - "shortDesc" : "indicates the end of a span initiated by the element\n\tbearing this attribute.", + [ "indicates the end of a span initiated by the element\n bearing this attribute.<\/desc>" ], + "shortDesc" : "indicates the end of a span initiated by the element\n bearing this attribute.", "gloss" : [ ], "altIdent" : diff --git a/Test/expected-results/test34.rnc b/Test/expected-results/test34.rnc index 0db564290..1f4773119 100644 --- a/Test/expected-results/test34.rnc +++ b/Test/expected-results/test34.rnc @@ -1095,7 +1095,8 @@ tei_att.spanning.attribute.spanTo = ## indicates the end of a span initiated by the element bearing this attribute. attribute spanTo { xsd:anyURI }? sch:pattern [ - id = "foo-att.spanning-spanTo-spanTo-2-constraint-rule-8" + id = + "foo-att.spanning-spanTo-spanTo-points-to-following-constraint-rule-8" "\x{a}" ~ " " sch:rule [ @@ -1876,7 +1877,8 @@ tei_p = element p { tei_macro.paraContent >> sch:pattern [ - id = "foo-p-abstractModel-structure-p-constraint-report-5" + id = + "foo-p-abstractModel-structure-p-in-ab-or-p-constraint-report-5" "\x{a}" ~ " " sch:rule [ @@ -1885,7 +1887,7 @@ tei_p = " " sch:report [ test = - "not(ancestor::tei:floatingText) and (ancestor::tei:p or ancestor::tei:ab) and not(parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )" + " (ancestor::tei:ab or ancestor::tei:p) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )" "\x{a}" ~ " Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.\x{a}" ~ " " @@ -1897,7 +1899,8 @@ tei_p = " " ] >> sch:pattern [ - id = "foo-p-abstractModel-structure-l-constraint-report-6" + id = + "foo-p-abstractModel-structure-p-in-l-or-lg-constraint-report-6" "\x{a}" ~ " " sch:rule [ @@ -1906,7 +1909,7 @@ tei_p = " " sch:report [ test = - "(ancestor::tei:l or ancestor::tei:lg) and not(parent::tei:figure or parent::tei:note or ancestor::tei:floatingText)" + " (ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )" "\x{a}" ~ " Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.\x{a}" ~ " " @@ -3226,7 +3229,8 @@ tei_l = | tei_model.inter | tei_model.global)*) >> sch:pattern [ - id = "foo-l-abstractModel-structure-l-constraint-report-11" + id = + "foo-l-abstractModel-structure-l-in-l-constraint-report-11" "\x{a}" ~ " " sch:rule [ @@ -3286,7 +3290,8 @@ tei_lg = " " ] >> sch:pattern [ - id = "foo-lg-abstractModel-structure-l-constraint-report-12" + id = + "foo-lg-abstractModel-structure-lg-in-l-constraint-report-12" "\x{a}" ~ " " sch:rule [ @@ -4685,7 +4690,8 @@ tei_div = tei_model.global*)*)), (tei_model.divBottom, tei_model.global*)*)?) >> sch:pattern [ - id = "foo-div-abstractModel-structure-l-constraint-report-14" + id = + "foo-div-abstractModel-structure-div-in-l-or-lg-constraint-report-14" "\x{a}" ~ " " sch:rule [ @@ -4706,7 +4712,8 @@ tei_div = " " ] >> sch:pattern [ - id = "foo-div-abstractModel-structure-p-constraint-report-15" + id = + "foo-div-abstractModel-structure-div-in-ab-or-p-constraint-report-15" "\x{a}" ~ " " sch:rule [ @@ -5210,7 +5217,8 @@ tei_ab = element ab { tei_macro.paraContent >> sch:pattern [ - id = "foo-ab-abstractModel-structure-ab-constraint-report-16" + id = + "foo-ab-abstractModel-structure-ab-in-ab-or-p-constraint-report-16" "\x{a}" ~ " " sch:rule [ @@ -5219,7 +5227,7 @@ tei_ab = " " sch:report [ test = - "not(ancestor::tei:floatingText) and (ancestor::tei:p or ancestor::tei:ab) and not(parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure)" + " (ancestor::tei:p or ancestor::tei:ab) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )" "\x{a}" ~ " Abstract model violation: ab may not occur inside paragraphs or other ab elements.\x{a}" ~ " " @@ -5231,7 +5239,8 @@ tei_ab = " " ] >> sch:pattern [ - id = "foo-ab-abstractModel-structure-l-constraint-report-17" + id = + "foo-ab-abstractModel-structure-ab-in-l-or-lg-constraint-report-17" "\x{a}" ~ " " sch:rule [ @@ -5240,7 +5249,7 @@ tei_ab = " " sch:report [ test = - "(ancestor::tei:l or ancestor::tei:lg) and not(parent::tei:figure or parent::tei:note or ancestor::tei:floatingText)" + " (ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )" "\x{a}" ~ " Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.\x{a}" ~ " " diff --git a/Test/expected-results/test35.rnc b/Test/expected-results/test35.rnc index 891d6b032..01afd22ce 100644 --- a/Test/expected-results/test35.rnc +++ b/Test/expected-results/test35.rnc @@ -1093,7 +1093,8 @@ tei_att.spanning.attribute.spanTo = ## indicates the end of a span initiated by the element bearing this attribute. attribute spanTo { xsd:anyURI }? sch:pattern [ - id = "foo-att.spanning-spanTo-spanTo-2-constraint-rule-8" + id = + "foo-att.spanning-spanTo-spanTo-points-to-following-constraint-rule-8" "\x{a}" ~ " " sch:rule [ @@ -1869,7 +1870,8 @@ tei_p = element tei:p { tei_macro.paraContent >> sch:pattern [ - id = "foo-p-abstractModel-structure-p-constraint-report-5" + id = + "foo-p-abstractModel-structure-p-in-ab-or-p-constraint-report-5" "\x{a}" ~ " " sch:rule [ @@ -1878,7 +1880,7 @@ tei_p = " " sch:report [ test = - "not(ancestor::tei:floatingText) and (ancestor::tei:p or ancestor::tei:ab) and not(parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )" + " (ancestor::tei:ab or ancestor::tei:p) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )" "\x{a}" ~ " Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.\x{a}" ~ " " @@ -1890,7 +1892,8 @@ tei_p = " " ] >> sch:pattern [ - id = "foo-p-abstractModel-structure-l-constraint-report-6" + id = + "foo-p-abstractModel-structure-p-in-l-or-lg-constraint-report-6" "\x{a}" ~ " " sch:rule [ @@ -1899,7 +1902,7 @@ tei_p = " " sch:report [ test = - "(ancestor::tei:l or ancestor::tei:lg) and not(parent::tei:figure or parent::tei:note or ancestor::tei:floatingText)" + " (ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )" "\x{a}" ~ " Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.\x{a}" ~ " " @@ -3219,7 +3222,8 @@ tei_l = | tei_model.inter | tei_model.global)*) >> sch:pattern [ - id = "foo-l-abstractModel-structure-l-constraint-report-11" + id = + "foo-l-abstractModel-structure-l-in-l-constraint-report-11" "\x{a}" ~ " " sch:rule [ @@ -3279,7 +3283,8 @@ tei_lg = " " ] >> sch:pattern [ - id = "foo-lg-abstractModel-structure-l-constraint-report-12" + id = + "foo-lg-abstractModel-structure-lg-in-l-constraint-report-12" "\x{a}" ~ " " sch:rule [ @@ -4661,7 +4666,8 @@ tei_div = tei_model.global*)*)), (tei_model.divBottom, tei_model.global*)*)?) >> sch:pattern [ - id = "foo-div-abstractModel-structure-l-constraint-report-14" + id = + "foo-div-abstractModel-structure-div-in-l-or-lg-constraint-report-14" "\x{a}" ~ " " sch:rule [ @@ -4682,7 +4688,8 @@ tei_div = " " ] >> sch:pattern [ - id = "foo-div-abstractModel-structure-p-constraint-report-15" + id = + "foo-div-abstractModel-structure-div-in-ab-or-p-constraint-report-15" "\x{a}" ~ " " sch:rule [ @@ -5186,7 +5193,8 @@ tei_ab = element tei:ab { tei_macro.paraContent >> sch:pattern [ - id = "foo-ab-abstractModel-structure-ab-constraint-report-16" + id = + "foo-ab-abstractModel-structure-ab-in-ab-or-p-constraint-report-16" "\x{a}" ~ " " sch:rule [ @@ -5195,7 +5203,7 @@ tei_ab = " " sch:report [ test = - "not(ancestor::tei:floatingText) and (ancestor::tei:p or ancestor::tei:ab) and not(parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure)" + " (ancestor::tei:p or ancestor::tei:ab) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )" "\x{a}" ~ " Abstract model violation: ab may not occur inside paragraphs or other ab elements.\x{a}" ~ " " @@ -5207,7 +5215,8 @@ tei_ab = " " ] >> sch:pattern [ - id = "foo-ab-abstractModel-structure-l-constraint-report-17" + id = + "foo-ab-abstractModel-structure-ab-in-l-or-lg-constraint-report-17" "\x{a}" ~ " " sch:rule [ @@ -5216,7 +5225,7 @@ tei_ab = " " sch:report [ test = - "(ancestor::tei:l or ancestor::tei:lg) and not(parent::tei:figure or parent::tei:note or ancestor::tei:floatingText)" + " (ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )" "\x{a}" ~ " Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.\x{a}" ~ " " diff --git a/Test/expected-results/test4.html b/Test/expected-results/test4.html index 4411d8db1..37da4485f 100644 --- a/Test/expected-results/test4.html +++ b/Test/expected-results/test4.html @@ -1,5 +1,5 @@ - + @@ -14,7 +14,7 @@
-

Test3

+

Test3

Table of contents

diff --git a/Test/expected-results/testdrama.compiled.xml b/Test/expected-results/testdrama.compiled.xml index 7dedcb58b..a93fe3525 100644 --- a/Test/expected-results/testdrama.compiled.xml +++ b/Test/expected-results/testdrama.compiled.xml @@ -3500,7 +3500,7 @@ subject, predicate etc. may be more appropriate. Such constraints will typically indicates the end of a span initiated by the element - bearing this attribute. + bearing this attribute. 이 속성을 포함하는 요소에 의해 시작된 구간의 끝을 나타낸다. 指出文字段的結尾，該文字段以帶有此屬性的元素開頭。 当該要素が示す範囲の終点を示す． @@ -3508,14 +3508,14 @@ subject, predicate etc. may be more appropriate. Such constraints will typically indica el final de un fragmento de texto iniciado con el elemento al cual es asignaado el atributo. indica la fine della porzione di testo che ha inizio con l'elemento a cui è assegnato l'attributo - + The @spanTo attribute must point to an element following the - current element + current element The element indicated by @spanTo () must follow the current element - + @@ -7047,7 +7047,7 @@ Elements 2.3.6.3. Milestone Method 2.3.6. The Reference System Declaration - + paragraph 문단 段落 @@ -7073,18 +7073,18 @@ Elements - + - + Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements. - + - + - + Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText. - + @@ -15656,7 +15656,7 @@ relatedItem element must be empty 3.12.2.7. Related Items - + verse line 운문 시행 詩行 @@ -15680,21 +15680,19 @@ relatedItem element must be empty - - - - - - - - - + + + + + + + - + - + Abstract model violation: Lines may not contain lines or lg elements. - + @@ -15718,7 +15716,7 @@ relatedItem element must be empty 3.13. Passages of Verse or Drama 7.2.5. Speech Contents - + line group 시행군 行組 @@ -15747,48 +15745,40 @@ relatedItem element must be empty - - - - - - + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + - + An lg element must contain at least one child l, lg, or gap element. - + - + Abstract model violation: Lines may not contain line groups. - + @@ -24108,7 +24098,7 @@ during the evolution of the encoded representation of that text.

4.3.2. Floating Texts - + text division 텍스트 구역 文本區段 @@ -24175,18 +24165,18 @@ during the evolution of the encoded representation of that text.

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

16.1. Links - + anonymous block 익명 구역 匿名區塊 @@ -27747,18 +27737,18 @@ the date of the entire document, not for any subset or part of it.

- + - + 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, unless ab is a child of figure or note, or is a descendant of floatingText. - + diff --git a/Test2/expected-results/testPure1.rng b/Test2/expected-results/testPure1.rng index 9ce5eaf58..9366aa233 100644 --- a/Test2/expected-results/testPure1.rng +++ b/Test2/expected-results/testPure1.rng @@ -1391,7 +1391,7 @@ Suggested values include: 1] top; 2] bottom; 3] margin; 4] opposite; 5] overleaf + id="testPure1-att.spanning-spanTo-spanTo-points-to-following-constraint-rule-8"> (paragraph) marks paragraphs in prose. [3.1. Paragraphs 7.2.5. Speech Contents] + id="testPure1-p-abstractModel-structure-p-in-ab-or-p-constraint-report-5"> - + Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements. - + + id="testPure1-p-abstractModel-structure-p-in-l-or-lg-constraint-report-6"> - + Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText. - + @@ -4626,13 +4628,14 @@ relatedItem element must be empty + id="testPure1-l-abstractModel-structure-l-in-l-constraint-report-11"> - + Abstract model violation: Lines may not contain lines or lg elements. - + @@ -4685,13 +4688,14 @@ relatedItem element must be empty + id="testPure1-lg-abstractModel-structure-lg-in-l-constraint-report-12"> - + Abstract model violation: Lines may not contain line groups. - + @@ -6836,25 +6840,27 @@ Sample values include: 1] image; 2] character; 3] theme; 4] allusion(anonymous block) 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. [16.3. Blocks, Segments, and Anchors] + id="testPure1-ab-abstractModel-structure-ab-in-ab-or-p-constraint-report-20"> - + Abstract model violation: ab may not occur inside paragraphs or other ab elements. - + + id="testPure1-ab-abstractModel-structure-ab-in-l-or-lg-constraint-report-21"> - + Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText. - + @@ -7542,23 +7548,25 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec + id="testPure1-div-abstractModel-structure-div-in-l-or-lg-constraint-report-22"> - + Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText. - + + id="testPure1-div-abstractModel-structure-div-in-ab-or-p-constraint-report-23"> - + Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText. - + diff --git a/source/p5subset.xml b/source/p5subset.xml index 11070a967..60b9573e8 100644 --- a/source/p5subset.xml +++ b/source/p5subset.xml @@ -7,7 +7,7 @@ Version 4.4.0a. Last updated on - 19th January 2022, revision daab99ca7 + 15th February 2022, revision 118a5a6e0 TEI Consortium @@ -4454,7 +4454,7 @@ subject, predicate etc. may be more appropriate. Such constraints will typically indicates the end of a span initiated by the element - bearing this attribute. + bearing this attribute. 이 속성을 포함하는 요소에 의해 시작된 구간의 끝을 나타낸다. 指出文字段的結尾，該文字段以帶有此屬性的元素開頭。 当該要素が示す範囲の終点を示す． @@ -4462,14 +4462,14 @@ subject, predicate etc. may be more appropriate. Such constraints will typically indica el final de un fragmento de texto iniciado con el elemento al cual es asignaado el atributo. indica la fine della porzione di testo che ha inizio con l'elemento a cui è assegnato l'attributo - + The @spanTo attribute must point to an element following the - current element + current element The element indicated by @spanTo () must follow the current element - + @@ -15135,7 +15135,7 @@ supplied to printer.
Elements Available in All TEI Documents
Paragraphs - + paragraph 문단 段落 @@ -15161,18 +15161,18 @@ supplied to printer. - + - + Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements. - + - + - + Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText. - + @@ -23975,7 +23975,7 @@ relatedItem element must be empty
Relationship to Other Bibliographic Schemes
Passages of Verse or Drama
Core Tags for Verse - + verse line 운문 시행 詩行 @@ -23999,21 +23999,19 @@ relatedItem element must be empty - - - - - - - - - + + + + + + + - + - + Abstract model violation: Lines may not contain lines or lg elements. - + @@ -24038,7 +24036,7 @@ relatedItem element must be empty - + line group 시행군 行組 @@ -24067,48 +24065,40 @@ relatedItem element must be empty - - - - - - + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + - + An lg element must contain at least one child l, lg, or gap element. - + - + Abstract model violation: Lines may not contain line groups. - + @@ -25593,7 +25583,7 @@ by the stage direction.
Divisions of the Body
Un-numbered Divisions - + text division 텍스트 구역 文本區段 @@ -25660,18 +25650,18 @@ by the stage direction.

- + - + Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText. - + - + - + Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText. - + @@ -45801,12 +45791,12 @@ en-tête et un texte, constitue un document TEI. - + The @spanTo attribute of is required. - + L'attribut spanTo est requis. @@ -45931,7 +45921,7 @@ appropriate for which circumstance.

 - + damaged span of text 텍스트의 손상 구간 fragmento de texto dañado @@ -45955,16 +45945,15 @@ endommagée d'une manière quelconque mais toujours lisible. - + - -The @spanTo attribute of is required. + The @spanTo attribute of is required. - + - L'attribut spanTo est requis. + L'attribut spanTo est requis. @@ -46037,7 +46026,7 @@ the start of the undamaged part of the text. ...

 - + deleted span of text 텍스트의 삭제 구간 刪除的文字段 @@ -46064,15 +46053,15 @@ author, scribe, annotator, or corrector. - + - The @spanTo attribute of is required. + The @spanTo attribute of is required. - + - L'attribut spanTo est requis. + L'attribut spanTo est requis. @@ -56381,7 +56370,7 @@ Information with a Text
Miscellaneous Usages
Citation Structures
Blocks, Segments, and Anchors - + anonymous block 익명 구역 匿名區塊 @@ -56407,18 +56396,18 @@ Information with a Text - + - + 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, unless ab is a child of figure or note, or is a descendant of floatingText. - + @@ -68538,6 +68527,16 @@ have a canonical name, supplied as the value for their + + + + + + The @ident of 'constraintSpec' should be unique; this one () is the same as that of a previous 'constraintSpec'. + + + + supplies the name of the language in which the constraints @@ -68602,7 +68601,7 @@ have a canonical name, supplied as the value for their

This constraint uses SPITBOL (a language which is not expressed in XML) to check whether the title and author are identical:

- + (output = leq(title,author) "title and author cannot be the same") @@ -69939,7 +69938,18 @@ should correspond to an existing module, via a moduleSpec or provides a date before which the construct being defined will not be removed. 定義されている構文が削除される前の日付を提供する． - + + + + @@ -69979,8 +69989,7 @@ should correspond to an existing module, via a moduleSpec or the future. E.g., the documentation for such a construct might include the phrase warning: deprecated in red.

- - +

この属性の値は，（yyyy-mm-ddの形式で）日付を表し，属性がODDに追加された日付より後である必要がある。技術的には，この属性は，指定された日付まで定義されているマークアップ言語の将来のリリースで構造を残す意図のみを表明し，その日付以降に何が起こるかについて主張しない。実際には，validUntil日付の直後に定義されるマークアップ言語の将来のリリースからコンストラクトが削除されることが期待されます。

ODDプロセッサは，通常，validUntil日付が過去のものである仕様要素を処理しない．ODDプロセッサは，通常，validUntilの日付を持つコンストラクトについてユーザに警告する。例えば，そのような構造のドキュメントには，warning：deprecatedというフレーズが赤で表示される。

From 3275034b628788f350ff6bdea19bb5a4f7c46261 Mon Sep 17 00:00:00 2001 From: helenasabel Date: Tue, 15 Feb 2022 21:50:28 +0100 Subject: [PATCH 16/23] changed keys declaration of constraintSpec (and corresponding processing template) --- odds/odd2odd.xsl | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/odds/odd2odd.xsl b/odds/odd2odd.xsl index d0b889b51..268132d77 100644 --- a/odds/odd2odd.xsl +++ b/odds/odd2odd.xsl @@ -71,12 +71,14 @@ of this software, even if advised of the possibility of such damage. whereas elements in ODD customization file are copied through. --> false + - + - + @@ -104,7 +106,7 @@ of this software, even if advised of the possibility of such damage. - + @@ -2020,13 +2022,13 @@ of this software, even if advised of the possibility of such damage. (e.g. elementSpec/attList/constraintSpec) --> - + - - - + + + From 4417ef26b13bda28b5f3ad81058cde02500cd533 Mon Sep 17 00:00:00 2001 From: Syd Bauman Date: Wed, 1 Jun 2022 18:10:05 -0400 Subject: [PATCH 17/23] With @ebeshero update p5subset, which was a bear --- Test/expected-results/oddbyexample.odd | 5 - Test/expected-results/test.isosch | 78 +- Test/expected-results/test.rng | 392 +++-- Test/expected-results/test15.odd.html | 44 +- Test/expected-results/test15.odd.rnc | 288 +++- Test/expected-results/test21.odd.rnc | 417 +++-- Test/expected-results/test30.dtd | 8 +- Test/expected-results/test30.rnc | 365 +++-- Test/expected-results/test33.rnc | 288 +++- Test/expected-results/test34.combined.json | 18 +- Test/expected-results/test34.rnc | 288 +++- Test/expected-results/test35.rnc | 288 +++- Test/expected-results/testdrama.compiled.xml | 334 ++-- Test2/expected-results/testPure1.rng | 383 +++-- source/p5subset.xml | 1523 +++++++++--------- 15 files changed, 2981 insertions(+), 1738 deletions(-) diff --git a/Test/expected-results/oddbyexample.odd b/Test/expected-results/oddbyexample.odd index d5e512107..67fb36f99 100644 --- a/Test/expected-results/oddbyexample.odd +++ b/Test/expected-results/oddbyexample.odd @@ -123,11 +123,6 @@ - - - - - diff --git a/Test/expected-results/test.isosch b/Test/expected-results/test.isosch index 0f1316866..ead22bb9b 100644 --- a/Test/expected-results/test.isosch +++ b/Test/expected-results/test.isosch @@ -37,50 +37,60 @@ element has no textual content. - + + + + + When used on a schema description element (like + ), the @source attribute + should have only 1 value. (This one has .) + + + + The @unit attribute may be unnecessary when @unitRef is present. - + The element should not be categorized in detail with @subtype unless also categorized in general with @type - + @targetLang should only be used on if @target is specified. - + The element indicated by @spanTo () must follow the current element - + @schemeVersion can only be used if @scheme is specified. - + Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements. - + Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText. - + Information about a deprecation should only be present in a specification element @@ -89,43 +99,43 @@ The element indicated by @spanTo () must follow the type="deprecationInfo">. - + When target= is present, neither from= nor to= should be. - + When from= is present, the to= attribute of is required. - + When to= is present, the from= attribute of is required. - + 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 @@ -134,48 +144,48 @@ 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 - + A with a parent must have a @delim attribute. - + An XPath in @match on the outer must start with '/'. - + An XPath in @match must not start with '/' except on the outer . - + , 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 or surplus - + Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText. - + Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText. - + 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, unless ab is a child of figure or note, or is a descendant of floatingText. - + You must supply at least two values for @target on - + This element must have a @type attribute, since it is diff --git a/Test/expected-results/test.rng b/Test/expected-results/test.rng index abbb82a8a..1a9c221b2 100644 --- a/Test/expected-results/test.rng +++ b/Test/expected-results/test.rng @@ -103,7 +103,9 @@ (target end) points to the end of the span to which the note is attached, if the note is not embedded in the text at that point. - + + \S+ + @@ -118,7 +120,9 @@ indicates the person, or group of people, to whom the element content is ascribed. - + + \S+ + @@ -134,7 +138,9 @@ indicates the person, or group of people, to whom a speech act or action is directed. - + + \S+ + @@ -158,7 +164,9 @@ (reference) provides an explicit means of locating a full definition or identity for the entity being named by means of one or more URIs. - + + \S+ + @@ -323,7 +331,9 @@ Sample values include: 1] all; 2] most; 3] range points to a <handNote> element describing the hand considered responsible for the content of the element concerned. - + + \S+ + @@ -515,7 +525,9 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke indicates one or more systems or calendars to which the date represented by the content of this element belongs. - + + \S+ + @@ -534,7 +546,9 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke supplies pointers to one or more definitions of named periods of time (typically <category>s or <calendar>s) within which the datable item is understood to have occurred. - + + \S+ + @@ -550,7 +564,9 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke contains a PID (persistent identifier) that aligns the given element with the appropriate Data Category (or categories) in ISOcat. - + + \S+ + @@ -562,7 +578,9 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke contains a PID (persistent identifier) that aligns the content of the given element or the value of the given attribute with the appropriate simple Data Category (or categories) in ISOcat. - + + \S+ + @@ -590,10 +608,12 @@ Sample values include: 1] rubbing; 2] mildew; 3] smoke - identifies one or more declarable elements within the header, which are understood to apply to the element bearing this attribute and its content. + (declarations) identifies one or more declarable elements within the header, which are understood to apply to the element bearing this attribute and its content. - + + \S+ + @@ -702,7 +722,9 @@ Sample values include: 1] approved; 2] candidate; 3] cleared; 4] deprecated; 5] (responsible party) indicates the agency responsible for the intervention or interpretation, for example an editor or transcriber. - + + \S+ + @@ -784,7 +806,9 @@ Suggested values include: 1] internal; 2] external; 3] conjecturepoints to a description of the rendering or presentation used for this element in the source text. - + + \S+ + @@ -799,12 +823,24 @@ Suggested values include: 1] internal; 2] external; 3] conjecturespecifies the source from which some aspect of this element is drawn. - + + \S+ + + + + + + When used on a schema description element (like + ), the @source attribute + should have only 1 value. (This one has .) + + + @@ -852,7 +888,9 @@ Suggested values include: 1] internal; 2] external; 3] conjecture provides a base URI reference with which applications can resolve relative URI references into absolute URI references. - + + \S+ + @@ -891,7 +929,9 @@ Suggested values include: 1] internal; 2] external; 3] conjecturepoints to a full description of the scribe concerned, typically supplied by a <person> element elsewhere in the description. - + + \S+ + @@ -915,7 +955,9 @@ Suggested values include: 1] internal; 2] external; 3] conjecturepoints to a full description of the script or writing style used by this hand, typically supplied by a <scriptNote> element elsewhere in the description. - + + \S+ + @@ -1013,7 +1055,9 @@ Suggested values include: 1] internal; 2] external; 3] conjecture (uniform resource locator) specifies the URL from which the media concerned may be obtained. - + + \S+ + @@ -1077,7 +1121,9 @@ Suggested values include: 1] m (metre); 2] kg (kilogram); 3] s (second); 4] Hz ( points to a unique identifier stored in the @xml:id of a <unitDef> element that defines a unit of measure. - + + \S+ + @@ -1109,7 +1155,7 @@ Suggested values include: 1] m (metre); 2] kg (kilogram); 3] s (second); 4] Hz ( - + The @unit attribute may be unnecessary when @unitRef is present. @@ -1139,7 +1185,9 @@ Suggested values include: 1] m (metre); 2] kg (kilogram); 3] s (second); 4] Hz ( (reference to the canonical name) provides a means of locating the canonical form (nym) of the names associated with the object named by the element bearing it. - + + \S+ + @@ -1226,7 +1274,7 @@ Suggested values include: 1] top; 2] bottom; 3] margin; 4] opposite; 5] overleaf - + The element should not be categorized in detail with @subtype unless also categorized in general with @type @@ -1250,7 +1298,7 @@ Suggested values include: 1] top; 2] bottom; 3] margin; 4] opposite; 5] overleaf - + @targetLang should only be used on if @target is specified. @@ -1261,7 +1309,9 @@ Suggested values include: 1] top; 2] bottom; 3] margin; 4] opposite; 5] overleaf specifies the destination of the reference by supplying one or more URI References - + + \S+ + @@ -1293,10 +1343,16 @@ Suggested values include: 1] top; 2] bottom; 3] margin; 4] opposite; 5] overleaf optionally specifies the identifiers of the elements within which all elements indicated by the contents of this element lie. - - + + \S+ + + + \S+ + - + + \S+ + @@ -1374,7 +1430,9 @@ Suggested values include: 1] top; 2] bottom; 3] margin; 4] opposite; 5] overleaf (edition reference) provides a pointer to the source edition in which the associated feature (for example, a page, column, or line break) occurs at this point in the text. - + + \S+ + @@ -1387,11 +1445,13 @@ Suggested values include: 1] top; 2] bottom; 3] margin; 4] opposite; 5] overleaf indicates the end of a span initiated by the element bearing this attribute. - + + \S+ + - + The element indicated by @spanTo () must follow the current element @@ -1429,7 +1489,7 @@ The element indicated by @spanTo () must follow - + @schemeVersion can only be used if @scheme is specified. @@ -1444,7 +1504,9 @@ The element indicated by @spanTo () must follow indicates the location within a temporal alignment at which this element begins. - + + \S+ + @@ -1452,7 +1514,9 @@ The element indicated by @spanTo () must follow indicates the location within a temporal alignment at which this element ends. - + + \S+ + @@ -3271,7 +3335,9 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line; indicates one or more locations by pointing to a <place> element or other canonical description. - + + \S+ + @@ -3414,14 +3480,14 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant (paragraph) marks paragraphs in prose. [3.1. Paragraphs 7.2.5. Speech Contents] - + Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements. - + Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText. @@ -3620,7 +3686,7 @@ Suggested values include: 1] spoken (spoken); 2] thought (thought); 3] written ( (description) contains a short description of the purpose, function, or use of its parent element, or when the parent is a documentation element, describes or defines the object being documented. [22.4.1. Description of Components] - + Information about a deprecation should only be present in a specification element @@ -3708,10 +3774,12 @@ Suggested values include: 1] deprecationInfo (deprecation information) supplies a pointer to the base being glossed by this ruby text. - + + \S+ + - + When target= is present, neither from= nor to= should be. @@ -3720,7 +3788,9 @@ Suggested values include: 1] deprecationInfo (deprecation information) points to the starting point of the span of text being glossed by this ruby text. - + + \S+ + @@ -3732,7 +3802,9 @@ Suggested values include: 1] deprecationInfo (deprecation information) points to the ending point of the span of text being glossed. - + + \S+ + @@ -4175,7 +4247,7 @@ Sample values include: 1] suspension (suspension); 2] contraction (contraction); (pointer) defines a pointer to another location. [3.7. Simple Links and Cross-References 16.1. Links] - + Only one of the attributes @target and @cRef may be supplied on . @@ -4194,7 +4266,7 @@ attributes @target and @cRef may be supplied on . (reference) defines a reference to another location, possibly modified by additional text or comment. [3.7. Simple Links and Cross-References 16.1. Links] - + Only one of the attributes @target' and @cRef' may be supplied on @@ -4262,7 +4334,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 @@ -4446,6 +4518,7 @@ Suggested values include: 1] gloss (gloss); 2] index (index); 3] instructions (i + @@ -4946,7 +5019,7 @@ Sample values include: 1] main; 2] sub (subordinate); 3] alt (alternate); 4] sho - + If the @target attribute on is used, the @@ -4960,7 +5033,9 @@ relatedItem element must be empty points to the related bibliographic element by means of an absolute or relative URI reference - + + \S+ + @@ -4978,7 +5053,7 @@ relatedItem element must be empty - + Abstract model violation: Lines may not contain lines or lg elements. @@ -5030,7 +5105,7 @@ relatedItem element must be empty must contain at least one child l, lg, or gap element. - + Abstract model violation: Lines may not contain line groups. @@ -5098,6 +5173,7 @@ relatedItem element must be empty + indicates the kind of stage direction. @@ -5713,9 +5789,9 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7] - + - + On , either the @marks attribute should be used, or a paragraph of description provided @@ -5885,7 +5961,9 @@ On , either the @marks attribute should be used, or a paragraph of descri specifies the full formal name of the namespace concerned. - + + \S* + @@ -5972,7 +6050,7 @@ Sample values include: 1] first-line; 2] first-letter; 3] before; 4] after - + A with a parent must have a @delim attribute. @@ -5981,12 +6059,12 @@ Sample values include: 1] first-line; 2] first-letter; 3] before; 4] after(match) supplies an XPath selection pattern using the syntax defined in which identifies a set of nodes which are citable structural components. The expression may be absolute (beginning with `/`) or relative. @match on a <citeStructure> without a <citeStructure> parent must be an absolute XPath. If it is relative, its context is set by the @match of the parent <citeStructure>. - + An XPath in @match on the outer must start with '/'. - + An XPath in @match must not start with '/' except on the outer . @@ -6011,7 +6089,9 @@ Sample values include: 1] book; 2] chapter; 3] entry; 4] poem; 5] letter; 6] lin (property) A URI indicating a property definition. - + + \S+ + @@ -6246,11 +6326,15 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr indicates a source unit of measure that is to be converted into another unit indicated in @toUnit. - + + \S+ + the target unit of measurement for a conversion from a source unit referenced in @fromUnit. - + + \S+ + @@ -6412,7 +6496,9 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr identifies the controlled vocabulary within which the set of keywords concerned is defined, for example by a <taxonomy> element, or by some other resource. - + + \S+ + @@ -6425,7 +6511,9 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr identifies the classification system in use, as defined by, e.g. a <taxonomy> element, or some other resource. - + + \S+ + @@ -6439,7 +6527,9 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr identifies the classification scheme within which the set of categories concerned is defined, for example by a <taxonomy> element, or by some other resource. - + + \S+ + @@ -6575,7 +6665,9 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5 (target) points to one or more elements that belong to this change. - + + \S+ + @@ -6618,7 +6710,9 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5 (facsimile) points to one or more images, portions of an image, or surfaces which correspond to the current element. - + + \S+ + @@ -6633,7 +6727,9 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5 points to one or more <change> elements documenting a state or revision campaign to which the element bearing this attribute and its children have been assigned by the encoder. - + + \S+ + @@ -6651,7 +6747,9 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5 indicates the element within a transcription of the text containing at least the start of the writing represented by this zone or surface. - + + \S+ + @@ -6867,7 +6965,7 @@ Sample values include: 1] glued; 2] pinned; 3] sewn (path) defines any line passing through two or more points within a <surface> element. [11.1. Digital Facsimiles 11.2.2. Embedded Transcription] - + @@ -7034,7 +7132,9 @@ Sample values include: 1] header; 2] footer; 3] pageNum (page number); 4] lineNu indicates a <handNote> element describing the hand concerned. - + + \S+ + @@ -7103,7 +7203,9 @@ Sample values include: 1] header; 2] footer; 3] pageNum (page number); 4] lineNu (responsible party) (responsible party) indicates the individual responsible for identifying and measuring the space - + + \S+ + @@ -7276,7 +7378,9 @@ Sample values include: 1] header; 2] footer; 3] pageNum (page number); 4] lineNu identifies one or more elements to which the metamark applies. - + + \S+ + @@ -7309,7 +7413,9 @@ Sample values include: 1] header; 2] footer; 3] pageNum (page number); 4] lineNu points to one or more elements representing the interventions which are being reasserted. - + + \S+ + @@ -7341,7 +7447,9 @@ Sample values include: 1] header; 2] footer; 3] pageNum (page number); 4] lineNu points to one or more elements representing the interventions which are to be reverted or undone. - + + \S+ + @@ -7467,7 +7575,9 @@ Suggested values include: 1] initial; 2] final provides the value of a node, which is a feature structure or other analytic element. - + + \S+ + @@ -7475,7 +7585,9 @@ Suggested values include: 1] initial; 2] final (adjacent to) gives the identifiers of the nodes which are adjacent to the current node. - + + \S+ + @@ -7485,7 +7597,9 @@ Suggested values include: 1] initial; 2] final (adjacent from) gives the identifiers of the nodes which are adjacent from the current node. - + + \S+ + @@ -7495,7 +7609,9 @@ Suggested values include: 1] initial; 2] final (adjacent) gives the identifiers of the nodes which are both adjacent to and adjacent from the current node. - + + \S+ + @@ -7535,11 +7651,15 @@ Suggested values include: 1] initial; 2] final gives the identifier of the node which is adjacent from this arc. - + + \S+ + gives the identifier of the node which is adjacent to this arc. - + + \S+ + @@ -7604,14 +7724,18 @@ Suggested values include: 1] initial; 2] final identifies the root node of the network by pointing to a feature structure or other analytic element. - + + \S+ + identifies the elements which are the children of the root node. - + + \S+ + @@ -7648,21 +7772,27 @@ Suggested values include: 1] initial; 2] final indicates an intermediate node, which is a feature structure or other analytic element. - + + \S+ + provides a list of identifiers of the elements which are the children of the intermediate node. - + + \S+ + provides the identifier of the element which is the parent of this node. - + + \S+ + @@ -7682,7 +7812,9 @@ Suggested values include: 1] initial; 2] final provides the identifier of an element which this node follows. - + + \S+ + @@ -7704,19 +7836,25 @@ Suggested values include: 1] initial; 2] final provides a pointer to a feature structure or other analytic element. - + + \S+ + provides the identifier of parent of a leaf. - + + \S+ + provides an identifier of an element which this leaf follows. - + + \S+ + @@ -7743,7 +7881,9 @@ Suggested values include: 1] initial; 2] final provides the value of an embedding tree, which is a feature structure or other analytic element. - + + \S+ + @@ -7769,7 +7909,9 @@ Suggested values include: 1] initial; 2] final supplies a value for the triangle, in the form of the identifier of a feature structure or other analytic element. - + + \S+ + @@ -7791,7 +7933,9 @@ Suggested values include: 1] initial; 2] final indicates the value of an embedding leaf, which is a feature structure or other analytic element. - + + \S+ + @@ -8143,14 +8287,14 @@ Suggested values include: 1] initial; 2] final - + Abstract model violation: Lines may not contain higher-level structural elements such as div, unless div is a descendant of floatingText. - + Abstract model violation: p and ab may not contain higher-level structural elements such as div, unless div is a descendant of floatingText. @@ -9050,7 +9194,9 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat (corresponds) points to elements that correspond to the current element in some way. - + + \S+ + @@ -9062,7 +9208,9 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat (synchronous) points to elements that are synchronous with the current element. - + + \S+ + @@ -9072,7 +9220,9 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat points to an element that is the same as the current element. - + + \S+ + @@ -9080,7 +9230,9 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat points to an element of which the current element is a copy. - + + \S+ + @@ -9088,7 +9240,9 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat points to the next element of a virtual aggregate of which the current element is part. - + + \S+ + @@ -9096,7 +9250,9 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat (previous) points to the previous element of a virtual aggregate of which the current element is part. - + + \S+ + @@ -9106,7 +9262,9 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat points to elements that are in exclusive alternation with the current element. - + + \S+ + @@ -9118,7 +9276,9 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat selects one or more alternants; if one alternant is selected, the ambiguity or uncertainty is marked as resolved. If more than one alternant is selected, the degree of ambiguity or uncertainty is marked as reduced by the number of alternants not selected. - + + \S+ + @@ -9163,14 +9323,14 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat (anonymous block) 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. [16.3. Blocks, Segments, and Anchors] - + 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, unless ab is a child of figure or note, or is a descendant of floatingText. @@ -9266,7 +9426,9 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec identifies the reference point for determining the time of the current <when> element, which is obtained by adding the interval to the time of the reference point. - + + \S+ + @@ -9282,7 +9444,9 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec designates the origin of the timeline, i.e. the time at which it begins. - + + \S+ + @@ -9404,10 +9568,16 @@ You must supply at least two values for @target on specifies the destination of the reference by supplying one or more URI References - - + + \S+ + + + \S+ + - + + \S+ + @@ -9560,7 +9730,9 @@ You must supply at least two values for @target on specifies the destination of the reference by supplying one or more URI References - + + \S+ + @@ -9679,7 +9851,9 @@ Suggested values include: 1] main; 2] hom (homograph); 3] xref (cross reference) (location) indicates an <anchor> element typically elsewhere in the document, but possibly in another document, which is the original location of this component. - + + \S+ + @@ -9687,7 +9861,9 @@ Suggested values include: 1] main; 2] hom (homograph); 3] xref (cross reference) (merged into) gives a reference to another element, where the original appears as a merged form. - + + \S+ + diff --git a/Test/expected-results/test15.odd.html b/Test/expected-results/test15.odd.html index fc177448a..e1ed11551 100644 --- a/Test/expected-results/test15.odd.html +++ b/Test/expected-results/test15.odd.html @@ -164,6 +164,7 @@

floatingText gb gloss + graphic group head idno @@ -242,7 +243,7 @@

-
+
<div  typ=" verse">  @@ -541,7 +542,7 @@

Ejemplo -
+
<body>  <div  typ=" @@ -605,7 +606,7 @@

Content model - 
+                  
 <content>
  <sequence minOccurs="1" maxOccurs="1">
   <alternate minOccurs="0"
@@ -657,7 +658,7 @@ 

  </sequence>
 </content>
     
-⚓
+⚓
 

                 
               
@@ -666,7 +667,7 @@ 

                   Declaración
                 
                 
-                  
+                  
 element div
 {
    
@@ -706,7 +707,7 @@ 

       )?
    )
 }
-⚓
+⚓
 

                 
               
@@ -980,7 +981,7 @@ 

                   Ejemplo
                 
                 
-                  

+                  

                   <para>Hallgerd was outside. 
                   <q>There is blood on your axe,
                   </q>she said. 
@@ -1024,12 +1025,12 @@ 

                   Content model
                 
                 
-                  
+                  
 <content>
  <macroRef key="macro.paraContent"/>
 </content>
     
-⚓
+⚓
 

                 
               
@@ -1038,7 +1039,7 @@ 

                   Declaración
                 
                 
-                  
+                  
 element para
 {
    
@@ -1052,7 +1053,7 @@ 

    
 macro.paraContent
 }
-⚓
+⚓
 

                 
               
@@ -1485,7 +1486,7 @@ 

                   Ejemplo
                 
                 
-                  
It is spelled 
+                  
It is spelled 
                   <q>Tübingen
                   </q>— to enter the letter 
                   <q>u
@@ -1501,12 +1502,12 @@ 

                   Content model
                 
                 
-                  
+                  
 <content>
  <macroRef key="macro.specialPara"/>
 </content>
     
-⚓
+⚓
 

                 
               
@@ -1515,7 +1516,7 @@ 

                   Declaración
                 
                 
-                  
+                  
 element q
 {
    
@@ -1537,7 +1538,7 @@ 

    
 macro.specialPara
 }
-⚓
+⚓
 

                 
               
@@ -1653,12 +1654,12 @@ 

                   Content model
                 
                 
-                  
+                  
 <content>
  <dataRef key="teidata.word"/>
 </content>
     
-⚓
+⚓
 

                 
               
@@ -1667,10 +1668,10 @@ 

                   Declaración
                 
                 
-                  
+                  
 teidata.enumerated = 
 teidata.word
-⚓
+⚓
 

                 
               
@@ -1693,8 +1694,9 @@ 

                 TEI
               : (
               documento TEI) 
-              contiene un solo documento conforme a la norma TEI, combinando una sola cabecera TEI (teiHeader) con uno o más miembros de la clase 
+              contiene un solo documento conforme a la norma TEI, combinando una sola cabecera TEI (teiHeader) con uno o más miembros de la clase 
               model.resource. Múltiples elementos TEI se pueden combinar para formar un elemento 
+              <TEI>o 
               <teiCorpus>.[
               4. Default Text Structure
               15.1. Varieties of Composite Text]
diff --git a/Test/expected-results/test15.odd.rnc b/Test/expected-results/test15.odd.rnc
index 028f1150d..9271ffe6c 100644
--- a/Test/expected-results/test15.odd.rnc
+++ b/Test/expected-results/test15.odd.rnc
@@ -48,14 +48,18 @@ att.anchoring.attribute.targetEnd =
   
   ## (target end) points to the end of the span to which the note is attached, if the note is not embedded in the text at that point.
   attribute targetEnd {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 att.ascribed.attributes = att.ascribed.attribute.who
 att.ascribed.attribute.who =
   
   ## indicates the person, or group of people, to whom the element content is ascribed.
   attribute who {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 att.ascribed.directed.attributes =
   att.ascribed.attributes, att.ascribed.directed.attribute.toWhom
@@ -63,7 +67,9 @@ att.ascribed.directed.attribute.toWhom =
   
   ## indicates the person, or group of people, to whom a speech act or action is directed.
   attribute toWhom {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 att.canonical.attributes =
   att.canonical.attribute.key, att.canonical.attribute.ref
@@ -75,7 +81,9 @@ att.canonical.attribute.ref =
   
   ## (reference) provides an explicit means of locating a full definition or identity for the entity being named by means of one or more URIs.
   attribute ref {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 att.ranging.attributes =
   att.ranging.attribute.atLeast,
@@ -200,7 +208,9 @@ att.written.attribute.hand =
       " element describing the hand considered responsible for the content of the element concerned."
     ]
   ]
-  attribute hand { xsd:anyURI }?
+  attribute hand {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 att.breaking.attributes = att.breaking.attribute.break
 att.breaking.attribute.break =
   
@@ -354,7 +364,9 @@ att.datable.attribute.calendar =
   
   ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
   attribute calendar {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 sch:pattern [
   id = "test15-att.datable-calendar-calendar-constraint-rule-4"
@@ -389,7 +401,9 @@ att.datable.attribute.period =
     ]
   ]
   attribute period {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 att.datcat.attributes =
   att.datcat.attribute.datcat, att.datcat.attribute.valueDatcat
@@ -397,13 +411,17 @@ att.datcat.attribute.datcat =
   
   ## contains a PID (persistent identifier) that aligns the given element with the appropriate Data Category (or categories) in ISOcat.
   attribute ns2:datcat {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 att.datcat.attribute.valueDatcat =
   
   ## contains a PID (persistent identifier) that aligns the content of the given element or the value of the given attribute with the appropriate simple Data Category (or categories) in ISOcat.
   attribute ns2:valueDatcat {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 att.declarable.attributes = att.declarable.attribute.default
 att.declarable.attribute.default =
@@ -421,9 +439,11 @@ att.declarable.attribute.default =
 att.declaring.attributes = att.declaring.attribute.decls
 att.declaring.attribute.decls =
   
-  ## identifies one or more declarable elements within the header, which are understood to apply to the element bearing this attribute and its content.
+  ## (declarations) identifies one or more declarable elements within the header, which are understood to apply to the element bearing this attribute and its content.
   attribute decls {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 att.fragmentable.attributes = att.fragmentable.attribute.part
 att.fragmentable.attribute.part =
@@ -518,7 +538,9 @@ att.global.responsibility.attribute.resp =
   
   ## (responsible party) indicates the agency responsible for the intervention or interpretation, for example an editor or transcriber.
   attribute resp {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 att.editLike.attributes =
   att.editLike.attribute.evidence, att.editLike.attribute.instant
@@ -573,15 +595,53 @@ att.global.rendition.attribute.rendition =
   
   ## points to a description of the rendering or presentation used for this element in the source text.
   attribute rendition {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 att.global.source.attributes = att.global.source.attribute.source
 att.global.source.attribute.source =
   
   ## specifies the source from which some aspect of this element is drawn.
   attribute source {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
+sch:pattern [
+  id =
+    "test15-att.global.source-source-only_1_ODD_source-constraint-rule-5"
+  "\x{a}" ~
+  "      "
+  sch:rule [
+    context = "tei:*/@source"
+    "\x{a}" ~
+    "         "
+    sch:let [
+      name = "srcs"
+      value = "tokenize( normalize-space(.),' ')"
+    ]
+    "\x{a}" ~
+    "         "
+    sch:report [
+      test =
+        "( parent::tei:classRef                               | parent::tei:dataRef                               | parent::tei:elementRef                               | parent::tei:macroRef                               | parent::tei:moduleRef                               | parent::tei:schemaSpec )                               and                               $srcs[2]"
+      "\x{a}" ~
+      "              When used on a schema description element (like\x{a}" ~
+      "              "
+      sch:value-of [ select = "name(..)" ]
+      "), the @source attribute\x{a}" ~
+      "              should have only 1 value. (This one has "
+      sch:value-of [ select = "count($srcs)" ]
+      ".)\x{a}" ~
+      "            "
+    ]
+    "\x{a}" ~
+    "      "
+  ]
+  "\x{a}" ~
+  "   "
+]
 att.global.attributes =
   att.global.rendition.attributes,
   att.global.linking.attributes,
@@ -620,7 +680,9 @@ att.global.attribute.xmllang =
 att.global.attribute.xmlbase =
   
   ## provides a base URI reference with which applications can resolve relative URI references into absolute URI references.
-  attribute xml:base { xsd:anyURI }?
+  attribute xml:base {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 att.global.attribute.xmlspace =
   
   ## signals an intention about how white space should be managed by applications.
@@ -645,7 +707,9 @@ att.handFeatures.attribute.scribeRef =
     ]
   ]
   attribute scribeRef {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 att.handFeatures.attribute.script =
   
@@ -662,7 +726,9 @@ att.handFeatures.attribute.scriptRef =
     ]
   ]
   attribute scriptRef {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 att.handFeatures.attribute.medium =
   
@@ -730,7 +796,9 @@ att.resourced.attributes = att.resourced.attribute.url
 att.resourced.attribute.url =
   
   ## (uniform resource locator) specifies the URL from which the media concerned may be obtained.
-  attribute url { xsd:anyURI }
+  attribute url {
+    xsd:anyURI { pattern = "\S+" }
+  }
 att.measurement.attributes =
   att.measurement.attribute.unit,
   att.measurement.attribute.unitRef,
@@ -810,7 +878,9 @@ att.measurement.attribute.unitRef =
       " element that defines a unit of measure."
     ]
   ]
-  attribute unitRef { xsd:anyURI }?
+  attribute unitRef {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 att.measurement.attribute.quantity =
   
   ## (quantity) specifies the number of the specified units that comprise the measurement
@@ -829,7 +899,7 @@ att.measurement.attribute.commodity =
   }?
 sch:pattern [
   id =
-    "test15-att.measurement-att-measurement-unitRef-constraint-rule-5"
+    "test15-att.measurement-att-measurement-unitRef-constraint-rule-6"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -863,7 +933,9 @@ att.naming.attribute.nymRef =
   
   ## (reference to the canonical name) provides a means of locating the canonical form (nym) of the names associated with the object named by the element bearing it.
   attribute nymRef {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 att.notated.attributes = att.notated.attribute.notation
 att.notated.attribute.notation =
@@ -933,7 +1005,7 @@ att.typed.attribute.subtype =
     xsd:token { pattern = "[^\p{C}\p{Z}]+" }
   }?
 sch:pattern [
-  id = "test15-att.typed-subtypeTyped-constraint-rule-6"
+  id = "test15-att.typed-subtypeTyped-constraint-rule-7"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -976,7 +1048,7 @@ att.pointing.attribute.targetLang =
        "")
   }?
 sch:pattern [
-  id = "test15-att.pointing-targetLang-targetLang-constraint-rule-7"
+  id = "test15-att.pointing-targetLang-targetLang-constraint-rule-8"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -999,7 +1071,9 @@ att.pointing.attribute.target =
   
   ## specifies the destination of the reference by supplying one or more URI References
   attribute target {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 att.pointing.attribute.evaluate =
   
@@ -1024,7 +1098,11 @@ att.pointing.group.attribute.domains =
   
   ## optionally specifies the identifiers of the elements within which all elements indicated by the contents of this element lie.
   attribute domains {
-    list { xsd:anyURI, xsd:anyURI, xsd:anyURI* }
+    list {
+      xsd:anyURI { pattern = "\S+" },
+      xsd:anyURI { pattern = "\S+" },
+      xsd:anyURI { pattern = "\S+" }*
+    }
   }?
 att.pointing.group.attribute.targFunc =
   [
@@ -1078,16 +1156,20 @@ att.edition.attribute.edRef =
   
   ## (edition reference) provides a pointer to the source edition in which the associated feature (for example, a page, column, or line break) occurs at this point in the text.
   attribute edRef {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 att.spanning.attributes = att.spanning.attribute.spanTo
 att.spanning.attribute.spanTo =
   
   ## indicates the end of a span initiated by the element bearing this attribute.
-  attribute spanTo { xsd:anyURI }?
+  attribute spanTo {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 sch:pattern [
   id =
-    "test15-att.spanning-spanTo-spanTo-points-to-following-constraint-rule-8"
+    "test15-att.spanning-spanTo-spanTo-points-to-following-constraint-rule-9"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1143,7 +1225,7 @@ att.styleDef.attribute.schemeVersion =
   }?
 sch:pattern [
   id =
-    "test15-att.styleDef-schemeVersion-schemeVersionRequiresScheme-constraint-rule-9"
+    "test15-att.styleDef-schemeVersion-schemeVersionRequiresScheme-constraint-rule-10"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1167,11 +1249,15 @@ att.timed.attributes =
 att.timed.attribute.start =
   
   ## indicates the location within a temporal alignment at which this element begins.
-  attribute start { xsd:anyURI }?
+  attribute start {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 att.timed.attribute.end =
   
   ## indicates the location within a temporal alignment at which this element ends.
-  attribute end { xsd:anyURI }?
+  attribute end {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 att.transcriptional.attributes =
   att.editLike.attributes,
   att.written.attributes,
@@ -1675,7 +1761,9 @@ att.locatable.attribute.where =
     ]
   ]
   attribute where {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 model.correspActionPart =
   model.dateLike | model.addressLike | model.nameLike | note | noteGrp
@@ -1770,7 +1858,7 @@ p =
     macro.paraContent
     >> sch:pattern [
          id =
-           "test15-p-abstractModel-structure-p-in-ab-or-p-constraint-report-5"
+           "test15-p-abstractModel-structure-p-in-ab-or-p-constraint-report-6"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -1792,7 +1880,7 @@ p =
        ]
     >> sch:pattern [
          id =
-           "test15-p-abstractModel-structure-p-in-l-or-lg-constraint-report-6"
+           "test15-p-abstractModel-structure-p-in-l-or-lg-constraint-report-7"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -1973,7 +2061,7 @@ desc =
     macro.limitedContent
     >> sch:pattern [
          id =
-           "test15-desc-deprecationInfo-only-in-deprecated-constraint-rule-10"
+           "test15-desc-deprecationInfo-only-in-deprecated-constraint-rule-11"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2057,9 +2145,11 @@ rt =
     att.transcriptional.attributes,
     (
      ## supplies a pointer to the base being glossed by this ruby text.
-     attribute target { xsd:anyURI }?)
+     attribute target {
+       xsd:anyURI { pattern = "\S+" }
+     }?)
     >> sch:pattern [
-         id = "test15-rt-target-rt-target-not-span-constraint-report-7"
+         id = "test15-rt-target-rt-target-not-span-constraint-report-8"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2079,7 +2169,9 @@ rt =
        ],
     (
      ## points to the starting point of the span of text being glossed by this ruby text.
-     attribute from { xsd:anyURI }?)
+     attribute from {
+       xsd:anyURI { pattern = "\S+" }
+     }?)
     >> sch:pattern [
          id = "test15-rt-from-rt-from-constraint-assert-7"
          "\x{a}" ~
@@ -2103,7 +2195,9 @@ rt =
        ],
     (
      ## points to the ending point of the span of text being glossed.
-     attribute to { xsd:anyURI }?)
+     attribute to {
+       xsd:anyURI { pattern = "\S+" }
+     }?)
     >> sch:pattern [
          id = "test15-rt-to-rt-to-constraint-assert-8"
          "\x{a}" ~
@@ -2460,7 +2554,7 @@ ptr =
   element ptr {
     empty
     >> sch:pattern [
-         id = "test15-ptr-ptrAtts-constraint-report-8"
+         id = "test15-ptr-ptrAtts-constraint-report-9"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2494,7 +2588,7 @@ ref =
   element ref {
     macro.paraContent
     >> sch:pattern [
-         id = "test15-ref-refAtts-constraint-report-9"
+         id = "test15-ref-refAtts-constraint-report-10"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2535,7 +2629,7 @@ ref =
      (model.divBottom, model.global*)*)
     >> sch:pattern [
          id =
-           "test15-list-gloss-list-must-have-labels-constraint-rule-11"
+           "test15-list-gloss-list-must-have-labels-constraint-rule-12"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2697,6 +2791,7 @@ graphic =
     att.media.attributes,
     att.resourced.attributes,
     att.declaring.attributes,
+    att.typed.attributes,
     empty
   }
 binaryObject =
@@ -3022,7 +3117,7 @@ relatedItem =
   element relatedItem {
     ((model.biblLike | model.ptrLike)?)
     >> sch:pattern [
-         id = "test15-relatedItem-targetorcontent1-constraint-report-10"
+         id = "test15-relatedItem-targetorcontent1-constraint-report-11"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3054,7 +3149,9 @@ relatedItem =
     att.typed.attributes,
     
     ## points to the related bibliographic element by means of an absolute or relative URI reference
-    attribute target { xsd:anyURI }?,
+    attribute target {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     empty
   }
 l =
@@ -3064,7 +3161,7 @@ l =
     ((text | model.gLike | model.phrase | model.inter | model.global)*)
     >> sch:pattern [
          id =
-           "test15-l-abstractModel-structure-l-in-l-constraint-report-11"
+           "test15-l-abstractModel-structure-l-in-l-constraint-report-12"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3122,7 +3219,7 @@ lg =
        ]
     >> sch:pattern [
          id =
-           "test15-lg-abstractModel-structure-lg-in-l-constraint-report-12"
+           "test15-lg-abstractModel-structure-lg-in-l-constraint-report-13"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3177,6 +3274,7 @@ stage =
     att.ascribed.directed.attributes,
     att.global.attributes,
     att.placement.attributes,
+    att.written.attributes,
     
     ## indicates the kind of stage direction.
     ## Suggested values include: 1] setting; 2] entrance; 3] exit; 4] business; 5] novelistic; 6] delivery; 7] modifier; 8] location; 9] mixed
@@ -3643,7 +3741,7 @@ quotation =
   element quotation {
     (model.pLike*)
     >> sch:pattern [
-         id = "test15-quotation-quotationContents-constraint-report-13"
+         id = "test15-quotation-quotationContents-constraint-report-14"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3816,7 +3914,9 @@ tagUsage =
     att.global.attributes,
     
     ## specifies the full formal name of the namespace concerned.
-    attribute name { xsd:anyURI },
+    attribute name {
+      xsd:anyURI { pattern = "\S*" }
+    },
     empty
   }
 rendition =
@@ -3875,7 +3975,7 @@ citeStructure =
      }?)
     >> sch:pattern [
          id =
-           "test15-citeStructure-delim-citestructure-inner-delim-constraint-rule-12"
+           "test15-citeStructure-delim-citestructure-inner-delim-constraint-rule-13"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3914,7 +4014,7 @@ citeStructure =
     attribute match { text }
     >> sch:pattern [
          id =
-           "test15-citeStructure-match-citestructure-outer-match-constraint-rule-13"
+           "test15-citeStructure-match-citestructure-outer-match-constraint-rule-14"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3935,7 +4035,7 @@ citeStructure =
        ]
     >> sch:pattern [
          id =
-           "test15-citeStructure-match-citestructure-inner-match-constraint-rule-14"
+           "test15-citeStructure-match-citestructure-inner-match-constraint-rule-15"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3976,7 +4076,9 @@ citeData =
     att.citeStructurePart.attributes,
     
     ## (property) A URI indicating a property definition.
-    attribute property { xsd:anyURI },
+    attribute property {
+      xsd:anyURI { pattern = "\S+" }
+    },
     empty
   }
 cRefPattern =
@@ -4133,7 +4235,9 @@ conversion =
         "."
       ]
     ]
-    attribute fromUnit { xsd:anyURI },
+    attribute fromUnit {
+      xsd:anyURI { pattern = "\S+" }
+    },
     [
       a:documentation [
         "the target unit of measurement for a conversion from a source unit referenced in "
@@ -4141,7 +4245,9 @@ conversion =
         "."
       ]
     ]
-    attribute toUnit { xsd:anyURI },
+    attribute toUnit {
+      xsd:anyURI { pattern = "\S+" }
+    },
     empty
   }
 appInfo =
@@ -4248,7 +4354,9 @@ keywords =
         " element, or by some other resource."
       ]
     ]
-    attribute scheme { xsd:anyURI }?,
+    attribute scheme {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     empty
   }
 classCode =
@@ -4264,7 +4372,9 @@ classCode =
         " element, or some other resource."
       ]
     ]
-    attribute scheme { xsd:anyURI },
+    attribute scheme {
+      xsd:anyURI { pattern = "\S+" }
+    },
     empty
   }
 catRef =
@@ -4281,7 +4391,9 @@ catRef =
         " element, or by some other resource."
       ]
     ]
-    attribute scheme { xsd:anyURI }?,
+    attribute scheme {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     empty
   }
 calendarDesc =
@@ -4375,7 +4487,9 @@ change =
     
     ## (target) points to one or more elements that belong to this change.
     attribute target {
-      list { xsd:anyURI+ }
+      list {
+        xsd:anyURI { pattern = "\S+" }+
+      }
     }?,
     empty
   }
@@ -4497,7 +4611,7 @@ floatingText =
       (model.divBottom, model.global*)*)?)
     >> sch:pattern [
          id =
-           "test15-div-abstractModel-structure-div-in-l-or-lg-constraint-report-14"
+           "test15-div-abstractModel-structure-div-in-l-or-lg-constraint-report-15"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4519,7 +4633,7 @@ floatingText =
        ]
     >> sch:pattern [
          id =
-           "test15-div-abstractModel-structure-div-in-ab-or-p-constraint-report-15"
+           "test15-div-abstractModel-structure-div-in-ab-or-p-constraint-report-16"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4919,41 +5033,57 @@ att.global.linking.attribute.corresp =
   
   ## (corresponds) points to elements that correspond to the current element in some way.
   attribute corresp {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 att.global.linking.attribute.synch =
   
   ## (synchronous) points to elements that are synchronous with the current element.
   attribute synch {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 att.global.linking.attribute.sameAs =
   
   ## points to an element that is the same as the current element.
-  attribute sameAs { xsd:anyURI }?
+  attribute sameAs {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 att.global.linking.attribute.copyOf =
   
   ## points to an element of which the current element is a copy.
-  attribute copyOf { xsd:anyURI }?
+  attribute copyOf {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 att.global.linking.attribute.next =
   
   ## points to the next element of a virtual aggregate of which the current element is part.
-  attribute next { xsd:anyURI }?
+  attribute next {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 att.global.linking.attribute.prev =
   
   ## (previous) points to the previous element of a virtual aggregate of which the current element is part.
-  attribute prev { xsd:anyURI }?
+  attribute prev {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 att.global.linking.attribute.exclude =
   
   ## points to elements that are in exclusive alternation with the current element.
   attribute exclude {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 att.global.linking.attribute.select =
   
   ## selects one or more alternants; if one alternant is selected, the ambiguity or uncertainty is marked as resolved. If more than one alternant is selected, the degree of ambiguity or uncertainty is marked as reduced by the number of alternants not selected.
   attribute select {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 link =
   
@@ -5002,7 +5132,7 @@ ab =
     macro.paraContent
     >> sch:pattern [
          id =
-           "test15-ab-abstractModel-structure-ab-in-ab-or-p-constraint-report-16"
+           "test15-ab-abstractModel-structure-ab-in-ab-or-p-constraint-report-17"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5024,7 +5154,7 @@ ab =
        ]
     >> sch:pattern [
          id =
-           "test15-ab-abstractModel-structure-ab-in-l-or-lg-constraint-report-17"
+           "test15-ab-abstractModel-structure-ab-in-l-or-lg-constraint-report-18"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5136,7 +5266,9 @@ when =
         " element, which is obtained by adding the interval to the time of the reference point."
       ]
     ]
-    attribute since { xsd:anyURI }?,
+    attribute since {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     empty
   }
 timeline =
@@ -5147,7 +5279,9 @@ timeline =
     att.global.attributes,
     
     ## designates the origin of the timeline, i.e. the time at which it begins.
-    attribute origin { xsd:anyURI }?,
+    attribute origin {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     [
       a:documentation [
         "specifies the unit of time corresponding to the "
@@ -5282,7 +5416,11 @@ alt =
     
     ## specifies the destination of the reference by supplying one or more URI References
     attribute target {
-      list { xsd:anyURI, xsd:anyURI, xsd:anyURI* }
+      list {
+        xsd:anyURI { pattern = "\S+" },
+        xsd:anyURI { pattern = "\S+" },
+        xsd:anyURI { pattern = "\S+" }*
+      }
     }?,
     
     ## states whether the alternations gathered in this collection are exclusive or inclusive.
@@ -5433,7 +5571,9 @@ annotation =
     
     ## specifies the destination of the reference by supplying one or more URI References
     attribute target {
-      list { xsd:anyURI+ }
+      list {
+        xsd:anyURI { pattern = "\S+" }+
+      }
     },
     
     ##
diff --git a/Test/expected-results/test21.odd.rnc b/Test/expected-results/test21.odd.rnc
index 64a3f452f..be4a1c17c 100644
--- a/Test/expected-results/test21.odd.rnc
+++ b/Test/expected-results/test21.odd.rnc
@@ -49,14 +49,18 @@ att.anchoring.attribute.targetEnd =
   
   ## (target end) pointe vers la fin d'un passage auquel la note est attachée, si la note n'est pas enchâssée dans le texte à cet endroit
   attribute targetEnd {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 att.ascribed.attributes = att.ascribed.attribute.who
 att.ascribed.attribute.who =
   
   ## indique la personne ou le groupe de personnes à qui le contenu de l'élément est attribué.
   attribute who {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 att.ascribed.directed.attributes =
   att.ascribed.attributes, att.ascribed.directed.attribute.toWhom
@@ -64,7 +68,9 @@ att.ascribed.directed.attribute.toWhom =
   
   ## indicates the person, or group of people, to whom a speech act or action is directed.
   attribute toWhom {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 att.canonical.attributes =
   att.canonical.attribute.key, att.canonical.attribute.ref
@@ -76,7 +82,9 @@ att.canonical.attribute.ref =
   
   ## (référence) fournit un moyen explicite de localiser une définition complète de l'entité nommée au moyen d'un ou plusieurs URIs.
   attribute ref {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 att.ranging.attributes =
   att.ranging.attribute.atLeast,
@@ -196,7 +204,9 @@ att.written.attributes = att.written.attribute.hand
 att.written.attribute.hand =
   
   ## signale la main de celui qui est intervenue.
-  attribute hand { xsd:anyURI }?
+  attribute hand {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 att.damaged.attributes =
   att.dimensions.attributes,
   att.written.attributes,
@@ -394,7 +404,9 @@ att.datable.attribute.calendar =
   
   ## indique le système ou le calendrier auquel appartient la date exprimée dans le contenu de l'élément.
   attribute calendar {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 sch:pattern [
   id = "test21-att.datable-calendar-calendar-constraint-rule-4"
@@ -422,7 +434,9 @@ att.datable.attribute.period =
   
   ## fournit un pointeur vers un emplacement donné définissant une période de temps nommée durant laquelle l'item concerné s'inscrit.
   attribute period {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 att.datcat.attributes =
   att.datcat.attribute.datcat, att.datcat.attribute.valueDatcat
@@ -430,13 +444,17 @@ att.datcat.attribute.datcat =
   
   ## contains a PID (persistent identifier) that aligns the given element with the appropriate Data Category (or categories) in ISOcat.
   attribute ns2:datcat {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 att.datcat.attribute.valueDatcat =
   
   ## contains a PID (persistent identifier) that aligns the content of the given element or the value of the given attribute with the appropriate simple Data Category (or categories) in ISOcat.
   attribute ns2:valueDatcat {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 att.declarable.attributes = att.declarable.attribute.default
 att.declarable.attribute.default =
@@ -454,9 +472,11 @@ att.declarable.attribute.default =
 att.declaring.attributes = att.declaring.attribute.decls
 att.declaring.attribute.decls =
   
-  ## identifie un ou plusieurséléments déclarables dans l'en-tête TEI, qui sont destinés à s'appliquer à l'élément portant cet attribut et à son contenu.
+  ## (déclarations) identifie un ou plusieurséléments déclarables dans l'en-tête TEI, qui sont destinés à s'appliquer à l'élément portant cet attribut et à son contenu.
   attribute decls {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 att.fragmentable.attributes = att.fragmentable.attribute.part
 att.fragmentable.attribute.part =
@@ -551,7 +571,9 @@ att.global.responsibility.attribute.resp =
   
   ## (responsable) indique l'agent responsable de l'intervention ou de l'interprétation, par exemple un éditeur ou un transcripteur.
   attribute resp {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 att.editLike.attributes =
   att.editLike.attribute.evidence, att.editLike.attribute.instant
@@ -606,15 +628,53 @@ att.global.rendition.attribute.rendition =
   
   ## pointe vers une description du rendu ou de la présentation utilisés pour cet élément dans le texte source
   attribute rendition {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 att.global.source.attributes = att.global.source.attribute.source
 att.global.source.attribute.source =
   
   ## specifies the source from which some aspect of this element is drawn.
   attribute source {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
+sch:pattern [
+  id =
+    "test21-att.global.source-source-only_1_ODD_source-constraint-rule-5"
+  "\x{a}" ~
+  "      "
+  sch:rule [
+    context = "tei:*/@source"
+    "\x{a}" ~
+    "         "
+    sch:let [
+      name = "srcs"
+      value = "tokenize( normalize-space(.),' ')"
+    ]
+    "\x{a}" ~
+    "         "
+    sch:report [
+      test =
+        "( parent::tei:classRef                               | parent::tei:dataRef                               | parent::tei:elementRef                               | parent::tei:macroRef                               | parent::tei:moduleRef                               | parent::tei:schemaSpec )                               and                               $srcs[2]"
+      "\x{a}" ~
+      "              When used on a schema description element (like\x{a}" ~
+      "              "
+      sch:value-of [ select = "name(..)" ]
+      "), the @source attribute\x{a}" ~
+      "              should have only 1 value. (This one has "
+      sch:value-of [ select = "count($srcs)" ]
+      ".)\x{a}" ~
+      "            "
+    ]
+    "\x{a}" ~
+    "      "
+  ]
+  "\x{a}" ~
+  "   "
+]
 att.global.attributes =
   att.global.rendition.attributes,
   att.global.linking.attributes,
@@ -648,7 +708,9 @@ att.global.attribute.xmllang =
 att.global.attribute.xmlbase =
   
   ## donne une référence URI de base au moyen de laquelle les applications peuvent résoudre des références d'URI relatives en références d'URI absolues
-  attribute xml:base { xsd:anyURI }?
+  attribute xml:base {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 att.global.attribute.xmlspace =
   
   ## signale que les applications doivent préserver l'espace blanc
@@ -680,7 +742,9 @@ att.handFeatures.attribute.scribeRef =
     ]
   ]
   attribute scribeRef {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 att.handFeatures.attribute.script =
   
@@ -697,7 +761,9 @@ att.handFeatures.attribute.scriptRef =
     ]
   ]
   attribute scriptRef {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 att.handFeatures.attribute.medium =
   
@@ -765,7 +831,9 @@ att.resourced.attributes = att.resourced.attribute.url
 att.resourced.attribute.url =
   
   ## (adresse URL) specifies the URL from which the media concerned may be obtained.
-  attribute url { xsd:anyURI }
+  attribute url {
+    xsd:anyURI { pattern = "\S+" }
+  }
 att.measurement.attributes =
   att.measurement.attribute.unit,
   att.measurement.attribute.unitRef,
@@ -845,7 +913,9 @@ att.measurement.attribute.unitRef =
       " element that defines a unit of measure."
     ]
   ]
-  attribute unitRef { xsd:anyURI }?
+  attribute unitRef {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 att.measurement.attribute.quantity =
   
   ## (quantité) spécifie le nombre des unités indiquées que comprend la mesure.
@@ -864,7 +934,7 @@ att.measurement.attribute.commodity =
   }?
 sch:pattern [
   id =
-    "test21-att.measurement-att-measurement-unitRef-constraint-rule-5"
+    "test21-att.measurement-att-measurement-unitRef-constraint-rule-6"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -903,7 +973,9 @@ att.naming.attribute.nymRef =
   
   ## (référence au nom canonique) indique comment localiser la forme canonique (nym) des noms qui sont associés à l'objet nommé par l'élément qui le contient.
   attribute nymRef {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 att.notated.attributes = att.notated.attribute.notation
 att.notated.attribute.notation =
@@ -978,7 +1050,7 @@ att.typed.attribute.subtype =
     xsd:token { pattern = "[^\p{C}\p{Z}]+" }
   }?
 sch:pattern [
-  id = "test21-att.typed-subtypeTyped-constraint-rule-6"
+  id = "test21-att.typed-subtypeTyped-constraint-rule-7"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1021,7 +1093,7 @@ att.pointing.attribute.targetLang =
        "")
   }?
 sch:pattern [
-  id = "test21-att.pointing-targetLang-targetLang-constraint-rule-7"
+  id = "test21-att.pointing-targetLang-targetLang-constraint-rule-8"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1044,7 +1116,9 @@ att.pointing.attribute.target =
   
   ## précise la cible de la référence en donnant une ou plusieurs références URI
   attribute target {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 att.pointing.attribute.evaluate =
   
@@ -1069,7 +1143,11 @@ att.pointing.group.attribute.domains =
   
   ## spécifie, facultativement, les identifiants des éléments englobant tous les éléments indiqués par le contenu de cet élément.
   attribute domains {
-    list { xsd:anyURI, xsd:anyURI, xsd:anyURI* }
+    list {
+      xsd:anyURI { pattern = "\S+" },
+      xsd:anyURI { pattern = "\S+" },
+      xsd:anyURI { pattern = "\S+" }*
+    }
   }?
 att.pointing.group.attribute.targFunc =
   [
@@ -1123,16 +1201,20 @@ att.edition.attribute.edRef =
   
   ## (edition reference) provides a pointer to the source edition in which the associated feature (for example, a page, column, or line break) occurs at this point in the text.
   attribute edRef {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 att.spanning.attributes = att.spanning.attribute.spanTo
 att.spanning.attribute.spanTo =
   
   ## indique la fin d'un passage introduit par l'élément portant cet attribut.
-  attribute spanTo { xsd:anyURI }?
+  attribute spanTo {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 sch:pattern [
   id =
-    "test21-att.spanning-spanTo-spanTo-points-to-following-constraint-rule-8"
+    "test21-att.spanning-spanTo-spanTo-points-to-following-constraint-rule-9"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1188,7 +1270,7 @@ att.styleDef.attribute.schemeVersion =
   }?
 sch:pattern [
   id =
-    "test21-att.styleDef-schemeVersion-schemeVersionRequiresScheme-constraint-rule-9"
+    "test21-att.styleDef-schemeVersion-schemeVersionRequiresScheme-constraint-rule-10"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1212,11 +1294,15 @@ att.timed.attributes =
 att.timed.attribute.start =
   
   ## indique dans un alignement temporel (un ordre chronologique) l'endroit où commence cet élément.
-  attribute start { xsd:anyURI }?
+  attribute start {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 att.timed.attribute.end =
   
   ## indique l'endroit où se termine cet élément dans un alignement temporel.
-  attribute end { xsd:anyURI }?
+  attribute end {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 att.transcriptional.attributes =
   att.editLike.attributes,
   att.written.attributes,
@@ -2069,7 +2155,9 @@ att.locatable.attribute.where =
     ]
   ]
   attribute where {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 model.correspActionPart =
   model.dateLike | model.addressLike | model.nameLike | note | noteGrp
@@ -2169,7 +2257,7 @@ p =
      }*)
     >> sch:pattern [
          id =
-           "test21-p-abstractModel-structure-p-in-ab-or-p-constraint-report-5"
+           "test21-p-abstractModel-structure-p-in-ab-or-p-constraint-report-6"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2191,7 +2279,7 @@ p =
        ]
     >> sch:pattern [
          id =
-           "test21-p-abstractModel-structure-p-in-l-or-lg-constraint-report-6"
+           "test21-p-abstractModel-structure-p-in-l-or-lg-constraint-report-7"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2394,7 +2482,7 @@ desc =
     macro.limitedContent
     >> sch:pattern [
          id =
-           "test21-desc-deprecationInfo-only-in-deprecated-constraint-rule-10"
+           "test21-desc-deprecationInfo-only-in-deprecated-constraint-rule-11"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2478,9 +2566,11 @@ rt =
     att.transcriptional.attributes,
     (
      ## supplies a pointer to the base being glossed by this ruby text.
-     attribute target { xsd:anyURI }?)
+     attribute target {
+       xsd:anyURI { pattern = "\S+" }
+     }?)
     >> sch:pattern [
-         id = "test21-rt-target-rt-target-not-span-constraint-report-7"
+         id = "test21-rt-target-rt-target-not-span-constraint-report-8"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2500,7 +2590,9 @@ rt =
        ],
     (
      ## points to the starting point of the span of text being glossed by this ruby text.
-     attribute from { xsd:anyURI }?)
+     attribute from {
+       xsd:anyURI { pattern = "\S+" }
+     }?)
     >> sch:pattern [
          id = "test21-rt-from-rt-from-constraint-assert-7"
          "\x{a}" ~
@@ -2524,7 +2616,9 @@ rt =
        ],
     (
      ## points to the ending point of the span of text being glossed.
-     attribute to { xsd:anyURI }?)
+     attribute to {
+       xsd:anyURI { pattern = "\S+" }
+     }?)
     >> sch:pattern [
          id = "test21-rt-to-rt-to-constraint-assert-8"
          "\x{a}" ~
@@ -2890,7 +2984,7 @@ ptr =
   element ptr {
     empty
     >> sch:pattern [
-         id = "test21-ptr-ptrAtts-constraint-report-8"
+         id = "test21-ptr-ptrAtts-constraint-report-9"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2934,7 +3028,7 @@ ref =
   element ref {
     macro.paraContent
     >> sch:pattern [
-         id = "test21-ref-refAtts-constraint-report-9"
+         id = "test21-ref-refAtts-constraint-report-10"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2975,7 +3069,7 @@ ref =
      (model.divBottom, model.global*)*)
     >> sch:pattern [
          id =
-           "test21-list-gloss-list-must-have-labels-constraint-rule-11"
+           "test21-list-gloss-list-must-have-labels-constraint-rule-12"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3137,6 +3231,7 @@ graphic =
     att.media.attributes,
     att.resourced.attributes,
     att.declaring.attributes,
+    att.typed.attributes,
     empty
   }
 binaryObject =
@@ -3475,7 +3570,7 @@ relatedItem =
   element relatedItem {
     ((model.biblLike | model.ptrLike)?)
     >> sch:pattern [
-         id = "test21-relatedItem-targetorcontent1-constraint-report-10"
+         id = "test21-relatedItem-targetorcontent1-constraint-report-11"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3507,7 +3602,9 @@ relatedItem =
     att.typed.attributes,
     
     ## points to the related bibliographic element by means of an absolute or relative URI reference
-    attribute target { xsd:anyURI }?,
+    attribute target {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     empty
   }
 l =
@@ -3517,7 +3614,7 @@ l =
     ((text | model.gLike | model.phrase | model.inter | model.global)*)
     >> sch:pattern [
          id =
-           "test21-l-abstractModel-structure-l-in-l-constraint-report-11"
+           "test21-l-abstractModel-structure-l-in-l-constraint-report-12"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3575,7 +3672,7 @@ lg =
        ]
     >> sch:pattern [
          id =
-           "test21-lg-abstractModel-structure-lg-in-l-constraint-report-12"
+           "test21-lg-abstractModel-structure-lg-in-l-constraint-report-13"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3641,6 +3738,7 @@ stage =
     att.ascribed.directed.attributes,
     att.global.attributes,
     att.placement.attributes,
+    att.written.attributes,
     
     ## indique le type d'indication scénique
     ## Suggested values include: 1] setting; 2] entrance; 3] exit; 4] business; 5] novelistic; 6] delivery; 7] modifier; 8] location; 9] mixed
@@ -3805,7 +3903,9 @@ att.datable.custom.attribute.to-custom =
 att.datable.custom.attribute.datingPoint =
   
   ## supplies a pointer to some location defining a named point in time with reference to which the datable item is understood to have occurred
-  attribute datingPoint { xsd:anyURI }?
+  attribute datingPoint {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 att.datable.custom.attribute.datingMethod =
   [
     a:documentation [
@@ -3814,7 +3914,9 @@ att.datable.custom.attribute.datingMethod =
       " element or other means of interpreting the values of the custom dating attributes."
     ]
   ]
-  attribute datingMethod { xsd:anyURI }?
+  attribute datingMethod {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 model.persNamePart =
   surname
   | forename
@@ -3865,7 +3967,7 @@ att.datable.iso.attributes =
   att.datable.iso.attribute.to-iso
 att.datable.iso.attribute.when-iso =
   
-  ## précise une date exacte pour l'évènement selon la forme normalisée ISO 8601, c'est-à-dire aaaa-mm-jj.
+  ## précise une date exacte pour l'évènement selon la forme normalisée ISO 8601:2004, c'est-à-dire aaaa-mm-jj.
   attribute when-iso {
     xsd:date
     | xsd:gYear
@@ -4465,7 +4567,9 @@ occupation =
         " déclaré ailleurs dans l'en-tête."
       ]
     ]
-    attribute scheme { xsd:anyURI }?,
+    attribute scheme {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     [
       a:documentation [
         "contient un code d'activité défini dans le système de classification ou dans la taxonomie déclaré dans l'attribut "
@@ -4473,7 +4577,9 @@ occupation =
         "."
       ]
     ]
-    attribute code { xsd:anyURI }?,
+    attribute code {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     empty
   }
 org =
@@ -4689,7 +4795,7 @@ relation =
          "         "
        ]
     >> sch:pattern [
-         id = "test21-relation-activemutual-constraint-report-13"
+         id = "test21-relation-activemutual-constraint-report-14"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4707,7 +4813,7 @@ relation =
          "         "
        ]
     >> sch:pattern [
-         id = "test21-relation-activepassive-constraint-report-14"
+         id = "test21-relation-activepassive-constraint-report-15"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4738,17 +4844,23 @@ relation =
     (
      ## identifie les participants actifs dans une relation à sens unique, ou tous les participants dans une relation réciproque.
      attribute active {
-       list { xsd:anyURI+ }
+       list {
+         xsd:anyURI { pattern = "\S+" }+
+       }
      }?
      | 
        ## fournit une liste de participants entre lesquels la relation est réciproque.
        attribute mutual {
-         list { xsd:anyURI+ }
+         list {
+           xsd:anyURI { pattern = "\S+" }+
+         }
        }?),
     
     ## identifie les participants passifs dans une relation non mutuelle.
     attribute passive {
-      list { xsd:anyURI+ }
+      list {
+        xsd:anyURI { pattern = "\S+" }+
+      }
     }?,
     empty
   }
@@ -4812,7 +4924,9 @@ socecStatus =
     }?,
     
     ## identifie le système de classification ou la taxinomie utilisés.
-    attribute scheme { xsd:anyURI }?,
+    attribute scheme {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     [
       a:documentation [
         "contient un code de statut existant dans le système de classification ou dans la taxonomie déclarés au moyen de l'attribut "
@@ -4820,7 +4934,9 @@ socecStatus =
         "."
       ]
     ]
-    attribute code { xsd:anyURI }?,
+    attribute code {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     empty
   }
 state =
@@ -4919,34 +5035,15 @@ 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-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}" ~
-         "         "
-       ],
+    (model.placeNamePart
+     | institution
+     | repository
+     | collection
+     | idno
+     | msName
+     | objectName
+     | altIdentifier
+     | address)+,
     att.global.attributes,
     empty
   }
@@ -4961,7 +5058,9 @@ nym =
     
     ## pointe vers des éléments constituants canoniques.
     attribute parts {
-      list { xsd:anyURI+ }
+      list {
+        xsd:anyURI { pattern = "\S+" }+
+      }
     }?,
     empty
   }
@@ -5511,7 +5610,9 @@ tagUsage =
     att.global.attributes,
     
     ## le nom formel complet de l'espace de noms concerné.
-    attribute name { xsd:anyURI },
+    attribute name {
+      xsd:anyURI { pattern = "\S*" }
+    },
     empty
   }
 rendition =
@@ -5570,7 +5671,7 @@ citeStructure =
      }?)
     >> sch:pattern [
          id =
-           "test21-citeStructure-delim-citestructure-inner-delim-constraint-rule-12"
+           "test21-citeStructure-delim-citestructure-inner-delim-constraint-rule-13"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5609,7 +5710,7 @@ citeStructure =
     attribute match { text }
     >> sch:pattern [
          id =
-           "test21-citeStructure-match-citestructure-outer-match-constraint-rule-13"
+           "test21-citeStructure-match-citestructure-outer-match-constraint-rule-14"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5630,7 +5731,7 @@ citeStructure =
        ]
     >> sch:pattern [
          id =
-           "test21-citeStructure-match-citestructure-inner-match-constraint-rule-14"
+           "test21-citeStructure-match-citestructure-inner-match-constraint-rule-15"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5671,7 +5772,9 @@ citeData =
     att.citeStructurePart.attributes,
     
     ## (property) A URI indicating a property definition.
-    attribute property { xsd:anyURI },
+    attribute property {
+      xsd:anyURI { pattern = "\S+" }
+    },
     empty
   }
 cRefPattern =
@@ -5829,7 +5932,9 @@ conversion =
         "."
       ]
     ]
-    attribute fromUnit { xsd:anyURI },
+    attribute fromUnit {
+      xsd:anyURI { pattern = "\S+" }
+    },
     [
       a:documentation [
         "the target unit of measurement for a conversion from a source unit referenced in "
@@ -5837,7 +5942,9 @@ conversion =
         "."
       ]
     ]
-    attribute toUnit { xsd:anyURI },
+    attribute toUnit {
+      xsd:anyURI { pattern = "\S+" }
+    },
     empty
   }
 appInfo =
@@ -5948,7 +6055,9 @@ keywords =
     att.global.attributes,
     
     ## désigne la liste close de mots dans lequel l'ensemble des mots-clés concernés est défini.
-    attribute scheme { xsd:anyURI }?,
+    attribute scheme {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     empty
   }
 classCode =
@@ -5959,7 +6068,9 @@ classCode =
     att.global.attributes,
     
     ## identifie le système de classification ou la taxinomie utilisée.
-    attribute scheme { xsd:anyURI },
+    attribute scheme {
+      xsd:anyURI { pattern = "\S+" }
+    },
     empty
   }
 catRef =
@@ -5971,7 +6082,9 @@ catRef =
     att.pointing.attributes,
     
     ## identifie le schéma de classification dans lequel est défini le jeu de catégories concerné.
-    attribute scheme { xsd:anyURI }?,
+    attribute scheme {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     empty
   }
 calendarDesc =
@@ -6065,7 +6178,9 @@ change =
     
     ## (target) points to one or more elements that belong to this change.
     attribute target {
-      list { xsd:anyURI+ }
+      list {
+        xsd:anyURI { pattern = "\S+" }+
+      }
     }?,
     empty
   }
@@ -6110,41 +6225,57 @@ att.global.linking.attribute.corresp =
   
   ## (correspond) pointe vers des éléments qui ont une correspondance avec l'élément en question.
   attribute corresp {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 att.global.linking.attribute.synch =
   
   ## (synchrone) pointe vers des éléments qui sont synchrones avec l'élément en question.
   attribute synch {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 att.global.linking.attribute.sameAs =
   
   ## pointe vers un élément identique à l'élément en question.
-  attribute sameAs { xsd:anyURI }?
+  attribute sameAs {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 att.global.linking.attribute.copyOf =
   
   ## pointe vers un élément dont l'élément en question est une copie.
-  attribute copyOf { xsd:anyURI }?
+  attribute copyOf {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 att.global.linking.attribute.next =
   
   ## pointe vers l'élément suivant d'un ensemble virtuel dont l'élément en question est une partie.
-  attribute next { xsd:anyURI }?
+  attribute next {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 att.global.linking.attribute.prev =
   
   ## ( précédent) pointe vers l'élément précédent d'un ensemble virtuel auquel appartient l'élément en question.
-  attribute prev { xsd:anyURI }?
+  attribute prev {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 att.global.linking.attribute.exclude =
   
   ## pointe vers des éléments qui sont une alternative exclusive à l'élément en question.
   attribute exclude {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 att.global.linking.attribute.select =
   
   ## sélectionne une ou plusieurs valeurs alternatives ; si une seule valeur est sélectionnée, l'ambiguïté ou l'incertitude est marquée comme résolue. Si plus d'une valeur alternative est sélectionnée, le degré d'ambiguïté ou d'incertitude est marqué comme réduit par le nombre de valeurs alternatives non sélectionnées.
   attribute select {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 link =
   
@@ -6353,7 +6484,9 @@ when =
         " : cette date ou cette heure s'obtiennent en ajoutant la valeur de l'intervalle à la date du point de référence."
       ]
     ]
-    attribute since { xsd:anyURI }?,
+    attribute since {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     empty
   }
 timeline =
@@ -6364,7 +6497,9 @@ timeline =
     att.global.attributes,
     
     ## désigne le début de la frise chronologique, c'est-à-dire le moment où elle commence.
-    attribute origin { xsd:anyURI }?,
+    attribute origin {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     [
       a:documentation [
         "spécifie l'unité de temps correspondant à la valeur de l'attribut "
@@ -6497,7 +6632,11 @@ alt =
     
     ## précise la cible de la référence en donnant une ou plusieurs références URI
     attribute target {
-      list { xsd:anyURI, xsd:anyURI, xsd:anyURI* }
+      list {
+        xsd:anyURI { pattern = "\S+" },
+        xsd:anyURI { pattern = "\S+" },
+        xsd:anyURI { pattern = "\S+" }*
+      }
     }?,
     
     ## établit si les alternatives rassemblées dans cette collection sont exclusives ou non.
@@ -6653,7 +6792,9 @@ annotation =
     
     ## précise la cible de la référence en donnant une ou plusieurs références URI
     attribute target {
-      list { xsd:anyURI+ }
+      list {
+        xsd:anyURI { pattern = "\S+" }+
+      }
     },
     
     ##
@@ -6720,7 +6861,9 @@ att.msClass.attribute.class =
   
   ## spécifie la ou les catégories ou classes auxquelles l'item appartient.
   attribute class {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 msDesc =
   
@@ -6870,7 +7013,9 @@ locus =
     att.typed.attributes,
     
     ## (système) désigne le système de foliotation utilisé pour localiser la subdivision du manuscrit qui est en cours de description.
-    attribute scheme { xsd:anyURI }?,
+    attribute scheme {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     
     ## (depuis) Spécifie, sous une forme normalisée, le point de départ de la localisation.
     attribute from {
@@ -6891,7 +7036,9 @@ locusGrp =
     att.global.attributes,
     
     ## (système) désigne le système de foliotation selon lequel les emplacements contenus dans le groupe sont définis.
-    attribute scheme { xsd:anyURI }?,
+    attribute scheme {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     empty
   }
 material =
@@ -6911,7 +7058,9 @@ material =
     
     ## identifies one or more elements to which the metamark applies.
     attribute target {
-      list { xsd:anyURI+ }
+      list {
+        xsd:anyURI { pattern = "\S+" }+
+      }
     }?,
     empty
   }
@@ -7587,7 +7736,9 @@ att.global.facs.attribute.facs =
   
   ## (fac-similé) pointe directement vers une image ou vers une partie d'une image correspondant au contenu de l'élément.
   attribute facs {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 att.global.change.attributes = att.global.change.attribute.change
 att.global.change.attribute.change =
@@ -7599,7 +7750,9 @@ att.global.change.attribute.change =
     ]
   ]
   attribute change {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 att.coordinated.attributes =
   att.coordinated.attribute.start,
@@ -7611,7 +7764,9 @@ att.coordinated.attributes =
 att.coordinated.attribute.start =
   
   ## désigne l'élément qui, dans la transcription du texte, contient au moins le début de la section de texte représentée dans la zone ou surface.
-  attribute start { xsd:anyURI }?
+  attribute start {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 att.coordinated.attribute.ulx =
   
   ## donne la valeur x de l'abscisse du coin supérieur gauche d'un rectangle.
@@ -7757,7 +7912,7 @@ path =
   element path {
     empty
     >> sch:pattern [
-         id = "test21-path-pathmustnotbeclosed-constraint-rule-15"
+         id = "test21-path-pathmustnotbeclosed-constraint-rule-16"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -7895,10 +8050,12 @@ addSpan =
     att.dimensions.attributes,
     
     ## indique la fin d'un passage introduit par l'élément portant cet attribut.
-    attribute spanTo { xsd:anyURI }
+    attribute spanTo {
+      xsd:anyURI { pattern = "\S+" }
+    }
     >> sch:pattern [
          id =
-           "test21-addSpan-spanTo-spanTo-points-to-following-constraint-rule-16"
+           "test21-addSpan-spanTo-spanTo-points-to-following-constraint-rule-17"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -8082,7 +8239,9 @@ handShift =
     att.handFeatures.attributes,
     
     ## donne l'identifiant de la nouvelle main.
-    attribute new { xsd:anyURI }?,
+    attribute new {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     empty
   }
 am =
@@ -8135,7 +8294,9 @@ space =
     
     ## (responsable) (responsible party) indicates the individual responsible for identifying and measuring the space
     attribute resp {
-      list { xsd:anyURI+ }
+      list {
+        xsd:anyURI { pattern = "\S+" }+
+      }
     }?,
     
     ## (dimension) indique si l'espace est vertical ou horizontal.
@@ -8267,7 +8428,9 @@ metamark =
     
     ## identifies one or more elements to which the metamark applies.
     attribute target {
-      list { xsd:anyURI+ }
+      list {
+        xsd:anyURI { pattern = "\S+" }+
+      }
     }?,
     empty
   }
@@ -8295,7 +8458,9 @@ redo =
     
     ## points to one or more elements representing the interventions which are being reasserted.
     attribute target {
-      list { xsd:anyURI+ }
+      list {
+        xsd:anyURI { pattern = "\S+" }+
+      }
     }?,
     empty
   }
@@ -8322,7 +8487,9 @@ undo =
     
     ## points to one or more elements representing the interventions which are to be reverted or undone.
     attribute target {
-      list { xsd:anyURI+ }
+      list {
+        xsd:anyURI { pattern = "\S+" }+
+      }
     }?,
     empty
   }
diff --git a/Test/expected-results/test30.dtd b/Test/expected-results/test30.dtd
index 7bb2fa2de..273268d9e 100644
--- a/Test/expected-results/test30.dtd
+++ b/Test/expected-results/test30.dtd
@@ -1545,7 +1545,7 @@ target CDATA  #IMPLIED >
 
+property %teidata.pointer;  #REQUIRED >
 
 
 
@@ -2036,7 +2036,8 @@ datum %teidata.enumerated;  "WGS84"  >
  %Tatt.global.attributes;
  %Tatt.media.attributes;
  %Tatt.resourced.attributes;
- %Tatt.declaring.attributes; >
+ %Tatt.declaring.attributes;
+ %Tatt.typed.attributes; >
 
 
 
@@ -2524,7 +2525,7 @@ parts CDATA  #IMPLIED >
  %Tatt.docStatus.attributes;
  %Tatt.canonical.attributes; >
 
-
+
 
 
@@ -3147,6 +3148,7 @@ dim (horizontal|vertical) #IMPLIED >
  %Tatt.ascribed.directed.attributes;
  %Tatt.global.attributes;
  %Tatt.placement.attributes;
+ %Tatt.written.attributes;
 type NMTOKENS  #IMPLIED >
 
 
diff --git a/Test/expected-results/test30.rnc b/Test/expected-results/test30.rnc
index 7c71d1e79..66bfd0227 100644
--- a/Test/expected-results/test30.rnc
+++ b/Test/expected-results/test30.rnc
@@ -51,14 +51,18 @@ Tatt.anchoring.attribute.targetEnd =
   
   ## (target end) points to the end of the span to which the note is attached, if the note is not embedded in the text at that point.
   attribute targetEnd {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 Tatt.ascribed.attributes = Tatt.ascribed.attribute.who
 Tatt.ascribed.attribute.who =
   
   ## indicates the person, or group of people, to whom the element content is ascribed.
   attribute who {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 Tatt.ascribed.directed.attributes =
   Tatt.ascribed.attributes, Tatt.ascribed.directed.attribute.toWhom
@@ -66,7 +70,9 @@ Tatt.ascribed.directed.attribute.toWhom =
   
   ## indicates the person, or group of people, to whom a speech act or action is directed.
   attribute toWhom {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 Tatt.canonical.attributes =
   Tatt.canonical.attribute.key, Tatt.canonical.attribute.ref
@@ -78,7 +84,9 @@ Tatt.canonical.attribute.ref =
   
   ## (reference) provides an explicit means of locating a full definition or identity for the entity being named by means of one or more URIs.
   attribute ref {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 Tatt.ranging.attributes =
   Tatt.ranging.attribute.atLeast,
@@ -203,7 +211,9 @@ Tatt.written.attribute.hand =
       " element describing the hand considered responsible for the content of the element concerned."
     ]
   ]
-  attribute hand { xsd:anyURI }?
+  attribute hand {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 Tatt.damaged.attributes =
   Tatt.dimensions.attributes,
   Tatt.written.attributes,
@@ -405,7 +415,9 @@ Tatt.datable.attribute.calendar =
   
   ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
   attribute calendar {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 sch:pattern [
   id = "testbasic-att.datable-calendar-calendar-constraint-rule-4"
@@ -440,7 +452,9 @@ Tatt.datable.attribute.period =
     ]
   ]
   attribute period {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 Tatt.datcat.attributes =
   Tatt.datcat.attribute.datcat, Tatt.datcat.attribute.valueDatcat
@@ -448,13 +462,17 @@ Tatt.datcat.attribute.datcat =
   
   ## contains a PID (persistent identifier) that aligns the given element with the appropriate Data Category (or categories) in ISOcat.
   attribute ns2:datcat {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 Tatt.datcat.attribute.valueDatcat =
   
   ## contains a PID (persistent identifier) that aligns the content of the given element or the value of the given attribute with the appropriate simple Data Category (or categories) in ISOcat.
   attribute ns2:valueDatcat {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 Tatt.declarable.attributes = Tatt.declarable.attribute.default
 Tatt.declarable.attribute.default =
@@ -472,9 +490,11 @@ Tatt.declarable.attribute.default =
 Tatt.declaring.attributes = Tatt.declaring.attribute.decls
 Tatt.declaring.attribute.decls =
   
-  ## identifies one or more declarable elements within the header, which are understood to apply to the element bearing this attribute and its content.
+  ## (declarations) identifies one or more declarable elements within the header, which are understood to apply to the element bearing this attribute and its content.
   attribute decls {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 Tatt.fragmentable.attributes = Tatt.fragmentable.attribute.part
 Tatt.fragmentable.attribute.part =
@@ -569,7 +589,9 @@ Tatt.global.responsibility.attribute.resp =
   
   ## (responsible party) indicates the agency responsible for the intervention or interpretation, for example an editor or transcriber.
   attribute resp {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 Tatt.editLike.attributes =
   Tatt.editLike.attribute.evidence, Tatt.editLike.attribute.instant
@@ -638,15 +660,53 @@ Tatt.global.rendition.attribute.rendition =
   
   ## points to a description of the rendering or presentation used for this element in the source text.
   attribute rendition {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 Tatt.global.source.attributes = Tatt.global.source.attribute.source
 Tatt.global.source.attribute.source =
   
   ## specifies the source from which some aspect of this element is drawn.
   attribute source {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
+sch:pattern [
+  id =
+    "testbasic-att.global.source-source-only_1_ODD_source-constraint-rule-5"
+  "\x{a}" ~
+  "      "
+  sch:rule [
+    context = "tei:*/@source"
+    "\x{a}" ~
+    "         "
+    sch:let [
+      name = "srcs"
+      value = "tokenize( normalize-space(.),' ')"
+    ]
+    "\x{a}" ~
+    "         "
+    sch:report [
+      test =
+        "( parent::tei:classRef                               | parent::tei:dataRef                               | parent::tei:elementRef                               | parent::tei:macroRef                               | parent::tei:moduleRef                               | parent::tei:schemaSpec )                               and                               $srcs[2]"
+      "\x{a}" ~
+      "              When used on a schema description element (like\x{a}" ~
+      "              "
+      sch:value-of [ select = "name(..)" ]
+      "), the @source attribute\x{a}" ~
+      "              should have only 1 value. (This one has "
+      sch:value-of [ select = "count($srcs)" ]
+      ".)\x{a}" ~
+      "            "
+    ]
+    "\x{a}" ~
+    "      "
+  ]
+  "\x{a}" ~
+  "   "
+]
 Tatt.handFeatures.attributes =
   Tatt.handFeatures.attribute.scribe,
   Tatt.handFeatures.attribute.scribeRef,
@@ -667,7 +727,9 @@ Tatt.handFeatures.attribute.scribeRef =
     ]
   ]
   attribute scribeRef {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 Tatt.handFeatures.attribute.script =
   
@@ -684,7 +746,9 @@ Tatt.handFeatures.attribute.scriptRef =
     ]
   ]
   attribute scriptRef {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 Tatt.handFeatures.attribute.medium =
   
@@ -752,7 +816,9 @@ Tatt.resourced.attributes = Tatt.resourced.attribute.url
 Tatt.resourced.attribute.url =
   
   ## (uniform resource locator) specifies the URL from which the media concerned may be obtained.
-  attribute url { xsd:anyURI }
+  attribute url {
+    xsd:anyURI { pattern = "\S+" }
+  }
 Tatt.measurement.attributes =
   Tatt.measurement.attribute.unit,
   Tatt.measurement.attribute.unitRef,
@@ -832,7 +898,9 @@ Tatt.measurement.attribute.unitRef =
       " element that defines a unit of measure."
     ]
   ]
-  attribute unitRef { xsd:anyURI }?
+  attribute unitRef {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 Tatt.measurement.attribute.quantity =
   
   ## (quantity) specifies the number of the specified units that comprise the measurement
@@ -851,7 +919,7 @@ Tatt.measurement.attribute.commodity =
   }?
 sch:pattern [
   id =
-    "testbasic-att.measurement-att-measurement-unitRef-constraint-rule-5"
+    "testbasic-att.measurement-att-measurement-unitRef-constraint-rule-6"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -885,7 +953,9 @@ Tatt.naming.attribute.nymRef =
   
   ## (reference to the canonical name) provides a means of locating the canonical form (nym) of the names associated with the object named by the element bearing it.
   attribute nymRef {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 Tatt.notated.attributes = Tatt.notated.attribute.notation
 Tatt.notated.attribute.notation =
@@ -955,7 +1025,7 @@ Tatt.typed.attribute.subtype =
     xsd:token { pattern = "[^\p{C}\p{Z}]+" }
   }?
 sch:pattern [
-  id = "testbasic-att.typed-subtypeTyped-constraint-rule-6"
+  id = "testbasic-att.typed-subtypeTyped-constraint-rule-7"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -998,7 +1068,7 @@ Tatt.pointing.attribute.targetLang =
        "")
   }?
 sch:pattern [
-  id = "testbasic-att.pointing-targetLang-targetLang-constraint-rule-7"
+  id = "testbasic-att.pointing-targetLang-targetLang-constraint-rule-8"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1021,7 +1091,9 @@ Tatt.pointing.attribute.target =
   
   ## specifies the destination of the reference by supplying one or more URI References
   attribute target {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 Tatt.pointing.attribute.evaluate =
   
@@ -1046,7 +1118,11 @@ Tatt.pointing.group.attribute.domains =
   
   ## optionally specifies the identifiers of the elements within which all elements indicated by the contents of this element lie.
   attribute domains {
-    list { xsd:anyURI, xsd:anyURI, xsd:anyURI* }
+    list {
+      xsd:anyURI { pattern = "\S+" },
+      xsd:anyURI { pattern = "\S+" },
+      xsd:anyURI { pattern = "\S+" }*
+    }
   }?
 Tatt.pointing.group.attribute.targFunc =
   [
@@ -1100,16 +1176,20 @@ Tatt.edition.attribute.edRef =
   
   ## (edition reference) provides a pointer to the source edition in which the associated feature (for example, a page, column, or line break) occurs at this point in the text.
   attribute edRef {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 Tatt.spanning.attributes = Tatt.spanning.attribute.spanTo
 Tatt.spanning.attribute.spanTo =
   
   ## indicates the end of a span initiated by the element bearing this attribute.
-  attribute spanTo { xsd:anyURI }?
+  attribute spanTo {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 sch:pattern [
   id =
-    "testbasic-att.spanning-spanTo-spanTo-points-to-following-constraint-rule-8"
+    "testbasic-att.spanning-spanTo-spanTo-points-to-following-constraint-rule-9"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1165,7 +1245,7 @@ Tatt.styleDef.attribute.schemeVersion =
   }?
 sch:pattern [
   id =
-    "testbasic-att.styleDef-schemeVersion-schemeVersionRequiresScheme-constraint-rule-9"
+    "testbasic-att.styleDef-schemeVersion-schemeVersionRequiresScheme-constraint-rule-10"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1189,11 +1269,15 @@ Tatt.timed.attributes =
 Tatt.timed.attribute.start =
   
   ## indicates the location within a temporal alignment at which this element begins.
-  attribute start { xsd:anyURI }?
+  attribute start {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 Tatt.timed.attribute.end =
   
   ## indicates the location within a temporal alignment at which this element ends.
-  attribute end { xsd:anyURI }?
+  attribute end {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 Tatt.transcriptional.attributes =
   Tatt.editLike.attributes,
   Tatt.written.attributes,
@@ -2039,7 +2123,9 @@ Tatt.locatable.attribute.where =
     ]
   ]
   attribute where {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 Tmodel.correspActionPart =
   Tmodel.dateLike
@@ -2142,7 +2228,7 @@ Tp =
     Tmacro.paraContent
     >> sch:pattern [
          id =
-           "testbasic-p-abstractModel-structure-p-in-ab-or-p-constraint-report-5"
+           "testbasic-p-abstractModel-structure-p-in-ab-or-p-constraint-report-6"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2164,7 +2250,7 @@ Tp =
        ]
     >> sch:pattern [
          id =
-           "testbasic-p-abstractModel-structure-p-in-l-or-lg-constraint-report-6"
+           "testbasic-p-abstractModel-structure-p-in-l-or-lg-constraint-report-7"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2342,7 +2428,7 @@ Tdesc =
     Tmacro.limitedContent
     >> sch:pattern [
          id =
-           "testbasic-desc-deprecationInfo-only-in-deprecated-constraint-rule-10"
+           "testbasic-desc-deprecationInfo-only-in-deprecated-constraint-rule-11"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2429,10 +2515,12 @@ Trt =
     Tatt.transcriptional.attributes,
     (
      ## supplies a pointer to the base being glossed by this ruby text.
-     attribute target { xsd:anyURI }?)
+     attribute target {
+       xsd:anyURI { pattern = "\S+" }
+     }?)
     >> sch:pattern [
          id =
-           "testbasic-rt-target-rt-target-not-span-constraint-report-7"
+           "testbasic-rt-target-rt-target-not-span-constraint-report-8"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2452,7 +2540,9 @@ Trt =
        ],
     (
      ## points to the starting point of the span of text being glossed by this ruby text.
-     attribute from { xsd:anyURI }?)
+     attribute from {
+       xsd:anyURI { pattern = "\S+" }
+     }?)
     >> sch:pattern [
          id = "testbasic-rt-from-rt-from-constraint-assert-7"
          "\x{a}" ~
@@ -2476,7 +2566,9 @@ Trt =
        ],
     (
      ## points to the ending point of the span of text being glossed.
-     attribute to { xsd:anyURI }?)
+     attribute to {
+       xsd:anyURI { pattern = "\S+" }
+     }?)
     >> sch:pattern [
          id = "testbasic-rt-to-rt-to-constraint-assert-8"
          "\x{a}" ~
@@ -2833,7 +2925,7 @@ Tptr =
   element ptr {
     empty
     >> sch:pattern [
-         id = "testbasic-ptr-ptrAtts-constraint-report-8"
+         id = "testbasic-ptr-ptrAtts-constraint-report-9"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2867,7 +2959,7 @@ Tref =
   element ref {
     Tmacro.paraContent
     >> sch:pattern [
-         id = "testbasic-ref-refAtts-constraint-report-9"
+         id = "testbasic-ref-refAtts-constraint-report-10"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2908,7 +3000,7 @@ Tlist =
      (Tmodel.divBottom, Tmodel.global*)*)
     >> sch:pattern [
          id =
-           "testbasic-list-gloss-list-must-have-labels-constraint-rule-11"
+           "testbasic-list-gloss-list-must-have-labels-constraint-rule-12"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3070,6 +3162,7 @@ Tgraphic =
     Tatt.media.attributes,
     Tatt.resourced.attributes,
     Tatt.declaring.attributes,
+    Tatt.typed.attributes,
     empty
   }
 TbinaryObject =
@@ -3423,7 +3516,7 @@ TrelatedItem =
     ((Tmodel.biblLike | Tmodel.ptrLike)?)
     >> sch:pattern [
          id =
-           "testbasic-relatedItem-targetorcontent1-constraint-report-10"
+           "testbasic-relatedItem-targetorcontent1-constraint-report-11"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3455,7 +3548,9 @@ TrelatedItem =
     Tatt.typed.attributes,
     
     ## points to the related bibliographic element by means of an absolute or relative URI reference
-    attribute target { xsd:anyURI }?,
+    attribute target {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     empty
   }
 Tl =
@@ -3469,7 +3564,7 @@ Tl =
       | Tmodel.global)*)
     >> sch:pattern [
          id =
-           "testbasic-l-abstractModel-structure-l-in-l-constraint-report-11"
+           "testbasic-l-abstractModel-structure-l-in-l-constraint-report-12"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3527,7 +3622,7 @@ Tlg =
        ]
     >> sch:pattern [
          id =
-           "testbasic-lg-abstractModel-structure-lg-in-l-constraint-report-12"
+           "testbasic-lg-abstractModel-structure-lg-in-l-constraint-report-13"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3582,6 +3677,7 @@ Tstage =
     Tatt.ascribed.directed.attributes,
     Tatt.global.attributes,
     Tatt.placement.attributes,
+    Tatt.written.attributes,
     
     ## indicates the kind of stage direction.
     ## Suggested values include: 1] setting; 2] entrance; 3] exit; 4] business; 5] novelistic; 6] delivery; 7] modifier; 8] location; 9] mixed
@@ -4049,7 +4145,7 @@ Tquotation =
     (Tmodel.pLike*)
     >> sch:pattern [
          id =
-           "testbasic-quotation-quotationContents-constraint-report-13"
+           "testbasic-quotation-quotationContents-constraint-report-14"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4222,7 +4318,9 @@ Tnamespace =
     Tatt.global.attributes,
     
     ## specifies the full formal name of the namespace concerned.
-    attribute name { xsd:anyURI },
+    attribute name {
+      xsd:anyURI { pattern = "\S*" }
+    },
     empty
   }
 Trendition =
@@ -4281,7 +4379,7 @@ TciteStructure =
      }?)
     >> sch:pattern [
          id =
-           "testbasic-citeStructure-delim-citestructure-inner-delim-constraint-rule-12"
+           "testbasic-citeStructure-delim-citestructure-inner-delim-constraint-rule-13"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4320,7 +4418,7 @@ TciteStructure =
     attribute match { text }
     >> sch:pattern [
          id =
-           "testbasic-citeStructure-match-citestructure-outer-match-constraint-rule-13"
+           "testbasic-citeStructure-match-citestructure-outer-match-constraint-rule-14"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4341,7 +4439,7 @@ TciteStructure =
        ]
     >> sch:pattern [
          id =
-           "testbasic-citeStructure-match-citestructure-inner-match-constraint-rule-14"
+           "testbasic-citeStructure-match-citestructure-inner-match-constraint-rule-15"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4382,7 +4480,9 @@ TciteData =
     Tatt.citeStructurePart.attributes,
     
     ## (property) A URI indicating a property definition.
-    attribute property { xsd:anyURI },
+    attribute property {
+      xsd:anyURI { pattern = "\S+" }
+    },
     empty
   }
 TcRefPattern =
@@ -4539,7 +4639,9 @@ Tconversion =
         "."
       ]
     ]
-    attribute fromUnit { xsd:anyURI },
+    attribute fromUnit {
+      xsd:anyURI { pattern = "\S+" }
+    },
     [
       a:documentation [
         "the target unit of measurement for a conversion from a source unit referenced in "
@@ -4547,7 +4649,9 @@ Tconversion =
         "."
       ]
     ]
-    attribute toUnit { xsd:anyURI },
+    attribute toUnit {
+      xsd:anyURI { pattern = "\S+" }
+    },
     empty
   }
 TappInfo =
@@ -4663,7 +4767,9 @@ Tkeywords =
         " element, or by some other resource."
       ]
     ]
-    attribute scheme { xsd:anyURI }?,
+    attribute scheme {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     empty
   }
 TclassCode =
@@ -4679,7 +4785,9 @@ TclassCode =
         " element, or some other resource."
       ]
     ]
-    attribute scheme { xsd:anyURI },
+    attribute scheme {
+      xsd:anyURI { pattern = "\S+" }
+    },
     empty
   }
 TcatRef =
@@ -4696,7 +4804,9 @@ TcatRef =
         " element, or by some other resource."
       ]
     ]
-    attribute scheme { xsd:anyURI }?,
+    attribute scheme {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     empty
   }
 TcalendarDesc =
@@ -4793,7 +4903,9 @@ Tchange =
     
     ## (target) points to one or more elements that belong to this change.
     attribute target {
-      list { xsd:anyURI+ }
+      list {
+        xsd:anyURI { pattern = "\S+" }+
+      }
     }?,
     empty
   }
@@ -4867,7 +4979,9 @@ Tatt.datable.custom.attribute.to-custom =
 Tatt.datable.custom.attribute.datingPoint =
   
   ## supplies a pointer to some location defining a named point in time with reference to which the datable item is understood to have occurred
-  attribute datingPoint { xsd:anyURI }?
+  attribute datingPoint {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 Tatt.datable.custom.attribute.datingMethod =
   [
     a:documentation [
@@ -4876,7 +4990,9 @@ Tatt.datable.custom.attribute.datingMethod =
       " element or other means of interpreting the values of the custom dating attributes."
     ]
   ]
-  attribute datingMethod { xsd:anyURI }?
+  attribute datingMethod {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 Tmodel.persNamePart =
   Tsurname
   | Tforename
@@ -5539,7 +5655,9 @@ Toccupation =
         " element, or pointing to some other resource."
       ]
     ]
-    attribute scheme { xsd:anyURI }?,
+    attribute scheme {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     [
       a:documentation [
         "identifies an occupation code defined within the classification system or taxonomy defined by the "
@@ -5547,7 +5665,9 @@ Toccupation =
         " attribute."
       ]
     ]
-    attribute code { xsd:anyURI }?,
+    attribute code {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     empty
   }
 Torg =
@@ -5763,7 +5883,7 @@ Trelation =
          "         "
        ]
     >> sch:pattern [
-         id = "testbasic-relation-activemutual-constraint-report-14"
+         id = "testbasic-relation-activemutual-constraint-report-15"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5781,7 +5901,7 @@ Trelation =
          "         "
        ]
     >> sch:pattern [
-         id = "testbasic-relation-activepassive-constraint-report-15"
+         id = "testbasic-relation-activepassive-constraint-report-16"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5812,17 +5932,23 @@ Trelation =
     (
      ## identifies the active participants in a non-mutual relationship, or all the participants in a mutual one.
      attribute active {
-       list { xsd:anyURI+ }
+       list {
+         xsd:anyURI { pattern = "\S+" }+
+       }
      }?
      | 
        ## supplies a list of participants amongst all of whom the relationship holds equally.
        attribute mutual {
-         list { xsd:anyURI+ }
+         list {
+           xsd:anyURI { pattern = "\S+" }+
+         }
        }?),
     
     ## identifies the passive participants in a non-mutual relationship.
     attribute passive {
-      list { xsd:anyURI+ }
+      list {
+        xsd:anyURI { pattern = "\S+" }+
+      }
     }?,
     empty
   }
@@ -5891,7 +6017,9 @@ TsocecStatus =
         " element or by supplying a URI for an externally-defined system."
       ]
     ]
-    attribute scheme { xsd:anyURI }?,
+    attribute scheme {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     [
       a:documentation [
         "identifies a status code defined within the classification system or taxonomy defined by the "
@@ -5899,7 +6027,9 @@ TsocecStatus =
         " attribute."
       ]
     ]
-    attribute code { xsd:anyURI }?,
+    attribute code {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     empty
   }
 Tstate =
@@ -5998,26 +6128,7 @@ 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-16"
-         "\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}" ~
-         "         "
-       ],
+    (Tmodel.placeNamePart | Tidno | TobjectName | Taddress)+,
     Tatt.global.attributes,
     empty
   }
@@ -6032,7 +6143,9 @@ Tnym =
     
     ## points to constituent nyms
     attribute parts {
-      list { xsd:anyURI+ }
+      list {
+        xsd:anyURI { pattern = "\S+" }+
+      }
     }?,
     empty
   }
@@ -6055,7 +6168,9 @@ Tatt.global.facs.attribute.facs =
   
   ## (facsimile) points to one or more images, portions of an image, or surfaces which correspond to the current element.
   attribute facs {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 Tatt.global.change.attributes = Tatt.global.change.attribute.change
 Tatt.global.change.attribute.change =
@@ -6067,7 +6182,9 @@ Tatt.global.change.attribute.change =
     ]
   ]
   attribute change {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 Tatt.coordinated.attributes =
   Tatt.coordinated.attribute.start,
@@ -6079,7 +6196,9 @@ Tatt.coordinated.attributes =
 Tatt.coordinated.attribute.start =
   
   ## indicates the element within a transcription of the text containing at least the start of the writing represented by this zone or surface.
-  attribute start { xsd:anyURI }?
+  attribute start {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 Tatt.coordinated.attribute.ulx =
   
   ## gives the x coordinate value for the upper left corner of a rectangular space.
@@ -6226,7 +6345,7 @@ Tpath =
   element path {
     empty
     >> sch:pattern [
-         id = "testbasic-path-pathmustnotbeclosed-constraint-rule-15"
+         id = "testbasic-path-pathmustnotbeclosed-constraint-rule-16"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -6528,7 +6647,9 @@ ThandShift =
         " element describing the hand concerned."
       ]
     ]
-    attribute new { xsd:anyURI }?,
+    attribute new {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     empty
   }
 Tam =
@@ -6577,7 +6698,9 @@ Tspace =
     
     ## (responsible party) (responsible party) indicates the individual responsible for identifying and measuring the space
     attribute resp {
-      list { xsd:anyURI+ }
+      list {
+        xsd:anyURI { pattern = "\S+" }+
+      }
     }?,
     
     ## (dimension) indicates whether the space is horizontal or vertical.
@@ -6716,7 +6839,9 @@ Tmetamark =
     
     ## identifies one or more elements to which the metamark applies.
     attribute target {
-      list { xsd:anyURI+ }
+      list {
+        xsd:anyURI { pattern = "\S+" }+
+      }
     }?,
     empty
   }
@@ -6744,7 +6869,9 @@ Tredo =
     
     ## points to one or more elements representing the interventions which are being reasserted.
     attribute target {
-      list { xsd:anyURI+ }
+      list {
+        xsd:anyURI { pattern = "\S+" }+
+      }
     }?,
     empty
   }
@@ -6771,7 +6898,9 @@ Tundo =
     
     ## points to one or more elements representing the interventions which are to be reverted or undone.
     attribute target {
-      list { xsd:anyURI+ }
+      list {
+        xsd:anyURI { pattern = "\S+" }+
+      }
     }?,
     empty
   }
@@ -7062,7 +7191,9 @@ Twhen =
         " element, which is obtained by adding the interval to the time of the reference point."
       ]
     ]
-    attribute since { xsd:anyURI }?,
+    attribute since {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     empty
   }
 Ttimeline =
@@ -7073,7 +7204,9 @@ Ttimeline =
     Tatt.global.attributes,
     
     ## designates the origin of the timeline, i.e. the time at which it begins.
-    attribute origin { xsd:anyURI }?,
+    attribute origin {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     [
       a:documentation [
         "specifies the unit of time corresponding to the "
@@ -7208,7 +7341,11 @@ Talt =
     
     ## specifies the destination of the reference by supplying one or more URI References
     attribute target {
-      list { xsd:anyURI, xsd:anyURI, xsd:anyURI* }
+      list {
+        xsd:anyURI { pattern = "\S+" },
+        xsd:anyURI { pattern = "\S+" },
+        xsd:anyURI { pattern = "\S+" }*
+      }
     }?,
     
     ## states whether the alternations gathered in this collection are exclusive or inclusive.
@@ -7359,7 +7496,9 @@ Tannotation =
     
     ## specifies the destination of the reference by supplying one or more URI References
     attribute target {
-      list { xsd:anyURI+ }
+      list {
+        xsd:anyURI { pattern = "\S+" }+
+      }
     },
     
     ##
@@ -7838,22 +7977,30 @@ Tatt.global.linking.attributes =
 Tatt.global.linking.attribute.sameAs =
   
   ## points to an element that is the same as the current element.
-  attribute sameAs { xsd:anyURI }?
+  attribute sameAs {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 Tatt.global.linking.attribute.copyOf =
   
   ## points to an element of which the current element is a copy.
-  attribute copyOf { xsd:anyURI }?
+  attribute copyOf {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 Tatt.global.linking.attribute.exclude =
   
   ## points to elements that are in exclusive alternation with the current element.
   attribute exclude {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 Tatt.global.linking.attribute.select =
   
   ## selects one or more alternants; if one alternant is selected, the ambiguity or uncertainty is marked as resolved. If more than one alternant is selected, the degree of ambiguity or uncertainty is marked as reduced by the number of alternants not selected.
   attribute select {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 Tatt.global.attributes =
   Tatt.global.rendition.attributes,
@@ -7890,7 +8037,9 @@ Tatt.global.attribute.xmllang =
 Tatt.global.attribute.xmlbase =
   
   ## provides a base URI reference with which applications can resolve relative URI references into absolute URI references.
-  attribute xml:base { xsd:anyURI }?
+  attribute xml:base {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 Tatt.global.attribute.xmlspace =
   
   ## signals an intention about how white space should be managed by applications.
@@ -7962,7 +8111,7 @@ TMenu =
   }
 start = TTEI | Tdiv
 sch:pattern [
-  id = "testbasic-outerconstraint-constraint-rule-16"
+  id = "testbasic-outerconstraint-constraint-rule-17"
   "\x{a}" ~
   "      "
   sch:rule [
diff --git a/Test/expected-results/test33.rnc b/Test/expected-results/test33.rnc
index e7c0a3bb2..67802312c 100644
--- a/Test/expected-results/test33.rnc
+++ b/Test/expected-results/test33.rnc
@@ -53,14 +53,18 @@ tei_att.anchoring.attribute.targetEnd =
   
   ## (target end) points to the end of the span to which the note is attached, if the note is not embedded in the text at that point.
   attribute targetEnd {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.ascribed.attributes = tei_att.ascribed.attribute.who
 tei_att.ascribed.attribute.who =
   
   ## indicates the person, or group of people, to whom the element content is ascribed.
   attribute who {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.ascribed.directed.attributes =
   tei_att.ascribed.attributes,
@@ -69,7 +73,9 @@ tei_att.ascribed.directed.attribute.toWhom =
   
   ## indicates the person, or group of people, to whom a speech act or action is directed.
   attribute toWhom {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.canonical.attributes =
   tei_att.canonical.attribute.key, tei_att.canonical.attribute.ref
@@ -81,7 +87,9 @@ tei_att.canonical.attribute.ref =
   
   ## (reference) provides an explicit means of locating a full definition or identity for the entity being named by means of one or more URIs.
   attribute ref {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.ranging.attributes =
   tei_att.ranging.attribute.atLeast,
@@ -206,7 +214,9 @@ tei_att.written.attribute.hand =
       " element describing the hand considered responsible for the content of the element concerned."
     ]
   ]
-  attribute hand { xsd:anyURI }?
+  attribute hand {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 tei_att.breaking.attributes = tei_att.breaking.attribute.break
 tei_att.breaking.attribute.break =
   
@@ -360,7 +370,9 @@ tei_att.datable.attribute.calendar =
   
   ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
   attribute calendar {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 sch:pattern [
   id = "foo-att.datable-calendar-calendar-constraint-rule-4"
@@ -395,7 +407,9 @@ tei_att.datable.attribute.period =
     ]
   ]
   attribute period {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.datcat.attributes =
   tei_att.datcat.attribute.datcat, tei_att.datcat.attribute.valueDatcat
@@ -403,13 +417,17 @@ tei_att.datcat.attribute.datcat =
   
   ## contains a PID (persistent identifier) that aligns the given element with the appropriate Data Category (or categories) in ISOcat.
   attribute ns2:datcat {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.datcat.attribute.valueDatcat =
   
   ## contains a PID (persistent identifier) that aligns the content of the given element or the value of the given attribute with the appropriate simple Data Category (or categories) in ISOcat.
   attribute ns2:valueDatcat {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.declarable.attributes = tei_att.declarable.attribute.default
 tei_att.declarable.attribute.default =
@@ -427,9 +445,11 @@ tei_att.declarable.attribute.default =
 tei_att.declaring.attributes = tei_att.declaring.attribute.decls
 tei_att.declaring.attribute.decls =
   
-  ## identifies one or more declarable elements within the header, which are understood to apply to the element bearing this attribute and its content.
+  ## (declarations) identifies one or more declarable elements within the header, which are understood to apply to the element bearing this attribute and its content.
   attribute decls {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.fragmentable.attributes = tei_att.fragmentable.attribute.part
 tei_att.fragmentable.attribute.part =
@@ -524,7 +544,9 @@ tei_att.global.responsibility.attribute.resp =
   
   ## (responsible party) indicates the agency responsible for the intervention or interpretation, for example an editor or transcriber.
   attribute resp {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.editLike.attributes =
   tei_att.editLike.attribute.evidence,
@@ -580,7 +602,9 @@ tei_att.global.rendition.attribute.rendition =
   
   ## points to a description of the rendering or presentation used for this element in the source text.
   attribute rendition {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.global.source.attributes =
   tei_att.global.source.attribute.source
@@ -588,8 +612,44 @@ tei_att.global.source.attribute.source =
   
   ## specifies the source from which some aspect of this element is drawn.
   attribute source {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
+sch:pattern [
+  id =
+    "foo-att.global.source-source-only_1_ODD_source-constraint-rule-5"
+  "\x{a}" ~
+  "      "
+  sch:rule [
+    context = "tei:*/@source"
+    "\x{a}" ~
+    "         "
+    sch:let [
+      name = "srcs"
+      value = "tokenize( normalize-space(.),' ')"
+    ]
+    "\x{a}" ~
+    "         "
+    sch:report [
+      test =
+        "( parent::tei:classRef                               | parent::tei:dataRef                               | parent::tei:elementRef                               | parent::tei:macroRef                               | parent::tei:moduleRef                               | parent::tei:schemaSpec )                               and                               $srcs[2]"
+      "\x{a}" ~
+      "              When used on a schema description element (like\x{a}" ~
+      "              "
+      sch:value-of [ select = "name(..)" ]
+      "), the @source attribute\x{a}" ~
+      "              should have only 1 value. (This one has "
+      sch:value-of [ select = "count($srcs)" ]
+      ".)\x{a}" ~
+      "            "
+    ]
+    "\x{a}" ~
+    "      "
+  ]
+  "\x{a}" ~
+  "   "
+]
 tei_att.global.attributes =
   tei_att.global.rendition.attributes,
   tei_att.global.linking.attributes,
@@ -628,7 +688,9 @@ tei_att.global.attribute.xmllang =
 tei_att.global.attribute.xmlbase =
   
   ## provides a base URI reference with which applications can resolve relative URI references into absolute URI references.
-  attribute xml:base { xsd:anyURI }?
+  attribute xml:base {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 tei_att.global.attribute.xmlspace =
   
   ## signals an intention about how white space should be managed by applications.
@@ -653,7 +715,9 @@ tei_att.handFeatures.attribute.scribeRef =
     ]
   ]
   attribute scribeRef {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.handFeatures.attribute.script =
   
@@ -670,7 +734,9 @@ tei_att.handFeatures.attribute.scriptRef =
     ]
   ]
   attribute scriptRef {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.handFeatures.attribute.medium =
   
@@ -739,7 +805,9 @@ tei_att.resourced.attributes = tei_att.resourced.attribute.url
 tei_att.resourced.attribute.url =
   
   ## (uniform resource locator) specifies the URL from which the media concerned may be obtained.
-  attribute url { xsd:anyURI }
+  attribute url {
+    xsd:anyURI { pattern = "\S+" }
+  }
 tei_att.measurement.attributes =
   tei_att.measurement.attribute.unit,
   tei_att.measurement.attribute.unitRef,
@@ -819,7 +887,9 @@ tei_att.measurement.attribute.unitRef =
       " element that defines a unit of measure."
     ]
   ]
-  attribute unitRef { xsd:anyURI }?
+  attribute unitRef {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 tei_att.measurement.attribute.quantity =
   
   ## (quantity) specifies the number of the specified units that comprise the measurement
@@ -837,7 +907,7 @@ tei_att.measurement.attribute.commodity =
     }
   }?
 sch:pattern [
-  id = "foo-att.measurement-att-measurement-unitRef-constraint-rule-5"
+  id = "foo-att.measurement-att-measurement-unitRef-constraint-rule-6"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -871,7 +941,9 @@ tei_att.naming.attribute.nymRef =
   
   ## (reference to the canonical name) provides a means of locating the canonical form (nym) of the names associated with the object named by the element bearing it.
   attribute nymRef {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.notated.attributes = tei_att.notated.attribute.notation
 tei_att.notated.attribute.notation =
@@ -941,7 +1013,7 @@ tei_att.typed.attribute.subtype =
     xsd:token { pattern = "[^\p{C}\p{Z}]+" }
   }?
 sch:pattern [
-  id = "foo-att.typed-subtypeTyped-constraint-rule-6"
+  id = "foo-att.typed-subtypeTyped-constraint-rule-7"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -984,7 +1056,7 @@ tei_att.pointing.attribute.targetLang =
        "")
   }?
 sch:pattern [
-  id = "foo-att.pointing-targetLang-targetLang-constraint-rule-7"
+  id = "foo-att.pointing-targetLang-targetLang-constraint-rule-8"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1007,7 +1079,9 @@ tei_att.pointing.attribute.target =
   
   ## specifies the destination of the reference by supplying one or more URI References
   attribute target {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.pointing.attribute.evaluate =
   
@@ -1032,7 +1106,11 @@ tei_att.pointing.group.attribute.domains =
   
   ## optionally specifies the identifiers of the elements within which all elements indicated by the contents of this element lie.
   attribute domains {
-    list { xsd:anyURI, xsd:anyURI, xsd:anyURI* }
+    list {
+      xsd:anyURI { pattern = "\S+" },
+      xsd:anyURI { pattern = "\S+" },
+      xsd:anyURI { pattern = "\S+" }*
+    }
   }?
 tei_att.pointing.group.attribute.targFunc =
   [
@@ -1086,16 +1164,20 @@ tei_att.edition.attribute.edRef =
   
   ## (edition reference) provides a pointer to the source edition in which the associated feature (for example, a page, column, or line break) occurs at this point in the text.
   attribute edRef {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.spanning.attributes = tei_att.spanning.attribute.spanTo
 tei_att.spanning.attribute.spanTo =
   
   ## indicates the end of a span initiated by the element bearing this attribute.
-  attribute spanTo { xsd:anyURI }?
+  attribute spanTo {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 sch:pattern [
   id =
-    "foo-att.spanning-spanTo-spanTo-points-to-following-constraint-rule-8"
+    "foo-att.spanning-spanTo-spanTo-points-to-following-constraint-rule-9"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1152,7 +1234,7 @@ tei_att.styleDef.attribute.schemeVersion =
   }?
 sch:pattern [
   id =
-    "foo-att.styleDef-schemeVersion-schemeVersionRequiresScheme-constraint-rule-9"
+    "foo-att.styleDef-schemeVersion-schemeVersionRequiresScheme-constraint-rule-10"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1176,11 +1258,15 @@ tei_att.timed.attributes =
 tei_att.timed.attribute.start =
   
   ## indicates the location within a temporal alignment at which this element begins.
-  attribute start { xsd:anyURI }?
+  attribute start {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 tei_att.timed.attribute.end =
   
   ## indicates the location within a temporal alignment at which this element ends.
-  attribute end { xsd:anyURI }?
+  attribute end {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 tei_att.transcriptional.attributes =
   tei_att.editLike.attributes,
   tei_att.written.attributes,
@@ -1772,7 +1858,9 @@ tei_att.locatable.attribute.where =
     ]
   ]
   attribute where {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_model.correspActionPart =
   tei_model.dateLike
@@ -1873,7 +1961,7 @@ tei_p =
     tei_macro.paraContent
     >> sch:pattern [
          id =
-           "foo-p-abstractModel-structure-p-in-ab-or-p-constraint-report-5"
+           "foo-p-abstractModel-structure-p-in-ab-or-p-constraint-report-6"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -1895,7 +1983,7 @@ tei_p =
        ]
     >> sch:pattern [
          id =
-           "foo-p-abstractModel-structure-p-in-l-or-lg-constraint-report-6"
+           "foo-p-abstractModel-structure-p-in-l-or-lg-constraint-report-7"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2084,7 +2172,7 @@ tei_desc =
     tei_macro.limitedContent
     >> sch:pattern [
          id =
-           "foo-desc-deprecationInfo-only-in-deprecated-constraint-rule-10"
+           "foo-desc-deprecationInfo-only-in-deprecated-constraint-rule-11"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2174,9 +2262,11 @@ tei_rt =
     tei_att.transcriptional.attributes,
     (
      ## supplies a pointer to the base being glossed by this ruby text.
-     attribute target { xsd:anyURI }?)
+     attribute target {
+       xsd:anyURI { pattern = "\S+" }
+     }?)
     >> sch:pattern [
-         id = "foo-rt-target-rt-target-not-span-constraint-report-7"
+         id = "foo-rt-target-rt-target-not-span-constraint-report-8"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2196,7 +2286,9 @@ tei_rt =
        ],
     (
      ## points to the starting point of the span of text being glossed by this ruby text.
-     attribute from { xsd:anyURI }?)
+     attribute from {
+       xsd:anyURI { pattern = "\S+" }
+     }?)
     >> sch:pattern [
          id = "foo-rt-from-rt-from-constraint-assert-7"
          "\x{a}" ~
@@ -2220,7 +2312,9 @@ tei_rt =
        ],
     (
      ## points to the ending point of the span of text being glossed.
-     attribute to { xsd:anyURI }?)
+     attribute to {
+       xsd:anyURI { pattern = "\S+" }
+     }?)
     >> sch:pattern [
          id = "foo-rt-to-rt-to-constraint-assert-8"
          "\x{a}" ~
@@ -2589,7 +2683,7 @@ tei_ptr =
   element tei:ptr {
     empty
     >> sch:pattern [
-         id = "foo-ptr-ptrAtts-constraint-report-8"
+         id = "foo-ptr-ptrAtts-constraint-report-9"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2623,7 +2717,7 @@ tei_ref =
   element tei:ref {
     tei_macro.paraContent
     >> sch:pattern [
-         id = "foo-ref-refAtts-constraint-report-9"
+         id = "foo-ref-refAtts-constraint-report-10"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2663,7 +2757,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-11"
+         id = "foo-list-gloss-list-must-have-labels-constraint-rule-12"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2829,6 +2923,7 @@ tei_graphic =
     tei_att.media.attributes,
     tei_att.resourced.attributes,
     tei_att.declaring.attributes,
+    tei_att.typed.attributes,
     empty
   }
 tei_binaryObject =
@@ -3179,7 +3274,7 @@ tei_relatedItem =
   element tei:relatedItem {
     ((tei_model.biblLike | tei_model.ptrLike)?)
     >> sch:pattern [
-         id = "foo-relatedItem-targetorcontent1-constraint-report-10"
+         id = "foo-relatedItem-targetorcontent1-constraint-report-11"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3211,7 +3306,9 @@ tei_relatedItem =
     tei_att.typed.attributes,
     
     ## points to the related bibliographic element by means of an absolute or relative URI reference
-    attribute target { xsd:anyURI }?,
+    attribute target {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     empty
   }
 tei_l =
@@ -3225,7 +3322,7 @@ tei_l =
       | tei_model.global)*)
     >> sch:pattern [
          id =
-           "foo-l-abstractModel-structure-l-in-l-constraint-report-11"
+           "foo-l-abstractModel-structure-l-in-l-constraint-report-12"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3286,7 +3383,7 @@ tei_lg =
        ]
     >> sch:pattern [
          id =
-           "foo-lg-abstractModel-structure-lg-in-l-constraint-report-12"
+           "foo-lg-abstractModel-structure-lg-in-l-constraint-report-13"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3343,6 +3440,7 @@ tei_stage =
     tei_att.ascribed.directed.attributes,
     tei_att.global.attributes,
     tei_att.placement.attributes,
+    tei_att.written.attributes,
     
     ## indicates the kind of stage direction.
     ## Suggested values include: 1] setting; 2] entrance; 3] exit; 4] business; 5] novelistic; 6] delivery; 7] modifier; 8] location; 9] mixed
@@ -3820,7 +3918,7 @@ tei_quotation =
   element tei:quotation {
     (tei_model.pLike*)
     >> sch:pattern [
-         id = "foo-quotation-quotationContents-constraint-report-13"
+         id = "foo-quotation-quotationContents-constraint-report-14"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3993,7 +4091,9 @@ tei_namespace =
     tei_att.global.attributes,
     
     ## specifies the full formal name of the namespace concerned.
-    attribute name { xsd:anyURI },
+    attribute name {
+      xsd:anyURI { pattern = "\S*" }
+    },
     empty
   }
 tei_rendition =
@@ -4055,7 +4155,7 @@ tei_citeStructure =
      }?)
     >> sch:pattern [
          id =
-           "foo-citeStructure-delim-citestructure-inner-delim-constraint-rule-12"
+           "foo-citeStructure-delim-citestructure-inner-delim-constraint-rule-13"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4094,7 +4194,7 @@ tei_citeStructure =
     attribute match { text }
     >> sch:pattern [
          id =
-           "foo-citeStructure-match-citestructure-outer-match-constraint-rule-13"
+           "foo-citeStructure-match-citestructure-outer-match-constraint-rule-14"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4115,7 +4215,7 @@ tei_citeStructure =
        ]
     >> sch:pattern [
          id =
-           "foo-citeStructure-match-citestructure-inner-match-constraint-rule-14"
+           "foo-citeStructure-match-citestructure-inner-match-constraint-rule-15"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4156,7 +4256,9 @@ tei_citeData =
     tei_att.citeStructurePart.attributes,
     
     ## (property) A URI indicating a property definition.
-    attribute property { xsd:anyURI },
+    attribute property {
+      xsd:anyURI { pattern = "\S+" }
+    },
     empty
   }
 tei_cRefPattern =
@@ -4319,7 +4421,9 @@ tei_conversion =
         "."
       ]
     ]
-    attribute fromUnit { xsd:anyURI },
+    attribute fromUnit {
+      xsd:anyURI { pattern = "\S+" }
+    },
     [
       a:documentation [
         "the target unit of measurement for a conversion from a source unit referenced in "
@@ -4327,7 +4431,9 @@ tei_conversion =
         "."
       ]
     ]
-    attribute toUnit { xsd:anyURI },
+    attribute toUnit {
+      xsd:anyURI { pattern = "\S+" }
+    },
     empty
   }
 tei_appInfo =
@@ -4436,7 +4542,9 @@ tei_keywords =
         " element, or by some other resource."
       ]
     ]
-    attribute scheme { xsd:anyURI }?,
+    attribute scheme {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     empty
   }
 tei_classCode =
@@ -4452,7 +4560,9 @@ tei_classCode =
         " element, or some other resource."
       ]
     ]
-    attribute scheme { xsd:anyURI },
+    attribute scheme {
+      xsd:anyURI { pattern = "\S+" }
+    },
     empty
   }
 tei_catRef =
@@ -4469,7 +4579,9 @@ tei_catRef =
         " element, or by some other resource."
       ]
     ]
-    attribute scheme { xsd:anyURI }?,
+    attribute scheme {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     empty
   }
 tei_calendarDesc =
@@ -4568,7 +4680,9 @@ tei_change =
     
     ## (target) points to one or more elements that belong to this change.
     attribute target {
-      list { xsd:anyURI+ }
+      list {
+        xsd:anyURI { pattern = "\S+" }+
+      }
     }?,
     empty
   }
@@ -4696,7 +4810,7 @@ tei_div =
       (tei_model.divBottom, tei_model.global*)*)?)
     >> sch:pattern [
          id =
-           "foo-div-abstractModel-structure-div-in-l-or-lg-constraint-report-14"
+           "foo-div-abstractModel-structure-div-in-l-or-lg-constraint-report-15"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4718,7 +4832,7 @@ tei_div =
        ]
     >> sch:pattern [
          id =
-           "foo-div-abstractModel-structure-div-in-ab-or-p-constraint-report-15"
+           "foo-div-abstractModel-structure-div-in-ab-or-p-constraint-report-16"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5140,41 +5254,57 @@ tei_att.global.linking.attribute.corresp =
   
   ## (corresponds) points to elements that correspond to the current element in some way.
   attribute corresp {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.global.linking.attribute.synch =
   
   ## (synchronous) points to elements that are synchronous with the current element.
   attribute synch {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.global.linking.attribute.sameAs =
   
   ## points to an element that is the same as the current element.
-  attribute sameAs { xsd:anyURI }?
+  attribute sameAs {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 tei_att.global.linking.attribute.copyOf =
   
   ## points to an element of which the current element is a copy.
-  attribute copyOf { xsd:anyURI }?
+  attribute copyOf {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 tei_att.global.linking.attribute.next =
   
   ## points to the next element of a virtual aggregate of which the current element is part.
-  attribute next { xsd:anyURI }?
+  attribute next {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 tei_att.global.linking.attribute.prev =
   
   ## (previous) points to the previous element of a virtual aggregate of which the current element is part.
-  attribute prev { xsd:anyURI }?
+  attribute prev {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 tei_att.global.linking.attribute.exclude =
   
   ## points to elements that are in exclusive alternation with the current element.
   attribute exclude {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.global.linking.attribute.select =
   
   ## selects one or more alternants; if one alternant is selected, the ambiguity or uncertainty is marked as resolved. If more than one alternant is selected, the degree of ambiguity or uncertainty is marked as reduced by the number of alternants not selected.
   attribute select {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_link =
   
@@ -5223,7 +5353,7 @@ tei_ab =
     tei_macro.paraContent
     >> sch:pattern [
          id =
-           "foo-ab-abstractModel-structure-ab-in-ab-or-p-constraint-report-16"
+           "foo-ab-abstractModel-structure-ab-in-ab-or-p-constraint-report-17"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5245,7 +5375,7 @@ tei_ab =
        ]
     >> sch:pattern [
          id =
-           "foo-ab-abstractModel-structure-ab-in-l-or-lg-constraint-report-17"
+           "foo-ab-abstractModel-structure-ab-in-l-or-lg-constraint-report-18"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5357,7 +5487,9 @@ tei_when =
         " element, which is obtained by adding the interval to the time of the reference point."
       ]
     ]
-    attribute since { xsd:anyURI }?,
+    attribute since {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     empty
   }
 tei_timeline =
@@ -5368,7 +5500,9 @@ tei_timeline =
     tei_att.global.attributes,
     
     ## designates the origin of the timeline, i.e. the time at which it begins.
-    attribute origin { xsd:anyURI }?,
+    attribute origin {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     [
       a:documentation [
         "specifies the unit of time corresponding to the "
@@ -5503,7 +5637,11 @@ tei_alt =
     
     ## specifies the destination of the reference by supplying one or more URI References
     attribute target {
-      list { xsd:anyURI, xsd:anyURI, xsd:anyURI* }
+      list {
+        xsd:anyURI { pattern = "\S+" },
+        xsd:anyURI { pattern = "\S+" },
+        xsd:anyURI { pattern = "\S+" }*
+      }
     }?,
     
     ## states whether the alternations gathered in this collection are exclusive or inclusive.
@@ -5657,7 +5795,9 @@ tei_annotation =
     
     ## specifies the destination of the reference by supplying one or more URI References
     attribute target {
-      list { xsd:anyURI+ }
+      list {
+        xsd:anyURI { pattern = "\S+" }+
+      }
     },
     
     ##
diff --git a/Test/expected-results/test34.combined.json b/Test/expected-results/test34.combined.json
index e5328bf91..edc36af92 100644
--- a/Test/expected-results/test34.combined.json
+++ b/Test/expected-results/test34.combined.json
@@ -2280,7 +2280,7 @@
             { "min" : "1",
               "max" : "1",
               "dataRef" : 
-              { "name" : "anyURI" } } } ],
+              { "key" : "teidata.pointer" } } } ],
         "content" : 
         [ 
           { "type" : "empty" } ] },
@@ -5507,7 +5507,8 @@
           [ "att.global",
             "att.media",
             "att.resourced",
-            "att.declaring" ],
+            "att.declaring",
+            "att.typed" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -10029,7 +10030,8 @@
           "atts" : 
           [ "att.ascribed.directed",
             "att.global",
-            "att.placement" ],
+            "att.placement",
+            "att.written" ],
           "unknown" : 
           [  ] },
         "attributes" : 
@@ -13950,9 +13952,9 @@
               "usage" : "opt",
               "desc" : 
               [ "identifies one or more declarable elements<\/term> within the\nheader, which are understood to apply to the element bearing this\nattribute and its content.<\/desc>" ],
-              "shortDesc" : "identifies one or more declarable elements within the\nheader, which are understood to apply to the element bearing this\nattribute and its content.",
+              "shortDesc" : "(declarations) identifies one or more declarable elements within the\nheader, which are understood to apply to the element bearing this\nattribute and its content.",
               "gloss" : 
-              [  ],
+              [ "declarations<\/gloss>" ],
               "altIdent" : 
               [  ],
               "valDesc" : 
@@ -17354,7 +17356,8 @@
         "content" : 
         [ 
           { "type" : "dataRef",
-            "name" : "anyURI" } ] },
+            "name" : "anyURI",
+            "restriction" : "\\S*" } ] },
       
       { "ident" : "teidata.numeric",
         "ns" : "http:\/\/foo.foo\/foo",
@@ -17431,7 +17434,8 @@
         "content" : 
         [ 
           { "type" : "dataRef",
-            "name" : "anyURI" } ] },
+            "name" : "anyURI",
+            "restriction" : "\\S+" } ] },
       
       { "ident" : "teidata.prefix",
         "ns" : "http:\/\/foo.foo\/foo",
diff --git a/Test/expected-results/test34.rnc b/Test/expected-results/test34.rnc
index 2f758b292..820580eac 100644
--- a/Test/expected-results/test34.rnc
+++ b/Test/expected-results/test34.rnc
@@ -54,14 +54,18 @@ tei_att.anchoring.attribute.targetEnd =
   
   ## (target end) points to the end of the span to which the note is attached, if the note is not embedded in the text at that point.
   attribute targetEnd {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.ascribed.attributes = tei_att.ascribed.attribute.who
 tei_att.ascribed.attribute.who =
   
   ## indicates the person, or group of people, to whom the element content is ascribed.
   attribute who {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.ascribed.directed.attributes =
   tei_att.ascribed.attributes,
@@ -70,7 +74,9 @@ tei_att.ascribed.directed.attribute.toWhom =
   
   ## indicates the person, or group of people, to whom a speech act or action is directed.
   attribute toWhom {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.canonical.attributes =
   tei_att.canonical.attribute.key, tei_att.canonical.attribute.ref
@@ -82,7 +88,9 @@ tei_att.canonical.attribute.ref =
   
   ## (reference) provides an explicit means of locating a full definition or identity for the entity being named by means of one or more URIs.
   attribute ref {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.ranging.attributes =
   tei_att.ranging.attribute.atLeast,
@@ -207,7 +215,9 @@ tei_att.written.attribute.hand =
       " element describing the hand considered responsible for the content of the element concerned."
     ]
   ]
-  attribute hand { xsd:anyURI }?
+  attribute hand {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 tei_att.breaking.attributes = tei_att.breaking.attribute.break
 tei_att.breaking.attribute.break =
   
@@ -361,7 +371,9 @@ tei_att.datable.attribute.calendar =
   
   ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
   attribute calendar {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 sch:pattern [
   id = "foo-att.datable-calendar-calendar-constraint-rule-4"
@@ -396,7 +408,9 @@ tei_att.datable.attribute.period =
     ]
   ]
   attribute period {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.datcat.attributes =
   tei_att.datcat.attribute.datcat, tei_att.datcat.attribute.valueDatcat
@@ -404,13 +418,17 @@ tei_att.datcat.attribute.datcat =
   
   ## contains a PID (persistent identifier) that aligns the given element with the appropriate Data Category (or categories) in ISOcat.
   attribute ns2:datcat {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.datcat.attribute.valueDatcat =
   
   ## contains a PID (persistent identifier) that aligns the content of the given element or the value of the given attribute with the appropriate simple Data Category (or categories) in ISOcat.
   attribute ns2:valueDatcat {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.declarable.attributes = tei_att.declarable.attribute.default
 tei_att.declarable.attribute.default =
@@ -428,9 +446,11 @@ tei_att.declarable.attribute.default =
 tei_att.declaring.attributes = tei_att.declaring.attribute.decls
 tei_att.declaring.attribute.decls =
   
-  ## identifies one or more declarable elements within the header, which are understood to apply to the element bearing this attribute and its content.
+  ## (declarations) identifies one or more declarable elements within the header, which are understood to apply to the element bearing this attribute and its content.
   attribute decls {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.fragmentable.attributes = tei_att.fragmentable.attribute.part
 tei_att.fragmentable.attribute.part =
@@ -525,7 +545,9 @@ tei_att.global.responsibility.attribute.resp =
   
   ## (responsible party) indicates the agency responsible for the intervention or interpretation, for example an editor or transcriber.
   attribute resp {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.editLike.attributes =
   tei_att.editLike.attribute.evidence,
@@ -581,7 +603,9 @@ tei_att.global.rendition.attribute.rendition =
   
   ## points to a description of the rendering or presentation used for this element in the source text.
   attribute rendition {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.global.source.attributes =
   tei_att.global.source.attribute.source
@@ -589,8 +613,44 @@ tei_att.global.source.attribute.source =
   
   ## specifies the source from which some aspect of this element is drawn.
   attribute source {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
+sch:pattern [
+  id =
+    "foo-att.global.source-source-only_1_ODD_source-constraint-rule-5"
+  "\x{a}" ~
+  "      "
+  sch:rule [
+    context = "tei:*/@source"
+    "\x{a}" ~
+    "         "
+    sch:let [
+      name = "srcs"
+      value = "tokenize( normalize-space(.),' ')"
+    ]
+    "\x{a}" ~
+    "         "
+    sch:report [
+      test =
+        "( parent::tei:classRef                               | parent::tei:dataRef                               | parent::tei:elementRef                               | parent::tei:macroRef                               | parent::tei:moduleRef                               | parent::tei:schemaSpec )                               and                               $srcs[2]"
+      "\x{a}" ~
+      "              When used on a schema description element (like\x{a}" ~
+      "              "
+      sch:value-of [ select = "name(..)" ]
+      "), the @source attribute\x{a}" ~
+      "              should have only 1 value. (This one has "
+      sch:value-of [ select = "count($srcs)" ]
+      ".)\x{a}" ~
+      "            "
+    ]
+    "\x{a}" ~
+    "      "
+  ]
+  "\x{a}" ~
+  "   "
+]
 tei_att.global.attributes =
   tei_att.global.rendition.attributes,
   tei_att.global.linking.attributes,
@@ -629,7 +689,9 @@ tei_att.global.attribute.xmllang =
 tei_att.global.attribute.xmlbase =
   
   ## provides a base URI reference with which applications can resolve relative URI references into absolute URI references.
-  attribute xml:base { xsd:anyURI }?
+  attribute xml:base {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 tei_att.global.attribute.xmlspace =
   
   ## signals an intention about how white space should be managed by applications.
@@ -654,7 +716,9 @@ tei_att.handFeatures.attribute.scribeRef =
     ]
   ]
   attribute scribeRef {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.handFeatures.attribute.script =
   
@@ -671,7 +735,9 @@ tei_att.handFeatures.attribute.scriptRef =
     ]
   ]
   attribute scriptRef {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.handFeatures.attribute.medium =
   
@@ -740,7 +806,9 @@ tei_att.resourced.attributes = tei_att.resourced.attribute.url
 tei_att.resourced.attribute.url =
   
   ## (uniform resource locator) specifies the URL from which the media concerned may be obtained.
-  attribute url { xsd:anyURI }
+  attribute url {
+    xsd:anyURI { pattern = "\S+" }
+  }
 tei_att.measurement.attributes =
   tei_att.measurement.attribute.unit,
   tei_att.measurement.attribute.unitRef,
@@ -820,7 +888,9 @@ tei_att.measurement.attribute.unitRef =
       " element that defines a unit of measure."
     ]
   ]
-  attribute unitRef { xsd:anyURI }?
+  attribute unitRef {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 tei_att.measurement.attribute.quantity =
   
   ## (quantity) specifies the number of the specified units that comprise the measurement
@@ -838,7 +908,7 @@ tei_att.measurement.attribute.commodity =
     }
   }?
 sch:pattern [
-  id = "foo-att.measurement-att-measurement-unitRef-constraint-rule-5"
+  id = "foo-att.measurement-att-measurement-unitRef-constraint-rule-6"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -872,7 +942,9 @@ tei_att.naming.attribute.nymRef =
   
   ## (reference to the canonical name) provides a means of locating the canonical form (nym) of the names associated with the object named by the element bearing it.
   attribute nymRef {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.notated.attributes = tei_att.notated.attribute.notation
 tei_att.notated.attribute.notation =
@@ -942,7 +1014,7 @@ tei_att.typed.attribute.subtype =
     xsd:token { pattern = "[^\p{C}\p{Z}]+" }
   }?
 sch:pattern [
-  id = "foo-att.typed-subtypeTyped-constraint-rule-6"
+  id = "foo-att.typed-subtypeTyped-constraint-rule-7"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -985,7 +1057,7 @@ tei_att.pointing.attribute.targetLang =
        "")
   }?
 sch:pattern [
-  id = "foo-att.pointing-targetLang-targetLang-constraint-rule-7"
+  id = "foo-att.pointing-targetLang-targetLang-constraint-rule-8"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1008,7 +1080,9 @@ tei_att.pointing.attribute.target =
   
   ## specifies the destination of the reference by supplying one or more URI References
   attribute target {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.pointing.attribute.evaluate =
   
@@ -1033,7 +1107,11 @@ tei_att.pointing.group.attribute.domains =
   
   ## optionally specifies the identifiers of the elements within which all elements indicated by the contents of this element lie.
   attribute domains {
-    list { xsd:anyURI, xsd:anyURI, xsd:anyURI* }
+    list {
+      xsd:anyURI { pattern = "\S+" },
+      xsd:anyURI { pattern = "\S+" },
+      xsd:anyURI { pattern = "\S+" }*
+    }
   }?
 tei_att.pointing.group.attribute.targFunc =
   [
@@ -1087,16 +1165,20 @@ tei_att.edition.attribute.edRef =
   
   ## (edition reference) provides a pointer to the source edition in which the associated feature (for example, a page, column, or line break) occurs at this point in the text.
   attribute edRef {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.spanning.attributes = tei_att.spanning.attribute.spanTo
 tei_att.spanning.attribute.spanTo =
   
   ## indicates the end of a span initiated by the element bearing this attribute.
-  attribute spanTo { xsd:anyURI }?
+  attribute spanTo {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 sch:pattern [
   id =
-    "foo-att.spanning-spanTo-spanTo-points-to-following-constraint-rule-8"
+    "foo-att.spanning-spanTo-spanTo-points-to-following-constraint-rule-9"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1153,7 +1235,7 @@ tei_att.styleDef.attribute.schemeVersion =
   }?
 sch:pattern [
   id =
-    "foo-att.styleDef-schemeVersion-schemeVersionRequiresScheme-constraint-rule-9"
+    "foo-att.styleDef-schemeVersion-schemeVersionRequiresScheme-constraint-rule-10"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1177,11 +1259,15 @@ tei_att.timed.attributes =
 tei_att.timed.attribute.start =
   
   ## indicates the location within a temporal alignment at which this element begins.
-  attribute start { xsd:anyURI }?
+  attribute start {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 tei_att.timed.attribute.end =
   
   ## indicates the location within a temporal alignment at which this element ends.
-  attribute end { xsd:anyURI }?
+  attribute end {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 tei_att.transcriptional.attributes =
   tei_att.editLike.attributes,
   tei_att.written.attributes,
@@ -1777,7 +1863,9 @@ tei_att.locatable.attribute.where =
     ]
   ]
   attribute where {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_model.correspActionPart =
   tei_model.dateLike
@@ -1878,7 +1966,7 @@ tei_p =
     tei_macro.paraContent
     >> sch:pattern [
          id =
-           "foo-p-abstractModel-structure-p-in-ab-or-p-constraint-report-5"
+           "foo-p-abstractModel-structure-p-in-ab-or-p-constraint-report-6"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -1900,7 +1988,7 @@ tei_p =
        ]
     >> sch:pattern [
          id =
-           "foo-p-abstractModel-structure-p-in-l-or-lg-constraint-report-6"
+           "foo-p-abstractModel-structure-p-in-l-or-lg-constraint-report-7"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2089,7 +2177,7 @@ tei_desc =
     tei_macro.limitedContent
     >> sch:pattern [
          id =
-           "foo-desc-deprecationInfo-only-in-deprecated-constraint-rule-10"
+           "foo-desc-deprecationInfo-only-in-deprecated-constraint-rule-11"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2179,9 +2267,11 @@ tei_rt =
     tei_att.transcriptional.attributes,
     (
      ## supplies a pointer to the base being glossed by this ruby text.
-     attribute target { xsd:anyURI }?)
+     attribute target {
+       xsd:anyURI { pattern = "\S+" }
+     }?)
     >> sch:pattern [
-         id = "foo-rt-target-rt-target-not-span-constraint-report-7"
+         id = "foo-rt-target-rt-target-not-span-constraint-report-8"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2201,7 +2291,9 @@ tei_rt =
        ],
     (
      ## points to the starting point of the span of text being glossed by this ruby text.
-     attribute from { xsd:anyURI }?)
+     attribute from {
+       xsd:anyURI { pattern = "\S+" }
+     }?)
     >> sch:pattern [
          id = "foo-rt-from-rt-from-constraint-assert-7"
          "\x{a}" ~
@@ -2225,7 +2317,9 @@ tei_rt =
        ],
     (
      ## points to the ending point of the span of text being glossed.
-     attribute to { xsd:anyURI }?)
+     attribute to {
+       xsd:anyURI { pattern = "\S+" }
+     }?)
     >> sch:pattern [
          id = "foo-rt-to-rt-to-constraint-assert-8"
          "\x{a}" ~
@@ -2594,7 +2688,7 @@ tei_ptr =
   element ptr {
     empty
     >> sch:pattern [
-         id = "foo-ptr-ptrAtts-constraint-report-8"
+         id = "foo-ptr-ptrAtts-constraint-report-9"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2628,7 +2722,7 @@ tei_ref =
   element ref {
     tei_macro.paraContent
     >> sch:pattern [
-         id = "foo-ref-refAtts-constraint-report-9"
+         id = "foo-ref-refAtts-constraint-report-10"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2668,7 +2762,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-11"
+         id = "foo-list-gloss-list-must-have-labels-constraint-rule-12"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2834,6 +2928,7 @@ tei_graphic =
     tei_att.media.attributes,
     tei_att.resourced.attributes,
     tei_att.declaring.attributes,
+    tei_att.typed.attributes,
     empty
   }
 tei_binaryObject =
@@ -3184,7 +3279,7 @@ tei_relatedItem =
   element relatedItem {
     ((tei_model.biblLike | tei_model.ptrLike)?)
     >> sch:pattern [
-         id = "foo-relatedItem-targetorcontent1-constraint-report-10"
+         id = "foo-relatedItem-targetorcontent1-constraint-report-11"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3216,7 +3311,9 @@ tei_relatedItem =
     tei_att.typed.attributes,
     
     ## points to the related bibliographic element by means of an absolute or relative URI reference
-    attribute target { xsd:anyURI }?,
+    attribute target {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     empty
   }
 tei_l =
@@ -3230,7 +3327,7 @@ tei_l =
       | tei_model.global)*)
     >> sch:pattern [
          id =
-           "foo-l-abstractModel-structure-l-in-l-constraint-report-11"
+           "foo-l-abstractModel-structure-l-in-l-constraint-report-12"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3291,7 +3388,7 @@ tei_lg =
        ]
     >> sch:pattern [
          id =
-           "foo-lg-abstractModel-structure-lg-in-l-constraint-report-12"
+           "foo-lg-abstractModel-structure-lg-in-l-constraint-report-13"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3348,6 +3445,7 @@ tei_stage =
     tei_att.ascribed.directed.attributes,
     tei_att.global.attributes,
     tei_att.placement.attributes,
+    tei_att.written.attributes,
     
     ## indicates the kind of stage direction.
     ## Suggested values include: 1] setting; 2] entrance; 3] exit; 4] business; 5] novelistic; 6] delivery; 7] modifier; 8] location; 9] mixed
@@ -3825,7 +3923,7 @@ tei_quotation =
   element quotation {
     (tei_model.pLike*)
     >> sch:pattern [
-         id = "foo-quotation-quotationContents-constraint-report-13"
+         id = "foo-quotation-quotationContents-constraint-report-14"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3998,7 +4096,9 @@ tei_namespace =
     tei_att.global.attributes,
     
     ## specifies the full formal name of the namespace concerned.
-    attribute name { xsd:anyURI },
+    attribute name {
+      xsd:anyURI { pattern = "\S*" }
+    },
     empty
   }
 tei_rendition =
@@ -4060,7 +4160,7 @@ tei_citeStructure =
      }?)
     >> sch:pattern [
          id =
-           "foo-citeStructure-delim-citestructure-inner-delim-constraint-rule-12"
+           "foo-citeStructure-delim-citestructure-inner-delim-constraint-rule-13"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4099,7 +4199,7 @@ tei_citeStructure =
     attribute match { text }
     >> sch:pattern [
          id =
-           "foo-citeStructure-match-citestructure-outer-match-constraint-rule-13"
+           "foo-citeStructure-match-citestructure-outer-match-constraint-rule-14"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4120,7 +4220,7 @@ tei_citeStructure =
        ]
     >> sch:pattern [
          id =
-           "foo-citeStructure-match-citestructure-inner-match-constraint-rule-14"
+           "foo-citeStructure-match-citestructure-inner-match-constraint-rule-15"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4161,7 +4261,9 @@ tei_citeData =
     tei_att.citeStructurePart.attributes,
     
     ## (property) A URI indicating a property definition.
-    attribute property { xsd:anyURI },
+    attribute property {
+      xsd:anyURI { pattern = "\S+" }
+    },
     empty
   }
 tei_cRefPattern =
@@ -4322,7 +4424,9 @@ tei_conversion =
         "."
       ]
     ]
-    attribute fromUnit { xsd:anyURI },
+    attribute fromUnit {
+      xsd:anyURI { pattern = "\S+" }
+    },
     [
       a:documentation [
         "the target unit of measurement for a conversion from a source unit referenced in "
@@ -4330,7 +4434,9 @@ tei_conversion =
         "."
       ]
     ]
-    attribute toUnit { xsd:anyURI },
+    attribute toUnit {
+      xsd:anyURI { pattern = "\S+" }
+    },
     empty
   }
 tei_appInfo =
@@ -4439,7 +4545,9 @@ tei_keywords =
         " element, or by some other resource."
       ]
     ]
-    attribute scheme { xsd:anyURI }?,
+    attribute scheme {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     empty
   }
 tei_classCode =
@@ -4455,7 +4563,9 @@ tei_classCode =
         " element, or some other resource."
       ]
     ]
-    attribute scheme { xsd:anyURI },
+    attribute scheme {
+      xsd:anyURI { pattern = "\S+" }
+    },
     empty
   }
 tei_catRef =
@@ -4472,7 +4582,9 @@ tei_catRef =
         " element, or by some other resource."
       ]
     ]
-    attribute scheme { xsd:anyURI }?,
+    attribute scheme {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     empty
   }
 tei_calendarDesc =
@@ -4571,7 +4683,9 @@ tei_change =
     
     ## (target) points to one or more elements that belong to this change.
     attribute target {
-      list { xsd:anyURI+ }
+      list {
+        xsd:anyURI { pattern = "\S+" }+
+      }
     }?,
     empty
   }
@@ -4699,7 +4813,7 @@ tei_div =
       (tei_model.divBottom, tei_model.global*)*)?)
     >> sch:pattern [
          id =
-           "foo-div-abstractModel-structure-div-in-l-or-lg-constraint-report-14"
+           "foo-div-abstractModel-structure-div-in-l-or-lg-constraint-report-15"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4721,7 +4835,7 @@ tei_div =
        ]
     >> sch:pattern [
          id =
-           "foo-div-abstractModel-structure-div-in-ab-or-p-constraint-report-15"
+           "foo-div-abstractModel-structure-div-in-ab-or-p-constraint-report-16"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5143,41 +5257,57 @@ tei_att.global.linking.attribute.corresp =
   
   ## (corresponds) points to elements that correspond to the current element in some way.
   attribute corresp {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.global.linking.attribute.synch =
   
   ## (synchronous) points to elements that are synchronous with the current element.
   attribute synch {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.global.linking.attribute.sameAs =
   
   ## points to an element that is the same as the current element.
-  attribute sameAs { xsd:anyURI }?
+  attribute sameAs {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 tei_att.global.linking.attribute.copyOf =
   
   ## points to an element of which the current element is a copy.
-  attribute copyOf { xsd:anyURI }?
+  attribute copyOf {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 tei_att.global.linking.attribute.next =
   
   ## points to the next element of a virtual aggregate of which the current element is part.
-  attribute next { xsd:anyURI }?
+  attribute next {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 tei_att.global.linking.attribute.prev =
   
   ## (previous) points to the previous element of a virtual aggregate of which the current element is part.
-  attribute prev { xsd:anyURI }?
+  attribute prev {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 tei_att.global.linking.attribute.exclude =
   
   ## points to elements that are in exclusive alternation with the current element.
   attribute exclude {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.global.linking.attribute.select =
   
   ## selects one or more alternants; if one alternant is selected, the ambiguity or uncertainty is marked as resolved. If more than one alternant is selected, the degree of ambiguity or uncertainty is marked as reduced by the number of alternants not selected.
   attribute select {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_link =
   
@@ -5226,7 +5356,7 @@ tei_ab =
     tei_macro.paraContent
     >> sch:pattern [
          id =
-           "foo-ab-abstractModel-structure-ab-in-ab-or-p-constraint-report-16"
+           "foo-ab-abstractModel-structure-ab-in-ab-or-p-constraint-report-17"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5248,7 +5378,7 @@ tei_ab =
        ]
     >> sch:pattern [
          id =
-           "foo-ab-abstractModel-structure-ab-in-l-or-lg-constraint-report-17"
+           "foo-ab-abstractModel-structure-ab-in-l-or-lg-constraint-report-18"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5360,7 +5490,9 @@ tei_when =
         " element, which is obtained by adding the interval to the time of the reference point."
       ]
     ]
-    attribute since { xsd:anyURI }?,
+    attribute since {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     empty
   }
 tei_timeline =
@@ -5371,7 +5503,9 @@ tei_timeline =
     tei_att.global.attributes,
     
     ## designates the origin of the timeline, i.e. the time at which it begins.
-    attribute origin { xsd:anyURI }?,
+    attribute origin {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     [
       a:documentation [
         "specifies the unit of time corresponding to the "
@@ -5506,7 +5640,11 @@ tei_alt =
     
     ## specifies the destination of the reference by supplying one or more URI References
     attribute target {
-      list { xsd:anyURI, xsd:anyURI, xsd:anyURI* }
+      list {
+        xsd:anyURI { pattern = "\S+" },
+        xsd:anyURI { pattern = "\S+" },
+        xsd:anyURI { pattern = "\S+" }*
+      }
     }?,
     
     ## states whether the alternations gathered in this collection are exclusive or inclusive.
@@ -5660,7 +5798,9 @@ tei_annotation =
     
     ## specifies the destination of the reference by supplying one or more URI References
     attribute target {
-      list { xsd:anyURI+ }
+      list {
+        xsd:anyURI { pattern = "\S+" }+
+      }
     },
     
     ##
diff --git a/Test/expected-results/test35.rnc b/Test/expected-results/test35.rnc
index 6355721c6..aa504854d 100644
--- a/Test/expected-results/test35.rnc
+++ b/Test/expected-results/test35.rnc
@@ -52,14 +52,18 @@ tei_att.anchoring.attribute.targetEnd =
   
   ## (target end) points to the end of the span to which the note is attached, if the note is not embedded in the text at that point.
   attribute targetEnd {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.ascribed.attributes = tei_att.ascribed.attribute.who
 tei_att.ascribed.attribute.who =
   
   ## indicates the person, or group of people, to whom the element content is ascribed.
   attribute who {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.ascribed.directed.attributes =
   tei_att.ascribed.attributes,
@@ -68,7 +72,9 @@ tei_att.ascribed.directed.attribute.toWhom =
   
   ## indicates the person, or group of people, to whom a speech act or action is directed.
   attribute toWhom {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.canonical.attributes =
   tei_att.canonical.attribute.key, tei_att.canonical.attribute.ref
@@ -80,7 +86,9 @@ tei_att.canonical.attribute.ref =
   
   ## (reference) provides an explicit means of locating a full definition or identity for the entity being named by means of one or more URIs.
   attribute ref {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.ranging.attributes =
   tei_att.ranging.attribute.atLeast,
@@ -205,7 +213,9 @@ tei_att.written.attribute.hand =
       " element describing the hand considered responsible for the content of the element concerned."
     ]
   ]
-  attribute hand { xsd:anyURI }?
+  attribute hand {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 tei_att.breaking.attributes = tei_att.breaking.attribute.break
 tei_att.breaking.attribute.break =
   
@@ -359,7 +369,9 @@ tei_att.datable.attribute.calendar =
   
   ## indicates one or more systems or calendars to which the date represented by the content of this element belongs.
   attribute calendar {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 sch:pattern [
   id = "foo-att.datable-calendar-calendar-constraint-rule-4"
@@ -394,7 +406,9 @@ tei_att.datable.attribute.period =
     ]
   ]
   attribute period {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.datcat.attributes =
   tei_att.datcat.attribute.datcat, tei_att.datcat.attribute.valueDatcat
@@ -402,13 +416,17 @@ tei_att.datcat.attribute.datcat =
   
   ## contains a PID (persistent identifier) that aligns the given element with the appropriate Data Category (or categories) in ISOcat.
   attribute ns2:datcat {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.datcat.attribute.valueDatcat =
   
   ## contains a PID (persistent identifier) that aligns the content of the given element or the value of the given attribute with the appropriate simple Data Category (or categories) in ISOcat.
   attribute ns2:valueDatcat {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.declarable.attributes = tei_att.declarable.attribute.default
 tei_att.declarable.attribute.default =
@@ -426,9 +444,11 @@ tei_att.declarable.attribute.default =
 tei_att.declaring.attributes = tei_att.declaring.attribute.decls
 tei_att.declaring.attribute.decls =
   
-  ## identifies one or more declarable elements within the header, which are understood to apply to the element bearing this attribute and its content.
+  ## (declarations) identifies one or more declarable elements within the header, which are understood to apply to the element bearing this attribute and its content.
   attribute decls {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.fragmentable.attributes = tei_att.fragmentable.attribute.part
 tei_att.fragmentable.attribute.part =
@@ -523,7 +543,9 @@ tei_att.global.responsibility.attribute.resp =
   
   ## (responsible party) indicates the agency responsible for the intervention or interpretation, for example an editor or transcriber.
   attribute resp {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.editLike.attributes =
   tei_att.editLike.attribute.evidence,
@@ -579,7 +601,9 @@ tei_att.global.rendition.attribute.rendition =
   
   ## points to a description of the rendering or presentation used for this element in the source text.
   attribute rendition {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.global.source.attributes =
   tei_att.global.source.attribute.source
@@ -587,8 +611,44 @@ tei_att.global.source.attribute.source =
   
   ## specifies the source from which some aspect of this element is drawn.
   attribute source {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
+sch:pattern [
+  id =
+    "foo-att.global.source-source-only_1_ODD_source-constraint-rule-5"
+  "\x{a}" ~
+  "      "
+  sch:rule [
+    context = "tei:*/@source"
+    "\x{a}" ~
+    "         "
+    sch:let [
+      name = "srcs"
+      value = "tokenize( normalize-space(.),' ')"
+    ]
+    "\x{a}" ~
+    "         "
+    sch:report [
+      test =
+        "( parent::tei:classRef                               | parent::tei:dataRef                               | parent::tei:elementRef                               | parent::tei:macroRef                               | parent::tei:moduleRef                               | parent::tei:schemaSpec )                               and                               $srcs[2]"
+      "\x{a}" ~
+      "              When used on a schema description element (like\x{a}" ~
+      "              "
+      sch:value-of [ select = "name(..)" ]
+      "), the @source attribute\x{a}" ~
+      "              should have only 1 value. (This one has "
+      sch:value-of [ select = "count($srcs)" ]
+      ".)\x{a}" ~
+      "            "
+    ]
+    "\x{a}" ~
+    "      "
+  ]
+  "\x{a}" ~
+  "   "
+]
 tei_att.global.attributes =
   tei_att.global.rendition.attributes,
   tei_att.global.linking.attributes,
@@ -627,7 +687,9 @@ tei_att.global.attribute.xmllang =
 tei_att.global.attribute.xmlbase =
   
   ## provides a base URI reference with which applications can resolve relative URI references into absolute URI references.
-  attribute xml:base { xsd:anyURI }?
+  attribute xml:base {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 tei_att.global.attribute.xmlspace =
   
   ## signals an intention about how white space should be managed by applications.
@@ -652,7 +714,9 @@ tei_att.handFeatures.attribute.scribeRef =
     ]
   ]
   attribute scribeRef {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.handFeatures.attribute.script =
   
@@ -669,7 +733,9 @@ tei_att.handFeatures.attribute.scriptRef =
     ]
   ]
   attribute scriptRef {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.handFeatures.attribute.medium =
   
@@ -738,7 +804,9 @@ tei_att.resourced.attributes = tei_att.resourced.attribute.url
 tei_att.resourced.attribute.url =
   
   ## (uniform resource locator) specifies the URL from which the media concerned may be obtained.
-  attribute url { xsd:anyURI }
+  attribute url {
+    xsd:anyURI { pattern = "\S+" }
+  }
 tei_att.measurement.attributes =
   tei_att.measurement.attribute.unit,
   tei_att.measurement.attribute.unitRef,
@@ -818,7 +886,9 @@ tei_att.measurement.attribute.unitRef =
       " element that defines a unit of measure."
     ]
   ]
-  attribute unitRef { xsd:anyURI }?
+  attribute unitRef {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 tei_att.measurement.attribute.quantity =
   
   ## (quantity) specifies the number of the specified units that comprise the measurement
@@ -836,7 +906,7 @@ tei_att.measurement.attribute.commodity =
     }
   }?
 sch:pattern [
-  id = "foo-att.measurement-att-measurement-unitRef-constraint-rule-5"
+  id = "foo-att.measurement-att-measurement-unitRef-constraint-rule-6"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -870,7 +940,9 @@ tei_att.naming.attribute.nymRef =
   
   ## (reference to the canonical name) provides a means of locating the canonical form (nym) of the names associated with the object named by the element bearing it.
   attribute nymRef {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.notated.attributes = tei_att.notated.attribute.notation
 tei_att.notated.attribute.notation =
@@ -940,7 +1012,7 @@ tei_att.typed.attribute.subtype =
     xsd:token { pattern = "[^\p{C}\p{Z}]+" }
   }?
 sch:pattern [
-  id = "foo-att.typed-subtypeTyped-constraint-rule-6"
+  id = "foo-att.typed-subtypeTyped-constraint-rule-7"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -983,7 +1055,7 @@ tei_att.pointing.attribute.targetLang =
        "")
   }?
 sch:pattern [
-  id = "foo-att.pointing-targetLang-targetLang-constraint-rule-7"
+  id = "foo-att.pointing-targetLang-targetLang-constraint-rule-8"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1006,7 +1078,9 @@ tei_att.pointing.attribute.target =
   
   ## specifies the destination of the reference by supplying one or more URI References
   attribute target {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.pointing.attribute.evaluate =
   
@@ -1031,7 +1105,11 @@ tei_att.pointing.group.attribute.domains =
   
   ## optionally specifies the identifiers of the elements within which all elements indicated by the contents of this element lie.
   attribute domains {
-    list { xsd:anyURI, xsd:anyURI, xsd:anyURI* }
+    list {
+      xsd:anyURI { pattern = "\S+" },
+      xsd:anyURI { pattern = "\S+" },
+      xsd:anyURI { pattern = "\S+" }*
+    }
   }?
 tei_att.pointing.group.attribute.targFunc =
   [
@@ -1085,16 +1163,20 @@ tei_att.edition.attribute.edRef =
   
   ## (edition reference) provides a pointer to the source edition in which the associated feature (for example, a page, column, or line break) occurs at this point in the text.
   attribute edRef {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.spanning.attributes = tei_att.spanning.attribute.spanTo
 tei_att.spanning.attribute.spanTo =
   
   ## indicates the end of a span initiated by the element bearing this attribute.
-  attribute spanTo { xsd:anyURI }?
+  attribute spanTo {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 sch:pattern [
   id =
-    "foo-att.spanning-spanTo-spanTo-points-to-following-constraint-rule-8"
+    "foo-att.spanning-spanTo-spanTo-points-to-following-constraint-rule-9"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1151,7 +1233,7 @@ tei_att.styleDef.attribute.schemeVersion =
   }?
 sch:pattern [
   id =
-    "foo-att.styleDef-schemeVersion-schemeVersionRequiresScheme-constraint-rule-9"
+    "foo-att.styleDef-schemeVersion-schemeVersionRequiresScheme-constraint-rule-10"
   "\x{a}" ~
   "      "
   sch:rule [
@@ -1175,11 +1257,15 @@ tei_att.timed.attributes =
 tei_att.timed.attribute.start =
   
   ## indicates the location within a temporal alignment at which this element begins.
-  attribute start { xsd:anyURI }?
+  attribute start {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 tei_att.timed.attribute.end =
   
   ## indicates the location within a temporal alignment at which this element ends.
-  attribute end { xsd:anyURI }?
+  attribute end {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 tei_att.transcriptional.attributes =
   tei_att.editLike.attributes,
   tei_att.written.attributes,
@@ -1771,7 +1857,9 @@ tei_att.locatable.attribute.where =
     ]
   ]
   attribute where {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_model.correspActionPart =
   tei_model.dateLike
@@ -1871,7 +1959,7 @@ tei_p =
     tei_macro.paraContent
     >> sch:pattern [
          id =
-           "foo-p-abstractModel-structure-p-in-ab-or-p-constraint-report-5"
+           "foo-p-abstractModel-structure-p-in-ab-or-p-constraint-report-6"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -1893,7 +1981,7 @@ tei_p =
        ]
     >> sch:pattern [
          id =
-           "foo-p-abstractModel-structure-p-in-l-or-lg-constraint-report-6"
+           "foo-p-abstractModel-structure-p-in-l-or-lg-constraint-report-7"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2082,7 +2170,7 @@ tei_desc =
     tei_macro.limitedContent
     >> sch:pattern [
          id =
-           "foo-desc-deprecationInfo-only-in-deprecated-constraint-rule-10"
+           "foo-desc-deprecationInfo-only-in-deprecated-constraint-rule-11"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2172,9 +2260,11 @@ tei_rt =
     tei_att.transcriptional.attributes,
     (
      ## supplies a pointer to the base being glossed by this ruby text.
-     attribute target { xsd:anyURI }?)
+     attribute target {
+       xsd:anyURI { pattern = "\S+" }
+     }?)
     >> sch:pattern [
-         id = "foo-rt-target-rt-target-not-span-constraint-report-7"
+         id = "foo-rt-target-rt-target-not-span-constraint-report-8"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2194,7 +2284,9 @@ tei_rt =
        ],
     (
      ## points to the starting point of the span of text being glossed by this ruby text.
-     attribute from { xsd:anyURI }?)
+     attribute from {
+       xsd:anyURI { pattern = "\S+" }
+     }?)
     >> sch:pattern [
          id = "foo-rt-from-rt-from-constraint-assert-7"
          "\x{a}" ~
@@ -2218,7 +2310,9 @@ tei_rt =
        ],
     (
      ## points to the ending point of the span of text being glossed.
-     attribute to { xsd:anyURI }?)
+     attribute to {
+       xsd:anyURI { pattern = "\S+" }
+     }?)
     >> sch:pattern [
          id = "foo-rt-to-rt-to-constraint-assert-8"
          "\x{a}" ~
@@ -2587,7 +2681,7 @@ tei_ptr =
   element tei:ptr {
     empty
     >> sch:pattern [
-         id = "foo-ptr-ptrAtts-constraint-report-8"
+         id = "foo-ptr-ptrAtts-constraint-report-9"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2621,7 +2715,7 @@ tei_ref =
   element tei:ref {
     tei_macro.paraContent
     >> sch:pattern [
-         id = "foo-ref-refAtts-constraint-report-9"
+         id = "foo-ref-refAtts-constraint-report-10"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2661,7 +2755,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-11"
+         id = "foo-list-gloss-list-must-have-labels-constraint-rule-12"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -2827,6 +2921,7 @@ tei_graphic =
     tei_att.media.attributes,
     tei_att.resourced.attributes,
     tei_att.declaring.attributes,
+    tei_att.typed.attributes,
     empty
   }
 tei_binaryObject =
@@ -3177,7 +3272,7 @@ tei_relatedItem =
   element tei:relatedItem {
     ((tei_model.biblLike | tei_model.ptrLike)?)
     >> sch:pattern [
-         id = "foo-relatedItem-targetorcontent1-constraint-report-10"
+         id = "foo-relatedItem-targetorcontent1-constraint-report-11"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3209,7 +3304,9 @@ tei_relatedItem =
     tei_att.typed.attributes,
     
     ## points to the related bibliographic element by means of an absolute or relative URI reference
-    attribute target { xsd:anyURI }?,
+    attribute target {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     empty
   }
 tei_l =
@@ -3223,7 +3320,7 @@ tei_l =
       | tei_model.global)*)
     >> sch:pattern [
          id =
-           "foo-l-abstractModel-structure-l-in-l-constraint-report-11"
+           "foo-l-abstractModel-structure-l-in-l-constraint-report-12"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3284,7 +3381,7 @@ tei_lg =
        ]
     >> sch:pattern [
          id =
-           "foo-lg-abstractModel-structure-lg-in-l-constraint-report-12"
+           "foo-lg-abstractModel-structure-lg-in-l-constraint-report-13"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3341,6 +3438,7 @@ tei_stage =
     tei_att.ascribed.directed.attributes,
     tei_att.global.attributes,
     tei_att.placement.attributes,
+    tei_att.written.attributes,
     
     ## indicates the kind of stage direction.
     ## Suggested values include: 1] setting; 2] entrance; 3] exit; 4] business; 5] novelistic; 6] delivery; 7] modifier; 8] location; 9] mixed
@@ -3799,7 +3897,7 @@ tei_quotation =
   element tei:quotation {
     (tei_model.pLike*)
     >> sch:pattern [
-         id = "foo-quotation-quotationContents-constraint-report-13"
+         id = "foo-quotation-quotationContents-constraint-report-14"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -3972,7 +4070,9 @@ tei_namespace =
     tei_att.global.attributes,
     
     ## specifies the full formal name of the namespace concerned.
-    attribute name { xsd:anyURI },
+    attribute name {
+      xsd:anyURI { pattern = "\S*" }
+    },
     empty
   }
 tei_rendition =
@@ -4034,7 +4134,7 @@ tei_citeStructure =
      }?)
     >> sch:pattern [
          id =
-           "foo-citeStructure-delim-citestructure-inner-delim-constraint-rule-12"
+           "foo-citeStructure-delim-citestructure-inner-delim-constraint-rule-13"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4073,7 +4173,7 @@ tei_citeStructure =
     attribute match { text }
     >> sch:pattern [
          id =
-           "foo-citeStructure-match-citestructure-outer-match-constraint-rule-13"
+           "foo-citeStructure-match-citestructure-outer-match-constraint-rule-14"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4094,7 +4194,7 @@ tei_citeStructure =
        ]
     >> sch:pattern [
          id =
-           "foo-citeStructure-match-citestructure-inner-match-constraint-rule-14"
+           "foo-citeStructure-match-citestructure-inner-match-constraint-rule-15"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4135,7 +4235,9 @@ tei_citeData =
     tei_att.citeStructurePart.attributes,
     
     ## (property) A URI indicating a property definition.
-    attribute property { xsd:anyURI },
+    attribute property {
+      xsd:anyURI { pattern = "\S+" }
+    },
     empty
   }
 tei_cRefPattern =
@@ -4298,7 +4400,9 @@ tei_conversion =
         "."
       ]
     ]
-    attribute fromUnit { xsd:anyURI },
+    attribute fromUnit {
+      xsd:anyURI { pattern = "\S+" }
+    },
     [
       a:documentation [
         "the target unit of measurement for a conversion from a source unit referenced in "
@@ -4306,7 +4410,9 @@ tei_conversion =
         "."
       ]
     ]
-    attribute toUnit { xsd:anyURI },
+    attribute toUnit {
+      xsd:anyURI { pattern = "\S+" }
+    },
     empty
   }
 tei_appInfo =
@@ -4415,7 +4521,9 @@ tei_keywords =
         " element, or by some other resource."
       ]
     ]
-    attribute scheme { xsd:anyURI }?,
+    attribute scheme {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     empty
   }
 tei_classCode =
@@ -4431,7 +4539,9 @@ tei_classCode =
         " element, or some other resource."
       ]
     ]
-    attribute scheme { xsd:anyURI },
+    attribute scheme {
+      xsd:anyURI { pattern = "\S+" }
+    },
     empty
   }
 tei_catRef =
@@ -4448,7 +4558,9 @@ tei_catRef =
         " element, or by some other resource."
       ]
     ]
-    attribute scheme { xsd:anyURI }?,
+    attribute scheme {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     empty
   }
 tei_calendarDesc =
@@ -4547,7 +4659,9 @@ tei_change =
     
     ## (target) points to one or more elements that belong to this change.
     attribute target {
-      list { xsd:anyURI+ }
+      list {
+        xsd:anyURI { pattern = "\S+" }+
+      }
     }?,
     empty
   }
@@ -4675,7 +4789,7 @@ tei_div =
       (tei_model.divBottom, tei_model.global*)*)?)
     >> sch:pattern [
          id =
-           "foo-div-abstractModel-structure-div-in-l-or-lg-constraint-report-14"
+           "foo-div-abstractModel-structure-div-in-l-or-lg-constraint-report-15"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -4697,7 +4811,7 @@ tei_div =
        ]
     >> sch:pattern [
          id =
-           "foo-div-abstractModel-structure-div-in-ab-or-p-constraint-report-15"
+           "foo-div-abstractModel-structure-div-in-ab-or-p-constraint-report-16"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5119,41 +5233,57 @@ tei_att.global.linking.attribute.corresp =
   
   ## (corresponds) points to elements that correspond to the current element in some way.
   attribute corresp {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.global.linking.attribute.synch =
   
   ## (synchronous) points to elements that are synchronous with the current element.
   attribute synch {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.global.linking.attribute.sameAs =
   
   ## points to an element that is the same as the current element.
-  attribute sameAs { xsd:anyURI }?
+  attribute sameAs {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 tei_att.global.linking.attribute.copyOf =
   
   ## points to an element of which the current element is a copy.
-  attribute copyOf { xsd:anyURI }?
+  attribute copyOf {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 tei_att.global.linking.attribute.next =
   
   ## points to the next element of a virtual aggregate of which the current element is part.
-  attribute next { xsd:anyURI }?
+  attribute next {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 tei_att.global.linking.attribute.prev =
   
   ## (previous) points to the previous element of a virtual aggregate of which the current element is part.
-  attribute prev { xsd:anyURI }?
+  attribute prev {
+    xsd:anyURI { pattern = "\S+" }
+  }?
 tei_att.global.linking.attribute.exclude =
   
   ## points to elements that are in exclusive alternation with the current element.
   attribute exclude {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_att.global.linking.attribute.select =
   
   ## selects one or more alternants; if one alternant is selected, the ambiguity or uncertainty is marked as resolved. If more than one alternant is selected, the degree of ambiguity or uncertainty is marked as reduced by the number of alternants not selected.
   attribute select {
-    list { xsd:anyURI+ }
+    list {
+      xsd:anyURI { pattern = "\S+" }+
+    }
   }?
 tei_link =
   
@@ -5202,7 +5332,7 @@ tei_ab =
     tei_macro.paraContent
     >> sch:pattern [
          id =
-           "foo-ab-abstractModel-structure-ab-in-ab-or-p-constraint-report-16"
+           "foo-ab-abstractModel-structure-ab-in-ab-or-p-constraint-report-17"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5224,7 +5354,7 @@ tei_ab =
        ]
     >> sch:pattern [
          id =
-           "foo-ab-abstractModel-structure-ab-in-l-or-lg-constraint-report-17"
+           "foo-ab-abstractModel-structure-ab-in-l-or-lg-constraint-report-18"
          "\x{a}" ~
          "            "
          sch:rule [
@@ -5336,7 +5466,9 @@ tei_when =
         " element, which is obtained by adding the interval to the time of the reference point."
       ]
     ]
-    attribute since { xsd:anyURI }?,
+    attribute since {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     empty
   }
 tei_timeline =
@@ -5347,7 +5479,9 @@ tei_timeline =
     tei_att.global.attributes,
     
     ## designates the origin of the timeline, i.e. the time at which it begins.
-    attribute origin { xsd:anyURI }?,
+    attribute origin {
+      xsd:anyURI { pattern = "\S+" }
+    }?,
     [
       a:documentation [
         "specifies the unit of time corresponding to the "
@@ -5482,7 +5616,11 @@ tei_alt =
     
     ## specifies the destination of the reference by supplying one or more URI References
     attribute target {
-      list { xsd:anyURI, xsd:anyURI, xsd:anyURI* }
+      list {
+        xsd:anyURI { pattern = "\S+" },
+        xsd:anyURI { pattern = "\S+" },
+        xsd:anyURI { pattern = "\S+" }*
+      }
     }?,
     
     ## states whether the alternations gathered in this collection are exclusive or inclusive.
@@ -5636,7 +5774,9 @@ tei_annotation =
     
     ## specifies the destination of the reference by supplying one or more URI References
     attribute target {
-      list { xsd:anyURI+ }
+      list {
+        xsd:anyURI { pattern = "\S+" }+
+      }
     },
     
     ##
diff --git a/Test/expected-results/testdrama.compiled.xml b/Test/expected-results/testdrama.compiled.xml
index 62a036218..701022bc8 100644
--- a/Test/expected-results/testdrama.compiled.xml
+++ b/Test/expected-results/testdrama.compiled.xml
@@ -1048,7 +1048,7 @@ Elements
     9.5.2. Lexical View
     18.3. Other Atomic Feature Values
   
-
+
   provides attributes for those elements in the TEI header which
   may be independently selected by means of  the special purpose decls attribute.
   특별한 목적의 decls 속성을 통해서 독립적으로 선택될 수 있는 TEI 헤더의 요소에 대한 속성을 제공한다.
@@ -1132,7 +1132,7 @@ Information with a Textにおいて詳しく規定されている．
     15.3. Associating Contextual
 Information with a Text
   
-
+
   provides attributes for elements which may be independently associated with a particular declarable element within the header, thus overriding the inherited default for that element.
   헤더에서 선언 가능한 어떤 요소와 독립적으로 연관될 수 있는 속성을 제공한다. 이를 통해 그 요소의 상속된 기본값은 무효가 된다.
   提供元素屬性，這些元素可單獨與標頭中一特定可宣告元素相關連，因此超越該特定元素本身的預設值。
@@ -1145,6 +1145,8 @@ Information with a Text
   assegna attributi agli elementi che possono essere autonomamente associati a un determinato elemento dichiarato nell'intestazione, non tenendo conto del default ereditato per quell'elemento
   
     
+      declarations
+      déclarations
       identifies one or more declarable elements within the
 header, which are understood to apply to the element bearing this
 attribute and its content.
@@ -1153,7 +1155,7 @@ attribute and its content.
       TEIヘダーにある，1つ以上の宣言可能要素を示す．
       当該属性を持つ要素や内容に適応されると解釈される．
       identifie un ou plusieurséléments
-            déclarables dans l'en-tête TEI, qui sont destinés à s'appliquer à l'élément
+            déclarables dans l'en-tête TEI, qui sont destinés à s'appliquer à l'élément
           portant cet attribut et à son contenu.
       identifica uno o más elementos declarables al interno del encabezado, los cuales son válidos para el elemento al cual es adscrito el atributo en cuestión y su contenido.
       identifica uno o più elementi dichiarabili all'interno dell'intestazione,
@@ -1438,7 +1440,6 @@ associated with a dated element, at the time indicated.
       signifies the degree of certainty associated with the intervention or interpretation.
       간섭 또는 해석과 연관된 확실성의 정도를 나타낸다.
       表示該更動或詮釋的相關正確度。
-      当該解釈や調整の確信度を示す．
       donne le degré de certitude associée à l'intervention
         ou à l'interprétation.
       significa el grado de certeza asociado con la
@@ -1776,7 +1777,7 @@ the TEI header.

   
     1.3.1.1.3. Rendition Indicators
   
-
+
   provides attributes used by elements to point to an
     external source.
   外部ソースを参照する要素によって用いられる属性を示す。
@@ -1788,18 +1789,40 @@ the TEI header.

       
         
       
+      
+        
+          
+            
+            
+              When used on a schema description element (like
+              ), the @source attribute
+              should have only 1 value. (This one has .)
+            
+          
+        
+      
       
-        
The source attribute points to an external source. When used on elements
-          describing schema components such as schemaSpec or moduleRef it
-          identifies the source from which declarations for the components of the object being
-          defined may be obtained. 

-        
 On other elements it provides a pointer to the bibliographical source from which a
-          quotation or citation is drawn. 

-        
In either case, the location may be provided using any form of URI, for example an
-          absolute URI, a relative URI, or private scheme URI that is expanded to an absolute URI as
-          documented in a prefixDef.

-        
If more than one location is specified, the default assumption is that the required
-          source should be obtained by combining the resources indicated. 

+        
The source attribute points to an external
+        source. When used on an element describing a schema component
+        (classRef, dataRef, elementRef,
+        macroRef, moduleRef, or
+        
+        schemaSpec), it identifies the source from which
+        declarations for the components should be obtained.

+        
On other elements it provides a pointer to the
+        bibliographical source from which a quotation or citation is
+        drawn.

+        
In either case, the location may be provided using any form
+        of URI, for example an absolute URI, a relative URI, a private
+        scheme URI of the form tei:x.y.z, where
+        x.y.z indicates the version number, e.g.
+        tei:4.3.2 for TEI P5 release 4.3.2 or (as a
+        special case) tei:current for whatever is the
+        latest release, or a private scheme URI that is expanded to an
+        absolute URI as documented in a prefixDef.

+        
When used on elements describing schema components,
+        source should have only one value; when used on
+        other elements multiple values are permitted.

       
     
   
@@ -6183,7 +6206,7 @@ value.
     indicare i nomi degli spazi in XML come stabilito dalle raccomandazioni tecniche del W3C per gli
     spazi dei nomi in XML.
   
-      
+      
    
   
       
The range of syntactically valid values is defined by RFC 3986 Uniform Resource Identifier
@@ -6335,7 +6358,7 @@ resource, either within the current document or elsewhere.</desc>
   <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-05-04" xml:lang="es">define una gama de valores de atributos usados para proporcionar un indicador de cualquier recurso, bien en el documento corriente o en otro.</desc>
   <desc xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2007-01-21" xml:lang="it">definisce la gamma di valori di attributi usati per indicare un unico puntatore rispetto a qualsiasi altra risorsa all'interno del documento corrente o altrove</desc>
   <content xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-      <dataRef name="anyURI"/>
+      <dataRef restriction="\S+" name="anyURI"/>
    </content>
   <remarks xmlns:tei="http://www.tei-c.org/ns/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" versionDate="2011-12-12" xml:lang="en">
       <p>The range of syntactically valid values is defined by
@@ -11150,6 +11173,7 @@ Measures</ref>
   <attList>
     <attDef ident="type" mode="change">
       <gloss xml:lang="en" versionDate="2017-06-25">type</gloss>
+      <gloss xml:lang="es" versionDate="2022-04-28">tipo</gloss>
       <gloss versionDate="2017-06-25" xml:lang="de">Typ</gloss>
       <desc versionDate="2005-01-14" xml:lang="en">allows the encoder to classify the abbreviation according to some convenient
                 typology.</desc>
@@ -11158,8 +11182,7 @@ Measures</ref>
       <desc versionDate="2008-04-05" xml:lang="ja">符号化する人の分類に従って省略名称を付与することができる．</desc>
       <desc versionDate="2009-01-06" xml:lang="fr">permet à l'encodeur de caractériser
                 l'abréviation selon une typologie adéquate</desc>
-      <desc versionDate="2007-05-04" xml:lang="es">permite al codificador clasificar la
-                abreviatura según la tipología conveniente.</desc>
+      <desc versionDate="2022-04-29" xml:lang="es">permite al codificador clasificar la abreviatura según la tipología conveniente.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">pemette al codificatore di classificare
                 l'abbreviazione secondo una tipologia funzionale.</desc>
       <desc versionDate="2016-11-25" xml:lang="de">erlaubt es, die Abkürzung nach einer geeigneten Typologie zu klassifizieren.</desc>
@@ -11275,8 +11298,7 @@ Measures</ref>
           <desc versionDate="2007-06-27" xml:lang="en">the abbreviation is for a geographic name.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">약어가 지명에 대한 것이다.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">用於地理名稱的縮寫。</desc>
-          <desc versionDate="2008-04-06" xml:lang="es">la abreviatura se usa para un nombre
-                        geográfico.</desc>
+          <desc versionDate="2022-04-28" xml:lang="es">la abreviatura se usa para un nombre geográfico.</desc>
           <desc versionDate="2008-04-05" xml:lang="ja">地名の省略形．</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">l'abréviation recouvre un nom
                         géographique.</desc>
@@ -12862,21 +12884,22 @@ psychological significance.
       elektronische Verarbeitung automatisch rekonstruiert werden kann, kann es als unnötig angesehen
       werden, die Nummerierung anzugeben.</p>
   </exemplum>
-  <remarks xml:lang="fr" versionDate="2007-06-12">
-    <p>L'attribut global<att>n</att> indique le
-    symbole ou le nombre utilisé pour marquer le point d'insertion
-    dans le texte source, comme dans l'exemple suivant :
-<egXML xmlns="http://www.tei-c.org/ns/Examples" xml:lang="en">Mevorakh b. Saadya's
-    mother, the matriarch of the family during the second half of the
-    eleventh century, <note n="126" anchored="true"> The alleged
-    mention of Judah Nagid's mother in a letter from 1071 is, in fact,
-    a reference to Judah's children; cf. above, nn. 111 and
-    54. </note> is well known from Geniza documents published by Jacob
-    Mann.</egXML> Cependant, si les notes sont ordonnées et numérotées
-    et qu’on veuille reconstruire automatiquement leur numérotation
-    par un traitement informatique, il est inutile d’enregistrer le
-    numéro des notes.</p>
-  </remarks>
+  <exemplum xml:lang="fr" versionDate="2007-06-12">
+    <p>L'attribut global <att>n</att> indique le
+      symbole ou le nombre utilisé pour marquer le point d'insertion
+      dans le texte source, comme dans l'exemple suivant :</p>
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" xml:lang="en">Mevorakh b. Saadya's
+      mother, the matriarch of the family during the second half of the
+      eleventh century, <note n="126" anchored="true"> The alleged
+        mention of Judah Nagid's mother in a letter from 1071 is, in fact,
+        a reference to Judah's children; cf. above, nn. 111 and
+        54. </note> is well known from Geniza documents published by Jacob
+      Mann.</egXML> 
+    <p>Cependant, si les notes sont ordonnées et numérotées
+      et qu’on veuille reconstruire automatiquement leur numérotation
+      par un traitement informatique, il est inutile d’enregistrer le
+      numéro des notes.</p>
+  </exemplum>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CONONO">3.9.1. Notes and Simple Annotation</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD27">2.2.6. The Notes Statement</ref>
@@ -13092,6 +13115,7 @@ the resource specified by the <att>url</att> attribute.</p>
     <memberOf key="att.media"/>
     <memberOf key="att.resourced"/>
     <memberOf key="att.declaring"/>
+    <memberOf key="att.typed"/>
   </classes>
   <content>
        <classRef key="model.descLike" minOccurs="0" maxOccurs="unbounded"/>   
@@ -13139,6 +13163,35 @@ the resource specified by the <att>url</att> attribute.</p>
       </facsimile>
     </egXML>
   </exemplum>
+  <exemplum versionDate="2022-04-08" xml:lang="en">
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" xml:lang="und" source="#UND">
+      <facsimile>
+        <surfaceGrp n="leaf1" xml:id="spi001">
+          <surface xml:id="spi001r">
+            <graphic type="normal" subtype="thumbnail" url="spi/thumb/001r.jpg"/>
+            <graphic type="normal" subtype="low-res" url="spi/normal/lowRes/001r.jpg"/>
+            <graphic type="normal" subtype="high-res" url="spi/normal/highRes/001r.jpg"/>
+            <graphic type="high-contrast" subtype="low-res" url="spi/contrast/lowRes/001r.jpg"/>
+            <graphic type="high-contrast" subtype="high-res" url="spi/contrast/highRes/001r.jpg"/>
+          </surface>
+          <surface xml:id="spi001v">
+            <graphic type="normal" subtype="thumbnail" url="spi/thumb/001v.jpg"/>
+            <graphic type="normal" subtype="low-res" url="spi/normal/lowRes/001v.jpg"/>
+            <graphic type="normal" subtype="high-res" url="spi/normal/highRes/001v.jpg"/>
+            <graphic type="high-contrast" subtype="low-res" url="spi/contrast/lowRes/001v.jpg"/>
+            <graphic type="high-contrast" subtype="high-res" url="spi/contrast/highRes/001v.jpg"/>
+            <zone xml:id="spi001v_detail01">
+              <graphic type="normal" subtype="thumbnail" url="spi/thumb/001v-detail01.jpg"/>
+              <graphic type="normal" subtype="low-res" url="spi/normal/lowRes/001v-detail01.jpg"/>
+              <graphic type="normal" subtype="high-res" url="spi/normal/highRes/001v-detail01.jpg"/>
+              <graphic type="high-contrast" subtype="low-res" url="spi/contrast/lowRes/001v-detail01.jpg"/>
+              <graphic type="high-contrast" subtype="high-res" url="spi/contrast/highRes/001v-detail01.jpg"/>
+            </zone>
+          </surface>
+        </surfaceGrp>
+      </facsimile>
+    </egXML>
+  </exemplum>
   <remarks versionDate="2016-03-07" xml:lang="en">
     <p>The <att>mimeType</att> attribute should be used to supply the MIME media type of the image
       specified by the <att>url</att> attribute.</p><p>Within the body of a text, a <gi>graphic</gi> element  indicates the 
@@ -15226,7 +15279,7 @@ epistemology, methodology and history of
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBICOI">3.12.2.4. Imprint, Size of a Document, and Reprint Information</ref>
   </listRef>
-</elementSpec><elementSpec module="core" ident="bibl">
+</elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="core" ident="bibl">
   <gloss versionDate="2005-01-14" xml:lang="en">bibliographic citation</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">서지 인용</gloss>
   <gloss versionDate="2007-05-02" xml:lang="zh-TW">書目資料</gloss>
@@ -15347,7 +15400,7 @@ epistemology, methodology and history of
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD3">2.2.7. The Source Description</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</ref>
   </listRef>
-</elementSpec><elementSpec module="core" ident="biblStruct">
+</elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="core" ident="biblStruct">
   <gloss versionDate="2005-04-15" xml:lang="en">structured bibliographic citation</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">구조화된 서지 인용</gloss>
   <gloss versionDate="2007-05-02" xml:lang="zh-TW">結構次要書目</gloss>
@@ -15447,7 +15500,7 @@ epistemology, methodology and history of
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD3">2.2.7. The Source Description</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</ref>
   </listRef>
-</elementSpec><elementSpec module="core" ident="listBibl">
+</elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="core" ident="listBibl">
   <gloss versionDate="2005-01-14" xml:lang="en">citation list</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">인용 목록</gloss>
   <gloss versionDate="2007-05-02" xml:lang="zh-TW">書目列表</gloss>
@@ -15949,7 +16002,7 @@ relatedItem element must be empty</sch:report>
     </egXML>
   </exemplum>
   <exemplum xml:lang="zh-TW">
-    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n23">
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n23-24">
       <sp>
         <speaker>祝英台</speaker>
         <p>我就是英台。三年前我想出外求學，故而改扮男裝，不期与梁兄相遇，三載同窗多蒙照顧，英台感激不盡。</p>
@@ -16054,7 +16107,7 @@ relatedItem element must be empty</sch:report>
     </egXML>
   </exemplum>
   <exemplum xml:lang="zh-TW">
-    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n24">
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n23-24">
       <sp who="#zh-tw_ni #zh-tw_rsa">
         <speaker>梁山伯與祝英台t</speaker>
         <stage type="演講或歌唱">（同時)</stage>
@@ -16097,6 +16150,7 @@ relatedItem element must be empty</sch:report>
     <memberOf key="att.ascribed.directed"/>
     <memberOf key="att.global"/>
     <memberOf key="att.placement"/>
+    <memberOf key="att.written"/>
     <memberOf key="model.stageLike"/>
   </classes>
   <content>
@@ -18083,23 +18137,24 @@ distribution of a text.</desc>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD26">2.2.5. The Series Statement</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#COBICOI">3.12.2.4. Imprint, Size of a Document, and Reprint Information</ref>
   </listRef>
-</elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="availability">
+</elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="availability">
   <gloss xml:lang="en" versionDate="2007-06-12">availability</gloss>
   <gloss versionDate="2007-06-12" xml:lang="fr">disponibilité</gloss>
-    <gloss versionDate="2016-11-17" xml:lang="de">Verfügbarkeit</gloss>
+  <gloss versionDate="2022-06-01" xml:lang="it">disponibilità</gloss>
+  <gloss versionDate="2016-11-17" xml:lang="de">Verfügbarkeit</gloss>
   <desc versionDate="2011-11-17" xml:lang="en">supplies information about the availability of a text, for example any restrictions on its
-    use or distribution, its copyright status, any licence applying to it, etc.</desc>
+  use or distribution, its copyright status, any licence applying to it, etc.</desc>
   <desc versionDate="2009-01-05" xml:lang="fr">renseigne sur la disponibilité du texte, par exemple sur
-    toutes restrictions quant à son usage ou sa diffusion, son copyright, etc.</desc>
+  toutes restrictions quant à son usage ou sa diffusion, son copyright, etc.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">텍스트 이용에 관한 정보를 제시한다. 예를 들어 사용 또는 배포의 제한, 저작권 상태 등.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">提供關於文件可利用性的資訊，例如使用或發行上的任何限制、版權狀態等。</desc>
   <desc versionDate="2008-04-06" xml:lang="ja">テキストの利用可能性に関する情報を示す．例えば，その使用や頒布， 著作権に関する制限など．</desc>
-    <desc versionDate="2016-11-17" xml:lang="de">liefert Informationen zur Verfügbarkeit eines Textes, zum Beispiel Einschränkungen bezüglich des Gebrauchs oder der Weitergabe, Lizensierungen usw.</desc>
+  <desc versionDate="2016-11-17" xml:lang="de">liefert Informationen zur Verfügbarkeit eines Textes, zum Beispiel Einschränkungen bezüglich des Gebrauchs oder der Weitergabe, Lizensierungen usw.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">proporciona información sobre la disponibilidad de un
-    texto, por ejemplo cualquier restricción en cuanto a su uso o distribución, su copyright, etc.</desc>
+  texto, por ejemplo cualquier restricción en cuanto a su uso o distribución, su copyright, etc.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">fornisce informazioni sulla disponibilità di un testo,
-    per esempio su qualsiasi restrizione che si applica alla sua utilizzazione o distribuzione, il
-    suo statuto in merito al copyright, etc.</desc>
+  per esempio su qualsiasi restrizione che si applica alla sua utilizzazione o distribuzione, il
+  suo statuto in merito al copyright, etc.</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="model.publicationStmtPart.detail"/>
@@ -18107,12 +18162,10 @@ distribution of a text.</desc>
     <memberOf key="model.biblPart"/>
   </classes>
   <content>
-    
-      <alternate minOccurs="1" maxOccurs="unbounded">
-        <classRef key="model.availabilityPart"/>
-        <classRef key="model.pLike"/>
-      </alternate>
-    
+    <alternate minOccurs="1" maxOccurs="unbounded">
+      <classRef key="model.availabilityPart"/>
+      <classRef key="model.pLike"/>
+    </alternate>    
   </content>
   <attList>
     <attDef ident="status" usage="opt">
@@ -18120,15 +18173,15 @@ distribution of a text.</desc>
       <gloss versionDate="2016-11-25" xml:lang="de">Statuscode</gloss>
       <desc versionDate="2005-01-14" xml:lang="en">supplies a code identifying the current availability of the text.</desc>
       <desc versionDate="2009-01-05" xml:lang="fr">donne un code caractérisant la disponibilité
-        actuelle d’un texte.</desc>
+      actuelle d’un texte.</desc>
       <desc versionDate="2007-12-20" xml:lang="ko">텍스트의 현재 이용 가능성을 식별하는 부호를 제공한다.</desc>
       <desc versionDate="2007-05-02" xml:lang="zh-TW">提供一個代號，用來確認文件目前的可利用性。</desc>
       <desc versionDate="2008-04-06" xml:lang="ja">当該テキストの，現在の利用可能性を表すコードを示す．</desc>
-        <desc versionDate="2016-11-17" xml:lang="de">gibt einen Code an, der die derzeitige Nutzbarkeit eines Textes festlegt.</desc>
+      <desc versionDate="2016-11-17" xml:lang="de">gibt einen Code an, der die derzeitige Nutzbarkeit eines Textes festlegt.</desc>
       <desc versionDate="2007-05-04" xml:lang="es">proporciona un código identificativo de la
-        disponibilidad actual del texto.</desc>
+      disponibilidad actual del texto.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">fornisce un codice che identifica l'attuale
-        disponibilità del testo.</desc>
+      disponibilità del testo.</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
       <valList type="closed">
         <valItem ident="free">
@@ -18153,7 +18206,7 @@ distribution of a text.</desc>
           <desc versionDate="2008-04-06" xml:lang="es">el estatus del texto es desconocido.</desc>
           <desc versionDate="2008-04-06" xml:lang="ja">当該テキストの利用可能性は不明．</desc>
           <desc versionDate="2007-01-21" xml:lang="it">la disponibilità del testo non è nota</desc>
-            <desc versionDate="2016-11-17" xml:lang="de">der Status des Textes ist unbekannt.</desc>
+          <desc versionDate="2016-11-17" xml:lang="de">der Status des Textes ist unbekannt.</desc>
         </valItem>
         <valItem ident="restricted">
           <gloss xml:lang="en" versionDate="2016-11-25">restricted</gloss>
@@ -18165,7 +18218,7 @@ distribution of a text.</desc>
           <desc versionDate="2008-04-06" xml:lang="es">el texto no está libremente disponible.</desc>
           <desc versionDate="2008-04-06" xml:lang="ja">当該テキストは，自由に使用できない．</desc>
           <desc versionDate="2007-01-21" xml:lang="it">il testo non è disponibile gratuitamente.</desc>
-            <desc versionDate="2016-11-17" xml:lang="de">der Text ist nicht frei verfügbar.</desc>
+          <desc versionDate="2016-11-17" xml:lang="de">der Text ist nicht frei verfügbar.</desc>
         </valItem>
       </valList>
     </attDef>
@@ -18187,8 +18240,8 @@ distribution of a text.</desc>
     <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#fr-ex-Abes">
       <availability status="restricted">
         <p>L' ABES a adopté le système Créative Commons pour permettre à tous ceux qui le
-            souhaitent, de reproduire tout ou partie des rubriques du site de l'ABES sur support
-            papier ou support électronique.</p>
+        souhaitent, de reproduire tout ou partie des rubriques du site de l'ABES sur support
+        papier ou support électronique.</p>
       </availability>
     </egXML>
   </exemplum>
@@ -18210,23 +18263,23 @@ distribution of a text.</desc>
       <availability>
         <licence target="http://opensource.org/licenses/MIT">
           <p>The MIT License
-            applies to this document.</p>
+          applies to this document.</p>
           <p>Copyright (C) 2011 by The University of Victoria</p>
           <p>Permission is hereby granted, free of charge, to any person obtaining a copy
-            of this software and associated documentation files (the "Software"), to deal
-            in the Software without restriction, including without limitation the rights
-            to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-            copies of the Software, and to permit persons to whom the Software is
-            furnished to do so, subject to the following conditions:</p>
+          of this software and associated documentation files (the "Software"), to deal
+          in the Software without restriction, including without limitation the rights
+          to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+          copies of the Software, and to permit persons to whom the Software is
+          furnished to do so, subject to the following conditions:</p>
           <p>The above copyright notice and this permission notice shall be included in
-            all copies or substantial portions of the Software.</p>
+          all copies or substantial portions of the Software.</p>
           <p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-            IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-            FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-            AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-            LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-            OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-            THE SOFTWARE.</p>
+          IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+          FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+          AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+          LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+          OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+          THE SOFTWARE.</p>
         </licence>
       </availability>
     </egXML>
@@ -18244,7 +18297,7 @@ distribution of a text.</desc>
     <p rend="dataDesc"> 永続的な形式で示されるべきである． </p>
   </remarks>
   <remarks xml:lang="de" versionDate="2016-11-17">
-      <p rend="dataDesc">Es sollte ein einheitliches Format verwendet werden.</p>
+    <p rend="dataDesc">Es sollte ein einheitliches Format verwendet werden.</p>
   </remarks>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD24">2.2.4. Publication, Distribution, Licensing, etc.</ref>
@@ -18489,7 +18542,7 @@ définissant les droits d'utilisation.</desc>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD27">2.2.6. The Notes Statement</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD2">2.2. The File Description</ref>
   </listRef>
-</elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="sourceDesc">
+</elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="sourceDesc">
   <gloss versionDate="2007-07-04" xml:lang="en">source description</gloss>
   <gloss versionDate="2009-01-05" xml:lang="fr">description de la source</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">원전 기술</gloss>
@@ -18511,8 +18564,8 @@ définissant les droits d'utilisation.</desc>
         "born digital" für einen nur in elektronischer Form vorliegenden Text.  </desc>
   <desc versionDate="2007-05-04" xml:lang="es">proporciona una descripción del texto (o textos) fuente
     del que un texto electrónico deriva o ha sido generado.</desc>
-  <desc versionDate="2007-01-21" xml:lang="it"> fornisce una descrizionei relativa alla o alle fonti da
-    cui è derivato o generato un documento elettronico.</desc>
+  <desc versionDate="2007-01-21" xml:lang="it"> fornisce una descrizione relativa alla o alle fonti da
+    cui è derivato o generato un documento elettronico.</desc>  
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="att.declarable"/>
@@ -18560,7 +18613,7 @@ définissant les droits d'utilisation.</desc>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD3">2.2.7. The Source Description</ref>
   </listRef>
-</elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="biblFull">
+</elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="biblFull">
   <gloss versionDate="2007-07-04" xml:lang="en">fully-structured bibliographic citation</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">완전히 구조화된 서지 인용 정보</gloss>
   <gloss versionDate="2007-05-02" xml:lang="zh-TW"/>
@@ -18774,7 +18827,7 @@ formatting or layout information preserved.</p>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HDSCHSPEC">2.3.10. The Schema Specification</ref>
   </listRef>
-</elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="projectDesc">
+</elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="projectDesc">
   <gloss versionDate="2005-01-14" xml:lang="en">project description</gloss>
   <gloss versionDate="2009-01-05" xml:lang="fr">description du projet</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">프로젝트 기술</gloss>
@@ -18852,7 +18905,7 @@ formatting or layout information preserved.</p>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD5">2.3. The Encoding Description</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</ref>
   </listRef>
-</elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="samplingDecl">
+</elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="samplingDecl">
   <gloss versionDate="2005-01-14" xml:lang="en">sampling declaration</gloss>
   <gloss versionDate="2009-01-05" xml:lang="fr">déclaration d'échantillonnage</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">표본 추출 선언</gloss>
@@ -18935,7 +18988,7 @@ formatting or layout information preserved.</p>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD5">2.3. The Encoding Description</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</ref>
   </listRef>
-</elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="editorialDecl">
+</elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="editorialDecl">
   <gloss versionDate="2005-01-14" xml:lang="en">editorial practice declaration</gloss>
   <gloss versionDate="2009-01-05" xml:lang="fr">déclaration des pratiques éditoriales</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">편집 실행 선언</gloss>
@@ -19011,7 +19064,7 @@ during the encoding of a text.</desc>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD5">2.3. The Encoding Description</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</ref>
   </listRef>
-</elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="correction">
+</elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="correction">
   <gloss versionDate="2005-01-14" xml:lang="en">correction principles</gloss>
   <gloss versionDate="2009-01-05" xml:lang="fr">règles de correction</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">수정 원리</gloss>
@@ -19183,7 +19236,7 @@ during the encoding of a text.</desc>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD53">2.3.3. The Editorial Practices Declaration</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</ref>
   </listRef>
-</elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="normalization">
+</elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="normalization">
   <gloss xml:lang="en" versionDate="2009-01-05">normalization</gloss>
   <gloss versionDate="2009-01-05" xml:lang="fr">normalisation</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">indicates the extent of normalization or regularization of the original source carried out
@@ -19312,7 +19365,7 @@ during the encoding of a text.</desc>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD53">2.3.3. The Editorial Practices Declaration</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</ref>
   </listRef>
-</elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="quotation">
+</elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="quotation">
   <gloss xml:lang="en" versionDate="2007-06-12">quotation</gloss>
   <gloss versionDate="2007-06-12" xml:lang="fr">citation</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">specifies editorial practice adopted with respect to quotation marks in the original.</desc>
@@ -19451,7 +19504,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD53">2.3.3. The Editorial Practices Declaration</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</ref>
   </listRef>
-</elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="hyphenation">
+</elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="hyphenation">
   <gloss xml:lang="en" versionDate="2009-04-27">hyphenation</gloss>
   <gloss versionDate="2009-04-27" xml:lang="fr">césurage</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">summarizes the way in which hyphenation in a source text has been treated in an encoded
@@ -19582,7 +19635,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD53">2.3.3. The Editorial Practices Declaration</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</ref>
   </listRef>
-</elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="segmentation">
+</elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="segmentation">
   <gloss xml:lang="en" versionDate="2007-06-12">segmentation</gloss>
   <gloss versionDate="2007-06-12" xml:lang="fr">segmentation</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">describes the principles according to which the text has been segmented, for example into
@@ -19629,7 +19682,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD53">2.3.3. The Editorial Practices Declaration</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</ref>
   </listRef>
-</elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="stdVals">
+</elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="stdVals">
   <gloss versionDate="2007-07-04" xml:lang="en">standard values</gloss>
   <gloss versionDate="2009-01-05" xml:lang="fr">valeurs normalisées</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">표준 값</gloss>
@@ -19647,7 +19700,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
     oder Zahlenwerte genutzt wird.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">indica el formato usado cuando aparecen fechas
     estandarizadas o valores numéricos.</desc>
-  <desc versionDate="2007-01-21" xml:lang="it">specidica il formato usato quando vengono fornite date e
+  <desc versionDate="2007-01-21" xml:lang="it">specifica il formato usato quando vengono fornite date e
     altri valori numerici standardizzati.</desc>
   <classes>
     <memberOf key="att.global"/>
@@ -19684,7 +19737,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD53">2.3.3. The Editorial Practices Declaration</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CC.html#CCAS2">15.3.2. Declarable Elements</ref>
   </listRef>
-</elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="interpretation">
+</elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="interpretation">
   <gloss xml:lang="en" versionDate="2007-06-12">interpretation</gloss>
   <gloss versionDate="2007-06-12" xml:lang="fr">Interprétation</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">describes the scope of any analytic or interpretive information added to the text in
@@ -19698,7 +19751,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
     die zusätzlich zur Transkription dem Text hinzugefügt wurde.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">describe la finalidad de cualquier información analítica
     o descriptiva añadida al texto en la transcripción.</desc>
-  <desc versionDate="2007-01-21" xml:lang="it">descrive l'estenione di qualsiasi informazione analitica
+  <desc versionDate="2007-01-21" xml:lang="it">descrive l'estensione di qualsiasi informazione analitica
     o interpretativa inserita nel testo, in aggiunta alla trascrizione</desc>
   <classes>
     <memberOf key="att.global"/>
@@ -19736,7 +19789,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD53">2.3.3. The Editorial Practices Declaration</ref>
   </listRef>
-</elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="punctuation">
+</elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="punctuation">
   <desc versionDate="2013-06-20" xml:lang="en">specifies editorial practice adopted with respect to punctuation marks in the original.</desc>
   <classes>
     <memberOf key="att.declarable"/>
@@ -20170,7 +20223,7 @@ the target element</desc>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD57">2.3.4. The Tagging Declaration</ref>
   </listRef>
-</elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="styleDefDecl">
+</elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="styleDefDecl">
   <gloss versionDate="2012-10-06" xml:lang="en">style definition language declaration</gloss>
   <desc versionDate="2013-04-12" xml:lang="en">specifies the name of the formal language in which style or
   renditional information is supplied elsewhere in the document. The
@@ -20199,7 +20252,7 @@ the target element</desc>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD57-1a">2.3.5. The Default Style Definition Language Declaration</ref>
   </listRef>
-</elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="refsDecl">
+</elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="refsDecl">
   <gloss versionDate="2005-01-14" xml:lang="en">references declaration</gloss>
   <gloss versionDate="2009-01-05" xml:lang="fr">Déclaration du système de références</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">참조 선언</gloss>
@@ -20391,7 +20444,7 @@ the target element</desc>
       <gloss versionDate="2020-02-03" xml:lang="en">property</gloss>
       <desc versionDate="2020-02-03" xml:lang="en">A URI indicating a property definition.</desc>
       <datatype>
-        <dataRef name="anyURI"/>
+        <dataRef key="teidata.pointer"/>
       </datatype>
     </attDef>    
   </attList>
@@ -20401,8 +20454,7 @@ the target element</desc>
         <citeData property="http://purl.org/dc/terms/title" use="head"/>
       </citeStructure>
     </egXML>
-  </exemplum>
-  
+  </exemplum>  
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/CO.html#CORS6">3.11.4. Declaring Reference Systems</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/SA.html#SACRCS">16.2.5.4. Citation Structures</ref>
@@ -21184,7 +21236,7 @@ codes used elsewhere in the text.</desc>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD55">2.3.7. The Classification Declaration</ref>
   </listRef>
-</elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="geoDecl">
+</elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="geoDecl">
   <gloss versionDate="2007-09-23" xml:lang="en">geographic coordinates declaration</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">지리적 좌표 선언</gloss>
   <gloss versionDate="2008-04-06" xml:lang="es">declaración de las coordenadas geográficas</gloss>
@@ -21885,7 +21937,7 @@ elements of  <gi>profileDesc</gi> unless these are documenting multiple texts.</
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD4C">2.4.1. Creation</ref>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD4">2.4. The Profile Description</ref>
   </listRef>
-</elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="langUsage">
+</elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="langUsage">
   <gloss versionDate="2005-01-14" xml:lang="en">language usage</gloss>
   <gloss versionDate="2009-01-05" xml:lang="fr">langue utilisée</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">언어 사용</gloss>
@@ -22068,7 +22120,7 @@ langues, registres, dialectes, etc. présents à l’intérieur d’un texte.</d
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD41">2.4.2. Language Usage</ref>
   </listRef>
-</elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="textClass">
+</elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="textClass">
   <gloss versionDate="2005-01-14" xml:lang="en">text classification</gloss>
   <gloss versionDate="2009-01-05" xml:lang="fr">classification du texte</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">텍스트 분류</gloss>
@@ -22640,11 +22692,13 @@ should be supplied for the <att>scheme</att> attribute.</p>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD44">2.4.5. Calendar Description</ref>
   </listRef>
-</elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="correspDesc">
+</elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="correspDesc">
   <gloss versionDate="2014-01-13" xml:lang="en">correspondence
     description</gloss>
+  <gloss versionDate="2021-02-02" xml:lang="it">descrizione di corrispondenza epistolare</gloss>
   <desc versionDate="2015-01-29" xml:lang="en">contains a description
     of the actions related to one act of correspondence.</desc>
+  <desc versionDate="2021-02-02" xml:lang="it">contiene una descrizione delle azioni intorno a un atto di corrispondenza epistolare.</desc>
   <classes>
     <memberOf key="model.profileDescPart"/>
     <memberOf key="att.declarable"/>
@@ -22795,7 +22849,7 @@ should be supplied for the <att>scheme</att> attribute.</p>
     <listRef>
         <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD44CD">2.4.6. Correspondence Description</ref>
     </listRef>
-</elementSpec><elementSpec xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="xenoData">
+</elementSpec><elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" module="header" ident="xenoData">
   <gloss versionDate="2015-05-30" xml:lang="en">non-TEI metadata</gloss>
   <desc versionDate="2015-05-30" xml:lang="en">provides a container
   element into which metadata in non-TEI formats may be
@@ -23370,8 +23424,7 @@ during the evolution of the encoded representation of that text.</p>
   <desc versionDate="2017-06-13" xml:lang="de">enthält ein einzelnes TEI-konformes Dokument, das aus einem einzigen TEI-Header und einem oder
     mehreren Mitgliedern der <ident type="class">model.resource</ident>-Klasse besteht. Mehrere
     <gi>TEI</gi>-Elemente können in einem <gi>teiCorpus</gi>-Element zusammengefasst werden.</desc>
-  <desc versionDate="2017-02-06" xml:lang="es">contiene un solo documento conforme a la norma TEI, combinando una sola cabecera TEI (teiHeader) con uno o más miembros de la clase <ident type="class">model.resource</ident>. Múltiples elementos TEI se pueden combinar para formar un elemento <gi>teiCorpus</gi>.
-   </desc>
+  <desc versionDate="2022-05-02" xml:lang="es">contiene un solo documento conforme a la norma TEI, combinando una sola cabecera TEI (teiHeader) con uno o más miembros de la clase <ident type="class">model.resource</ident>. Múltiples elementos TEI se pueden combinar para formar un elemento <gi>TEI</gi> o <gi>teiCorpus</gi>.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">contiene un documento TEI-conforme, comprendente un'intestazione e un testo, sia esso isolato o parte di un elemento <gi>teiCorpus</gi>
    </desc>
   <classes>
@@ -23384,11 +23437,11 @@ during the evolution of the encoded representation of that text.</p>
     <sequence>
       <elementRef key="teiHeader"/>
       <alternate>
-	<sequence>
-	  <classRef key="model.resource" minOccurs="1" maxOccurs="unbounded"/>
-	  <elementRef key="TEI" minOccurs="0" maxOccurs="unbounded"/>
-	</sequence>
-	<elementRef key="TEI" minOccurs="1" maxOccurs="unbounded"/>
+        <sequence>
+          <classRef key="model.resource" minOccurs="1" maxOccurs="unbounded"/>
+          <elementRef key="TEI" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+        <elementRef key="TEI" minOccurs="1" maxOccurs="unbounded"/>
       </alternate>
     </sequence>
   </content>
@@ -23412,7 +23465,7 @@ during the evolution of the encoded representation of that text.</p>
       <desc versionDate="2018-12-17" xml:lang="ja">当該文書が妥当（に符号化される）TEIスキームの版を示す．</desc>
       <desc versionDate="2007-06-12" xml:lang="fr">la version majeure du schéma TEI</desc>
       <desc versionDate="2018-07-18" xml:lang="de">gibt die Versionsnummer der TEI-Richtlinien an, gegen die dieses Dokument validiert wird.</desc>
-      <desc versionDate="2007-05-04" xml:lang="es">Versión del esquema TEI</desc>
+      <desc versionDate="2022-05-02" xml:lang="es">especifica el número de versión de las Directrices TEI frente a las cuales este documento es válido.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">versione dello schema TEI</desc>
       <datatype><dataRef key="teidata.version"/></datatype>
       <remarks versionDate="2018-01-24" xml:lang="en">
@@ -23421,8 +23474,9 @@ during the evolution of the encoded representation of that text.</p>
           releases of the fifth major edition of the Guidelines, known as P5. This attribute may be 
           used to associate a TEI document with a specific release of the P5 Guidelines, in the absence 
           of a more precise association provided by the <att>source</att> attribute on the associated 
-          <gi>schemaSpec</gi>. </p>
+          <gi>schemaSpec</gi>.</p>
       </remarks>
+      <remarks versionDate="2022-05-02" xml:lang="es"><p>Durante mucho tiempo, se ha hecho referencia informalmente a las principales ediciones de las Directrices con un nombre compuesto por la letra P (de Propuesta) seguida de un dígito. El lanzamiento actual es uno de los muchos lanzamientos de la quinta edición principal de las Directrices, conocida como P5. Este atributo puede utilizarse para asociar un documento TEI con una publicación específica de las Directrices P5, en ausencia de una asociación más precisa proporcionada por el atributo fuente en el <gi>schemaSpec</gi> asociado.</p></remarks>
       <remarks versionDate="2018-07-18" xml:lang="de">
         <p>Hauptausgaben der TEI-Richtlinien werden seit langem informell mit einem Namen bezeichnet, der sich aus dem Buchstaben P (für proposal) 
           und einer Ziffer zusammensetzt. Die aktuelle Ausgabe ist eine der vielen Ausgaben 
@@ -23445,7 +23499,7 @@ during the evolution of the encoded representation of that text.</p>
             </titleStmt>
             <publicationStmt>
               <p>First published as part of TEI P2, this is the P5
-	      version using a name space.</p>
+              version using a namespace.</p>
             </publicationStmt>
             <sourceDesc>
               <p>No source: this is an original work.</p>
@@ -23476,12 +23530,12 @@ during the evolution of the encoded representation of that text.</p>
             </sourceDesc>
           </fileDesc>
         </teiHeader>
-	<facsimile>
-	  <graphic url="page1.png"/>
-	  <graphic url="page2.png"/>
-	  <graphic url="page3.png"/>
-	  <graphic url="page4.png"/>
-	</facsimile>
+        <facsimile>
+          <graphic url="page1.png"/>
+          <graphic url="page2.png"/>
+          <graphic url="page3.png"/>
+          <graphic url="page4.png"/>
+        </facsimile>
       </TEI>
     </egXML>
   </exemplum>
@@ -23534,10 +23588,11 @@ during the evolution of the encoded representation of that text.</p>
       </TEI>
     </egXML>
   </exemplum>
-  <remarks versionDate="2015-03-10" xml:lang="en">
-    <p>This element is required. It is customary to specify the
-    TEI namespace <code>http://www.tei-c.org/ns/1.0</code> on it, using
-    the <att>xmlns</att> attribute.</p>
+  <remarks versionDate="2022-04-04" xml:lang="en">
+    <p>This element is required. It is customary to specify the TEI
+    namespace <ident type="ns">http://www.tei-c.org/ns/1.0</ident> on
+    it, for example: <tag type="start">TEI version="4.4.0"
+    xml:lang="it" xmlns="http://www.tei-c.org/ns/1.0"</tag>.</p>
   </remarks>
   <remarks xml:lang="fr" versionDate="2007-06-12">
     <p>Cet élément est obligatoire.</p>
@@ -23547,9 +23602,11 @@ during the evolution of the encoded representation of that text.</p>
       当該要素は必須であり，<att>xmlns</att> 属性を用いてTEIの名前空間 <code>http://www.tei-c.org/ns/1.0</code> を指定することになっている．
     </p>
   </remarks>
-  <remarks versionDate="2017-06-13" xml:lang="de">
-    <p>Dieses Element ist obligatorisch. Es ist notwendig, darin den TEI-Namensraum <ident type="ns">http://www.tei-c.org/ns/1.0</ident> mithilfe des <att>xmlns</att>-Attributs zu
-      spezifizieren.</p>
+  <remarks versionDate="2022-04-07" xml:lang="de">
+    <p>Dieses Element ist obligatorisch. Es ist notwendig, 
+      auch den TEI-Namensraum <ident type="ns">http://www.tei-c.org/ns/1.0</ident> anzugeben, z.B. 
+      <tag type="start">TEI version="4.4.0" xml:lang="it" 
+        xmlns="http://www.tei-c.org/ns/1.0"</tag>.</p>
   </remarks>
   <listRef>
     <ref target="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/DS.html#DS">4. Default Text Structure</ref>
@@ -24258,7 +24315,7 @@ during the evolution of the encoded representation of that text.</p>
     </egXML>
   </exemplum>
   <exemplum xml:lang="zh-TW">
-    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n51">
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n51-55">
       <body>
         <div type="part">
           <head>對話的喧囂：巴赫汀文化理論述評</head>
@@ -24546,7 +24603,7 @@ during the evolution of the encoded representation of that text.</p>
     </egXML>
   </exemplum>
   <exemplum xml:lang="zh-TW">
-    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n53">
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n51-55">
       <div1 n="3" type="part">
         <head>第三章：對話性—文化理論的基石</head>
         <div2 n="3.1" type="section">
@@ -24693,7 +24750,7 @@ during the evolution of the encoded representation of that text.</p>
     </egXML>
   </exemplum>
   <exemplum xml:lang="zh-TW">
-    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n54">
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n51-55">
       <div2 n="3.2" type="section">
         <div3 n="3.2.1" type="member">
           <head>打破內在/外在、主觀/客觀的二元對立</head>
@@ -24825,7 +24882,7 @@ during the evolution of the encoded representation of that text.</p>
     </egXML>
   </exemplum>
   <exemplum xml:lang="zh-TW">
-    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n55">
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n51-55">
       <div3 n="3.2.1" type="member">
         <head>打破內在/外在、主觀/客觀的二元對立</head>
         <div4 n="3.2.1.1" type="subsection">
@@ -25680,7 +25737,7 @@ Tubes formed by Lightning — House struck</p>
     </egXML>
   </exemplum>
   <exemplum xml:lang="zh-TW">
-    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n56">
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n56-57">
       <epigraph xml:lang="zh">
         <cit>
           <bibl>俞平伯</bibl>
@@ -27070,7 +27127,7 @@ the date of the entire document, not for any subset or part of it.</p>
     </egXML>
   </exemplum>
   <exemplum xml:lang="zh-TW">
-    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n57">
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n56-57">
       <front>
         <epigraph>
           <quote>小燕子其實也無所愛，只是沉浸在朦朧而飄忽的夏夜夢里罷了。 </quote>
@@ -27796,6 +27853,7 @@ the date of the entire document, not for any subset or part of it.</p>
   <remarks versionDate="2005-01-14" xml:lang="en">
     <p>The <gi>ab</gi> element may be used at the encoder's discretion to mark any component-level elements in a text for which no other more specific appropriate markup is defined.</p>
   </remarks>
+  <remarks versionDate="2022-05-02" xml:lang="es"><p>El elemento <gi>ab</gi> se puede utilizar a discreción del codificador para marcar cualquier elemento a nivel de componente en un texto para el que no se haya definido ningún otro marcado apropiado más específico.</p></remarks>
   <remarks xml:lang="fr" versionDate="2009-10-06">
     <p>L'élément <gi>ab</gi> peut être utilisé à la discrétion de l'encodeur pour marquer dans un texte tout élément de niveau composant pour lequel aucune méthode appropriée de balisage plus spécifique n'est définie.</p>
   </remarks>
@@ -29434,7 +29492,7 @@ You must supply at least two values for @target on <name/>
     </egXML>
   </exemplum>
   <exemplum xml:lang="zh-TW">
-    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n35">
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n35-36">
       <prologue>
         <sp>
           <l>何時姊妹再相逢，雷電轟轟雨蒙蒙？</l>
@@ -30168,7 +30226,7 @@ elements within a cast list.</desc>
     </egXML>
   </exemplum>
   <exemplum xml:lang="zh-TW">
-    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n30">
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n30-31">
       <castGroup rend="braced">
         <castItem>
           <role>程蝶衣</role>
@@ -30304,7 +30362,7 @@ either a single role or a list of non-speaking roles.</desc>
     </egXML>
   </exemplum>
   <exemplum xml:lang="zh-TW">
-    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n31">
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n30-31">
       <castItem type="list">張國榮、張豐毅、鞏俐…等等</castItem>
     </egXML>
   </exemplum>
@@ -30349,7 +30407,7 @@ either a single role or a list of non-speaking roles.</desc>
     </egXML>
   </exemplum>
   <exemplum xml:lang="zh-TW">
-    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n36">
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n35-36">
       <role xml:id="zh-tw_王">鄧肯</role>
       <roleDesc>蘇格蘭國王</roleDesc>
     </egXML>
diff --git a/Test2/expected-results/testPure1.rng b/Test2/expected-results/testPure1.rng
index cf07f439c..544959407 100644
--- a/Test2/expected-results/testPure1.rng
+++ b/Test2/expected-results/testPure1.rng
@@ -107,7 +107,9 @@
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(target end) points to the end of the span to which the note is attached, if the note is not embedded in the text at that point.</a:documentation>
             <list>
                <oneOrMore>
-                  <data type="anyURI"/>
+                  <data type="anyURI">
+                     <param name="pattern">\S+</param>
+                  </data>
                </oneOrMore>
             </list>
          </attribute>
@@ -122,7 +124,9 @@
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates the person, or group of people, to whom the element content is ascribed.</a:documentation>
             <list>
                <oneOrMore>
-                  <data type="anyURI"/>
+                  <data type="anyURI">
+                     <param name="pattern">\S+</param>
+                  </data>
                </oneOrMore>
             </list>
          </attribute>
@@ -138,7 +142,9 @@
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates the person, or group of people, to whom a speech act or action is directed.</a:documentation>
             <list>
                <oneOrMore>
-                  <data type="anyURI"/>
+                  <data type="anyURI">
+                     <param name="pattern">\S+</param>
+                  </data>
                </oneOrMore>
             </list>
          </attribute>
@@ -162,7 +168,9 @@
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(reference) provides an explicit means of locating a full definition or identity for the entity being named by means of one or more URIs.</a:documentation>
             <list>
                <oneOrMore>
-                  <data type="anyURI"/>
+                  <data type="anyURI">
+                     <param name="pattern">\S+</param>
+                  </data>
                </oneOrMore>
             </list>
          </attribute>
@@ -327,7 +335,9 @@ Sample values include: 1] all; 2] most; 3] range</a:documentation>
       <optional>
          <attribute name="hand">
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">points to a <code xmlns="http://www.w3.org/1999/xhtml"><handNote></code> element describing the hand considered responsible for the content of the element concerned.</a:documentation>
-            <data type="anyURI"/>
+            <data type="anyURI">
+               <param name="pattern">\S+</param>
+            </data>
          </attribute>
       </optional>
    </define>
@@ -488,7 +498,9 @@ Sample values include: 1] all; 2] most; 3] range</a:documentation>
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates one or more systems or calendars to which the date represented by the content of this element belongs.</a:documentation>
             <list>
                <oneOrMore>
-                  <data type="anyURI"/>
+                  <data type="anyURI">
+                     <param name="pattern">\S+</param>
+                  </data>
                </oneOrMore>
             </list>
          </attribute>
@@ -512,7 +524,9 @@ Sample values include: 1] all; 2] most; 3] range</a:documentation>
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">supplies pointers to one or more definitions of named periods of time (typically <code xmlns="http://www.w3.org/1999/xhtml"><category></code>s or <code xmlns="http://www.w3.org/1999/xhtml"><calendar></code>s) within which the datable item is understood to have occurred.</a:documentation>
             <list>
                <oneOrMore>
-                  <data type="anyURI"/>
+                  <data type="anyURI">
+                     <param name="pattern">\S+</param>
+                  </data>
                </oneOrMore>
             </list>
          </attribute>
@@ -528,7 +542,9 @@ Sample values include: 1] all; 2] most; 3] range</a:documentation>
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains a PID (persistent identifier) that aligns the given element with the appropriate Data Category (or categories) in ISOcat.</a:documentation>
             <list>
                <oneOrMore>
-                  <data type="anyURI"/>
+                  <data type="anyURI">
+                     <param name="pattern">\S+</param>
+                  </data>
                </oneOrMore>
             </list>
          </attribute>
@@ -540,7 +556,9 @@ Sample values include: 1] all; 2] most; 3] range</a:documentation>
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">contains a PID (persistent identifier) that aligns the content of the given element or the value of the given attribute with the appropriate simple Data Category (or categories) in ISOcat.</a:documentation>
             <list>
                <oneOrMore>
-                  <data type="anyURI"/>
+                  <data type="anyURI">
+                     <param name="pattern">\S+</param>
+                  </data>
                </oneOrMore>
             </list>
          </attribute>
@@ -570,10 +588,12 @@ Sample values include: 1] all; 2] most; 3] range</a:documentation>
    <define name="t_att.declaring.attribute.decls">
       <optional>
          <attribute name="decls">
-            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">identifies one or more declarable elements within the header, which are understood to apply to the element bearing this attribute and its content.</a:documentation>
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(declarations) identifies one or more declarable elements within the header, which are understood to apply to the element bearing this attribute and its content.</a:documentation>
             <list>
                <oneOrMore>
-                  <data type="anyURI"/>
+                  <data type="anyURI">
+                     <param name="pattern">\S+</param>
+                  </data>
                </oneOrMore>
             </list>
          </attribute>
@@ -690,7 +710,9 @@ Sample values include: 1] approved; 2] candidate; 3] cleared; 4] deprecated; 5]
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(responsible party) indicates the agency responsible for the intervention or interpretation, for example an editor or transcriber.</a:documentation>
             <list>
                <oneOrMore>
-                  <data type="anyURI"/>
+                  <data type="anyURI">
+                     <param name="pattern">\S+</param>
+                  </data>
                </oneOrMore>
             </list>
          </attribute>
@@ -774,7 +796,9 @@ Suggested values include: 1] internal; 2] external; 3] conjecture</a:documentati
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">points to a description of the rendering or presentation used for this element in the source text.</a:documentation>
             <list>
                <oneOrMore>
-                  <data type="anyURI"/>
+                  <data type="anyURI">
+                     <param name="pattern">\S+</param>
+                  </data>
                </oneOrMore>
             </list>
          </attribute>
@@ -789,12 +813,29 @@ Suggested values include: 1] internal; 2] external; 3] conjecture</a:documentati
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the source from which some aspect of this element is drawn.</a:documentation>
             <list>
                <oneOrMore>
-                  <data type="anyURI"/>
+                  <data type="anyURI">
+                     <param name="pattern">\S+</param>
+                  </data>
                </oneOrMore>
             </list>
          </attribute>
       </optional>
    </define>
+   <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
+            id="testPure1-att.global.source-source-only_1_ODD_source-constraint-rule-5">
+      <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
+                xmlns:rng="http://relaxng.org/ns/structure/1.0"
+                xmlns:sch="http://purl.oclc.org/dsdl/schematron"
+                xmlns:xi="http://www.w3.org/2001/XInclude"
+                context="tei:*/@source">
+         <sch:let name="srcs" value="tokenize( normalize-space(.),' ')"/>
+         <sch:report test="( parent::tei:classRef                               | parent::tei:dataRef                               | parent::tei:elementRef                               | parent::tei:macroRef                               | parent::tei:moduleRef                               | parent::tei:schemaSpec )                               and                               $srcs[2]">
+              When used on a schema description element (like
+              <sch:value-of select="name(..)"/>), the @source attribute
+              should have only 1 value. (This one has <sch:value-of select="count($srcs)"/>.)
+            </sch:report>
+      </sch:rule>
+   </pattern>
    <define name="t_att.global.attributes">
       <ref name="t_att.global.rendition.attributes"/>
       <ref name="t_att.global.linking.attributes"/>
@@ -842,7 +883,9 @@ Suggested values include: 1] internal; 2] external; 3] conjecture</a:documentati
       <optional>
          <attribute name="xml:base">
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">provides a base URI reference with which applications can resolve relative URI references into absolute URI references.</a:documentation>
-            <data type="anyURI"/>
+            <data type="anyURI">
+               <param name="pattern">\S+</param>
+            </data>
          </attribute>
       </optional>
    </define>
@@ -873,7 +916,9 @@ Suggested values include: 1] internal; 2] external; 3] conjecture</a:documentati
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">points to a full description of the scribe concerned, typically supplied by a <code xmlns="http://www.w3.org/1999/xhtml"><person></code> element elsewhere in the description.</a:documentation>
             <list>
                <oneOrMore>
-                  <data type="anyURI"/>
+                  <data type="anyURI">
+                     <param name="pattern">\S+</param>
+                  </data>
                </oneOrMore>
             </list>
          </attribute>
@@ -897,7 +942,9 @@ Suggested values include: 1] internal; 2] external; 3] conjecture</a:documentati
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">points to a full description of the script or writing style used by this hand, typically supplied by a <code xmlns="http://www.w3.org/1999/xhtml"><scriptNote></code> element elsewhere in the description.</a:documentation>
             <list>
                <oneOrMore>
-                  <data type="anyURI"/>
+                  <data type="anyURI">
+                     <param name="pattern">\S+</param>
+                  </data>
                </oneOrMore>
             </list>
          </attribute>
@@ -995,16 +1042,46 @@ Suggested values include: 1] internal; 2] external; 3] conjecture</a:documentati
    <define name="t_att.resourced.attribute.url">
       <attribute name="url">
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(uniform resource locator) specifies the URL from which the media concerned may be obtained.</a:documentation>
-         <data type="anyURI"/>
+         <data type="anyURI">
+            <param name="pattern">\S+</param>
+         </data>
       </attribute>
    </define>
+   <define name="t_att.interpLike.attributes">
+      <ref name="t_att.interpLike.attribute.type"/>
+      <ref name="t_att.interpLike.attribute.subtype"/>
+      <ref name="t_att.interpLike.attribute.inst"/>
+   </define>
+   <define name="t_att.interpLike.attribute.type">
+      <optional>
+         <attribute name="type">
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates what kind of phenomenon is being noted in the passage.
+Sample values include: 1] image; 2] character; 3] theme; 4] allusion</a:documentation>
+            <data type="token">
+               <param name="pattern">[^\p{C}\p{Z}]+</param>
+            </data>
+         </attribute>
+      </optional>
+   </define>
+   <define name="t_att.interpLike.attribute.subtype">
+      <optional>
+         <attribute name="subtype">
+            <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(subtype) provides a sub-categorization of the phenomenon is being noted in the passage, if needed</a:documentation>
+            <data type="token">
+               <param name="pattern">[^\p{C}\p{Z}]+</param>
+            </data>
+         </attribute>
+      </optional>
+   </define>
    <define name="t_att.interpLike.attribute.inst">
       <optional>
          <attribute name="inst">
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(instances) points to instances of the analysis or interpretation represented by the current element.</a:documentation>
             <list>
                <oneOrMore>
-                  <data type="anyURI"/>
+                  <data type="anyURI">
+                     <param name="pattern">\S+</param>
+                  </data>
                </oneOrMore>
             </list>
          </attribute>
@@ -1071,7 +1148,9 @@ Suggested values include: 1] m (metre); 2] kg (kilogram); 3] s (second); 4] Hz (
       <optional>
          <attribute name="unitRef">
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">points to a unique identifier stored in the <code xmlns="http://www.w3.org/1999/xhtml">@xml:id</code> of a <code xmlns="http://www.w3.org/1999/xhtml"><unitDef></code> element that defines a unit of measure.</a:documentation>
-            <data type="anyURI"/>
+            <data type="anyURI">
+               <param name="pattern">\S+</param>
+            </data>
          </attribute>
       </optional>
    </define>
@@ -1104,7 +1183,7 @@ Suggested values include: 1] m (metre); 2] kg (kilogram); 3] s (second); 4] Hz (
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="testPure1-att.measurement-att-measurement-unitRef-constraint-rule-5">
+            id="testPure1-att.measurement-att-measurement-unitRef-constraint-rule-6">
       <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
                 xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -1138,7 +1217,9 @@ Suggested values include: 1] m (metre); 2] kg (kilogram); 3] s (second); 4] Hz (
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(reference to the canonical name) provides a means of locating the canonical form (nym) of the names associated with the object named by the element bearing it.</a:documentation>
             <list>
                <oneOrMore>
-                  <data type="anyURI"/>
+                  <data type="anyURI">
+                     <param name="pattern">\S+</param>
+                  </data>
                </oneOrMore>
             </list>
          </attribute>
@@ -1215,7 +1296,7 @@ Suggested values include: 1] top; 2] bottom; 3] margin; 4] opposite; 5] overleaf
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="testPure1-att.typed-subtypeTyped-constraint-rule-6">
+            id="testPure1-att.typed-subtypeTyped-constraint-rule-7">
       <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
                 xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -1245,7 +1326,7 @@ Suggested values include: 1] top; 2] bottom; 3] margin; 4] opposite; 5] overleaf
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="testPure1-att.pointing-targetLang-targetLang-constraint-rule-7">
+            id="testPure1-att.pointing-targetLang-targetLang-constraint-rule-8">
       <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
                 xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -1260,7 +1341,9 @@ Suggested values include: 1] top; 2] bottom; 3] margin; 4] opposite; 5] overleaf
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the destination of the reference by supplying one or more URI References</a:documentation>
             <list>
                <oneOrMore>
-                  <data type="anyURI"/>
+                  <data type="anyURI">
+                     <param name="pattern">\S+</param>
+                  </data>
                </oneOrMore>
             </list>
          </attribute>
@@ -1292,10 +1375,16 @@ Suggested values include: 1] top; 2] bottom; 3] margin; 4] opposite; 5] overleaf
          <attribute name="domains">
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">optionally specifies the identifiers of the elements within which all elements indicated by the contents of this element lie.</a:documentation>
             <list>
-               <data type="anyURI"/>
-               <data type="anyURI"/>
+               <data type="anyURI">
+                  <param name="pattern">\S+</param>
+               </data>
+               <data type="anyURI">
+                  <param name="pattern">\S+</param>
+               </data>
                <zeroOrMore>
-                  <data type="anyURI"/>
+                  <data type="anyURI">
+                     <param name="pattern">\S+</param>
+                  </data>
                </zeroOrMore>
             </list>
          </attribute>
@@ -1373,7 +1462,9 @@ Suggested values include: 1] top; 2] bottom; 3] margin; 4] opposite; 5] overleaf
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(edition reference) provides a pointer to the source edition in which the associated feature (for example, a page, column, or line break) occurs at this point in the text.</a:documentation>
             <list>
                <oneOrMore>
-                  <data type="anyURI"/>
+                  <data type="anyURI">
+                     <param name="pattern">\S+</param>
+                  </data>
                </oneOrMore>
             </list>
          </attribute>
@@ -1386,12 +1477,14 @@ Suggested values include: 1] top; 2] bottom; 3] margin; 4] opposite; 5] overleaf
       <optional>
          <attribute name="spanTo">
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates the end of a span initiated by the element bearing this attribute.</a:documentation>
-            <data type="anyURI"/>
+            <data type="anyURI">
+               <param name="pattern">\S+</param>
+            </data>
          </attribute>
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="testPure1-att.spanning-spanTo-spanTo-points-to-following-constraint-rule-8">
+            id="testPure1-att.spanning-spanTo-spanTo-points-to-following-constraint-rule-9">
       <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
                 xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -1434,7 +1527,7 @@ The element indicated by @spanTo (<sch:value-of select="@spanTo"/>) must follow
       </optional>
    </define>
    <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-            id="testPure1-att.styleDef-schemeVersion-schemeVersionRequiresScheme-constraint-rule-9">
+            id="testPure1-att.styleDef-schemeVersion-schemeVersionRequiresScheme-constraint-rule-10">
       <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                 xmlns:rng="http://relaxng.org/ns/structure/1.0"
                 xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -1453,7 +1546,9 @@ The element indicated by @spanTo (<sch:value-of select="@spanTo"/>) must follow
       <optional>
          <attribute name="start">
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates the location within a temporal alignment at which this element begins.</a:documentation>
-            <data type="anyURI"/>
+            <data type="anyURI">
+               <param name="pattern">\S+</param>
+            </data>
          </attribute>
       </optional>
    </define>
@@ -1461,7 +1556,9 @@ The element indicated by @spanTo (<sch:value-of select="@spanTo"/>) must follow
       <optional>
          <attribute name="end">
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates the location within a temporal alignment at which this element ends.</a:documentation>
-            <data type="anyURI"/>
+            <data type="anyURI">
+               <param name="pattern">\S+</param>
+            </data>
          </attribute>
       </optional>
    </define>
@@ -3018,7 +3115,9 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates one or more locations by pointing to a <code xmlns="http://www.w3.org/1999/xhtml"><place></code> element or other canonical description.</a:documentation>
             <list>
                <oneOrMore>
-                  <data type="anyURI"/>
+                  <data type="anyURI">
+                     <param name="pattern">\S+</param>
+                  </data>
                </oneOrMore>
             </list>
          </attribute>
@@ -3136,7 +3235,7 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(paragraph) marks paragraphs in prose. [3.1. Paragraphs 7.2.5. Speech Contents]</a:documentation>
          <ref name="t_macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="testPure1-p-abstractModel-structure-p-in-ab-or-p-constraint-report-5">
+                  id="testPure1-p-abstractModel-structure-p-in-ab-or-p-constraint-report-6">
             <rule context="tei:p">
                <sch:report xmlns="http://www.tei-c.org/ns/1.0"
                            xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -3147,7 +3246,7 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="testPure1-p-abstractModel-structure-p-in-l-or-lg-constraint-report-6">
+                  id="testPure1-p-abstractModel-structure-p-in-l-or-lg-constraint-report-7">
             <rule context="tei:p">
                <sch:report xmlns="http://www.tei-c.org/ns/1.0"
                            xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -3352,7 +3451,7 @@ Suggested values include: 1] spoken (spoken); 2] thought (thought); 3] written (
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(description) contains a short description of the purpose, function, or use of its parent element, or when the parent is a documentation element, describes or defines the object being documented.  [22.4.1. Description of Components]</a:documentation>
          <ref name="t_macro.limitedContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="testPure1-desc-deprecationInfo-only-in-deprecated-constraint-rule-10">
+                  id="testPure1-desc-deprecationInfo-only-in-deprecated-constraint-rule-11">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:rng="http://relaxng.org/ns/structure/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -3442,11 +3541,13 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
          <optional>
             <attribute name="target">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">supplies a pointer to the base being glossed by this ruby text.</a:documentation>
-               <data type="anyURI"/>
+               <data type="anyURI">
+                  <param name="pattern">\S+</param>
+               </data>
             </attribute>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="testPure1-rt-target-rt-target-not-span-constraint-report-7">
+                  id="testPure1-rt-target-rt-target-not-span-constraint-report-8">
             <rule context="tei:rt/@target">
                <sch:report xmlns="http://www.tei-c.org/ns/1.0"
                            xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -3458,7 +3559,9 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
          <optional>
             <attribute name="from">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">points to the starting point of the span of text being glossed by this ruby text.</a:documentation>
-               <data type="anyURI"/>
+               <data type="anyURI">
+                  <param name="pattern">\S+</param>
+               </data>
             </attribute>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
@@ -3474,7 +3577,9 @@ Suggested values include: 1] deprecationInfo (deprecation information)</a:docume
          <optional>
             <attribute name="to">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">points to the ending point of the span of text being glossed.</a:documentation>
-               <data type="anyURI"/>
+               <data type="anyURI">
+                  <param name="pattern">\S+</param>
+               </data>
             </attribute>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
@@ -3955,7 +4060,7 @@ Sample values include: 1] suspension (suspension); 2] contraction (contraction);
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(pointer) defines a pointer to another location. [3.7. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <empty/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="testPure1-ptr-ptrAtts-constraint-report-8">
+                  id="testPure1-ptr-ptrAtts-constraint-report-9">
             <rule context="tei:ptr">
                <report xmlns:rng="http://relaxng.org/ns/structure/1.0"
                        xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -3977,7 +4082,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(reference) defines a reference to another location, possibly modified by additional text or comment. [3.7. Simple Links and Cross-References 16.1. Links]</a:documentation>
          <ref name="t_macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="testPure1-ref-refAtts-constraint-report-9">
+                  id="testPure1-ref-refAtts-constraint-report-10">
             <rule context="tei:ref">
                <report xmlns:rng="http://relaxng.org/ns/structure/1.0"
                        xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -4048,7 +4153,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
             </zeroOrMore>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="testPure1-list-gloss-list-must-have-labels-constraint-rule-11">
+                  id="testPure1-list-gloss-list-must-have-labels-constraint-rule-12">
             <sch:rule xmlns="http://www.tei-c.org/ns/1.0"
                       xmlns:rng="http://relaxng.org/ns/structure/1.0"
                       xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -4213,6 +4318,7 @@ attributes @target and @cRef may be supplied on <name/>.</report>
          <ref name="t_att.media.attributes"/>
          <ref name="t_att.resourced.attributes"/>
          <ref name="t_att.declaring.attributes"/>
+         <ref name="t_att.typed.attributes"/>
          <empty/>
       </element>
    </define>
@@ -4589,7 +4695,7 @@ Elements]</a:documentation>
             </choice>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="testPure1-relatedItem-targetorcontent1-constraint-report-10">
+                  id="testPure1-relatedItem-targetorcontent1-constraint-report-11">
             <rule context="tei:relatedItem">
                <sch:report xmlns="http://www.tei-c.org/ns/1.0"
                            xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -4609,7 +4715,9 @@ relatedItem element must be empty</sch:report>
          <optional>
             <attribute name="target">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">points to the related bibliographic element by means of an absolute or relative URI reference</a:documentation>
-               <data type="anyURI"/>
+               <data type="anyURI">
+                  <param name="pattern">\S+</param>
+               </data>
             </attribute>
          </optional>
          <empty/>
@@ -4628,7 +4736,7 @@ relatedItem element must be empty</sch:report>
             </choice>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="testPure1-l-abstractModel-structure-l-in-l-constraint-report-11">
+                  id="testPure1-l-abstractModel-structure-l-in-l-constraint-report-12">
             <rule context="tei:l">
                <sch:report xmlns="http://www.tei-c.org/ns/1.0"
                            xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -4688,7 +4796,7 @@ relatedItem element must be empty</sch:report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="testPure1-lg-abstractModel-structure-lg-in-l-constraint-report-12">
+                  id="testPure1-lg-abstractModel-structure-lg-in-l-constraint-report-13">
             <rule context="tei:lg">
                <sch:report xmlns="http://www.tei-c.org/ns/1.0"
                            xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -4759,6 +4867,7 @@ relatedItem element must be empty</sch:report>
          <ref name="t_att.ascribed.directed.attributes"/>
          <ref name="t_att.global.attributes"/>
          <ref name="t_att.placement.attributes"/>
+         <ref name="t_att.written.attributes"/>
          <optional>
             <attribute name="type">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates the kind of stage direction.
@@ -5379,7 +5488,7 @@ Suggested values include: 1] ISBN; 2] ISSN; 3] DOI; 4] URI; 5] VIAF; 6] ESTC; 7]
             <ref name="t_model.pLike"/>
          </zeroOrMore>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="testPure1-quotation-quotationContents-constraint-report-13">
+                  id="testPure1-quotation-quotationContents-constraint-report-14">
             <rule context="tei:quotation">
                <report xmlns:rng="http://relaxng.org/ns/structure/1.0"
                        xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -5556,7 +5665,9 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
          <ref name="t_att.global.attributes"/>
          <attribute name="name">
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the full formal name of the namespace concerned.</a:documentation>
-            <data type="anyURI"/>
+            <data type="anyURI">
+               <param name="pattern">\S*</param>
+            </data>
          </attribute>
          <empty/>
       </element>
@@ -5644,7 +5755,7 @@ Sample values include: 1] first-line; 2] first-letter; 3] before; 4] after</a:do
             </attribute>
          </optional>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="testPure1-citeStructure-delim-citestructure-inner-delim-constraint-rule-12">
+                  id="testPure1-citeStructure-delim-citestructure-inner-delim-constraint-rule-13">
             <rule xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                   xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -5657,7 +5768,7 @@ Sample values include: 1] first-line; 2] first-letter; 3] before; 4] after</a:do
             <text/>
          </attribute>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="testPure1-citeStructure-match-citestructure-outer-match-constraint-rule-13">
+                  id="testPure1-citeStructure-match-citestructure-outer-match-constraint-rule-14">
             <rule xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                   xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -5666,7 +5777,7 @@ Sample values include: 1] first-line; 2] first-letter; 3] before; 4] after</a:do
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="testPure1-citeStructure-match-citestructure-inner-match-constraint-rule-14">
+                  id="testPure1-citeStructure-match-citestructure-inner-match-constraint-rule-15">
             <rule xmlns:rng="http://relaxng.org/ns/structure/1.0"
                   xmlns:sch="http://purl.oclc.org/dsdl/schematron"
                   xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -5694,7 +5805,9 @@ Sample values include: 1] book; 2] chapter; 3] entry; 4] poem; 5] letter; 6] lin
          <ref name="t_att.citeStructurePart.attributes"/>
          <attribute name="property">
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(property) A URI indicating a property definition.</a:documentation>
-            <data type="anyURI"/>
+            <data type="anyURI">
+               <param name="pattern">\S+</param>
+            </data>
          </attribute>
          <empty/>
       </element>
@@ -5931,11 +6044,15 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
          <ref name="t_att.locatable.attributes"/>
          <attribute name="fromUnit">
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates a source unit of measure that is to be converted into another unit indicated in <code xmlns="http://www.w3.org/1999/xhtml">@toUnit</code>.</a:documentation>
-            <data type="anyURI"/>
+            <data type="anyURI">
+               <param name="pattern">\S+</param>
+            </data>
          </attribute>
          <attribute name="toUnit">
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">the target unit of measurement for a conversion from a source unit referenced in <code xmlns="http://www.w3.org/1999/xhtml">@fromUnit</code>.</a:documentation>
-            <data type="anyURI"/>
+            <data type="anyURI">
+               <param name="pattern">\S+</param>
+            </data>
          </attribute>
          <empty/>
       </element>
@@ -6089,7 +6206,9 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
          <optional>
             <attribute name="scheme">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">identifies the controlled vocabulary within which the set of keywords concerned is defined, for example by a <code xmlns="http://www.w3.org/1999/xhtml"><taxonomy></code> element, or by some other resource.</a:documentation>
-               <data type="anyURI"/>
+               <data type="anyURI">
+                  <param name="pattern">\S+</param>
+               </data>
             </attribute>
          </optional>
          <empty/>
@@ -6102,7 +6221,9 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
          <ref name="t_att.global.attributes"/>
          <attribute name="scheme">
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">identifies the classification system in use, as defined by, e.g. a <code xmlns="http://www.w3.org/1999/xhtml"><taxonomy></code> element, or some other resource.</a:documentation>
-            <data type="anyURI"/>
+            <data type="anyURI">
+               <param name="pattern">\S+</param>
+            </data>
          </attribute>
          <empty/>
       </element>
@@ -6116,7 +6237,9 @@ Suggested values include: 1] WGS84 (World Geodetic System); 2] MGRS (Military Gr
          <optional>
             <attribute name="scheme">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">identifies the classification scheme within which the set of categories concerned is defined, for example by a <code xmlns="http://www.w3.org/1999/xhtml"><taxonomy></code> element, or by some other resource.</a:documentation>
-               <data type="anyURI"/>
+               <data type="anyURI">
+                  <param name="pattern">\S+</param>
+               </data>
             </attribute>
          </optional>
          <empty/>
@@ -6251,7 +6374,9 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(target) points to one or more elements that belong to this change.</a:documentation>
                <list>
                   <oneOrMore>
-                     <data type="anyURI"/>
+                     <data type="anyURI">
+                        <param name="pattern">\S+</param>
+                     </data>
                   </oneOrMore>
                </list>
             </attribute>
@@ -6327,7 +6452,9 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
       <optional>
          <attribute name="lemmaRef">
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">provides a pointer to a definition of the lemma for the word, for example in an online lexicon.</a:documentation>
-            <data type="anyURI"/>
+            <data type="anyURI">
+               <param name="pattern">\S+</param>
+            </data>
          </attribute>
       </optional>
    </define>
@@ -6377,7 +6504,9 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(analysis) indicates one or more elements containing interpretations of the element on which the <code xmlns="http://www.w3.org/1999/xhtml">@ana</code> attribute appears.</a:documentation>
             <list>
                <oneOrMore>
-                  <data type="anyURI"/>
+                  <data type="anyURI">
+                     <param name="pattern">\S+</param>
+                  </data>
                </oneOrMore>
             </list>
          </attribute>
@@ -6388,7 +6517,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(s-unit) contains a sentence-like division of a text. [17.1. Linguistic Segment Categories 8.4.1. Segmentation]</a:documentation>
          <ref name="t_macro.phraseSeq"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="testPure1-s-noNestedS-constraint-report-14">
+                  id="testPure1-s-noNestedS-constraint-report-15">
             <rule context="tei:s">
                <report xmlns:rng="http://relaxng.org/ns/structure/1.0"
                        xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -6469,7 +6598,9 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(analysis) indicates one or more elements containing interpretations of the element on which the <code xmlns="http://www.w3.org/1999/xhtml">@ana</code> attribute appears.</a:documentation>
             <list>
                <oneOrMore>
-                  <data type="anyURI"/>
+                  <data type="anyURI">
+                     <param name="pattern">\S+</param>
+                  </data>
                </oneOrMore>
             </list>
          </attribute>
@@ -6566,7 +6697,7 @@ Suggested values include: 1] sent; 2] received; 3] transmitted; 4] redirected; 5
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">associates an interpretative annotation directly with a span of text. [17.3. Spans and Interpretations]</a:documentation>
          <ref name="t_macro.phraseSeq.limited"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="testPure1-span-targetfrom-constraint-report-15">
+                  id="testPure1-span-targetfrom-constraint-report-16">
             <rule context="tei:span">
                <report xmlns:rng="http://relaxng.org/ns/structure/1.0"
                        xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -6577,7 +6708,7 @@ Only one of the attributes @target and @from may be supplied on <name/>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="testPure1-span-targetto-constraint-report-16">
+                  id="testPure1-span-targetto-constraint-report-17">
             <rule context="tei:span">
                <report xmlns:rng="http://relaxng.org/ns/structure/1.0"
                        xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -6588,7 +6719,7 @@ Only one of the attributes @target and @to may be supplied on <name/>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="testPure1-span-tonotfrom-constraint-report-17">
+                  id="testPure1-span-tonotfrom-constraint-report-18">
             <rule context="tei:span">
                <report xmlns:rng="http://relaxng.org/ns/structure/1.0"
                        xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -6598,7 +6729,7 @@ If @to is supplied on <name/>, @from must be supplied as well</report>
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="testPure1-span-tofrom-constraint-report-18">
+                  id="testPure1-span-tofrom-constraint-report-19">
             <rule context="tei:span">
                <report xmlns:rng="http://relaxng.org/ns/structure/1.0"
                        xmlns:sch="http://purl.oclc.org/dsdl/schematron"
@@ -6608,27 +6739,22 @@ The attributes @to and @from on <name/> may each contain only a single value</re
             </rule>
          </pattern>
          <ref name="t_att.global.attributes"/>
-         <ref name="t_att.interpLike.attribute.inst"/>
+         <ref name="t_att.interpLike.attributes"/>
          <ref name="t_att.pointing.attributes"/>
-         <optional>
-            <attribute name="type">
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates what kind of phenomenon is being noted in the passage.
-Sample values include: 1] image; 2] character; 3] theme; 4] allusion</a:documentation>
-               <data type="token">
-                  <param name="pattern">[^\p{C}\p{Z}]+</param>
-               </data>
-            </attribute>
-         </optional>
          <optional>
             <attribute name="from">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">gives the identifier of the node which is the starting point of the span of text being annotated; if not accompanied by a <code xmlns="http://www.w3.org/1999/xhtml">@to</code> attribute, gives the identifier of the node of the entire span of text being annotated.</a:documentation>
-               <data type="anyURI"/>
+               <data type="anyURI">
+                  <param name="pattern">\S+</param>
+               </data>
             </attribute>
          </optional>
          <optional>
             <attribute name="to">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">gives the identifier of the node which is the end-point of the span of text being annotated.</a:documentation>
-               <data type="anyURI"/>
+               <data type="anyURI">
+                  <param name="pattern">\S+</param>
+               </data>
             </attribute>
          </optional>
          <empty/>
@@ -6646,16 +6772,7 @@ Sample values include: 1] image; 2] character; 3] theme; 4] allusion</a:document
             </zeroOrMore>
          </group>
          <ref name="t_att.global.attributes"/>
-         <ref name="t_att.interpLike.attribute.inst"/>
-         <optional>
-            <attribute name="type">
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates what kind of phenomenon is being noted in the passage.
-Sample values include: 1] image; 2] character; 3] theme; 4] allusion</a:documentation>
-               <data type="token">
-                  <param name="pattern">[^\p{C}\p{Z}]+</param>
-               </data>
-            </attribute>
-         </optional>
+         <ref name="t_att.interpLike.attributes"/>
          <empty/>
       </element>
    </define>
@@ -6671,16 +6788,7 @@ Sample values include: 1] image; 2] character; 3] theme; 4] allusion</a:document
             </choice>
          </zeroOrMore>
          <ref name="t_att.global.attributes"/>
-         <ref name="t_att.interpLike.attribute.inst"/>
-         <optional>
-            <attribute name="type">
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates what kind of phenomenon is being noted in the passage.
-Sample values include: 1] image; 2] character; 3] theme; 4] allusion</a:documentation>
-               <data type="token">
-                  <param name="pattern">[^\p{C}\p{Z}]+</param>
-               </data>
-            </attribute>
-         </optional>
+         <ref name="t_att.interpLike.attributes"/>
          <empty/>
       </element>
    </define>
@@ -6696,16 +6804,7 @@ Sample values include: 1] image; 2] character; 3] theme; 4] allusion</a:document
             </oneOrMore>
          </group>
          <ref name="t_att.global.attributes"/>
-         <ref name="t_att.interpLike.attribute.inst"/>
-         <optional>
-            <attribute name="type">
-               <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">indicates what kind of phenomenon is being noted in the passage.
-Sample values include: 1] image; 2] character; 3] theme; 4] allusion</a:documentation>
-               <data type="token">
-                  <param name="pattern">[^\p{C}\p{Z}]+</param>
-               </data>
-            </attribute>
-         </optional>
+         <ref name="t_att.interpLike.attributes"/>
          <empty/>
       </element>
    </define>
@@ -6724,7 +6823,9 @@ Sample values include: 1] image; 2] character; 3] theme; 4] allusion</a:document
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(corresponds) points to elements that correspond to the current element in some way.</a:documentation>
             <list>
                <oneOrMore>
-                  <data type="anyURI"/>
+                  <data type="anyURI">
+                     <param name="pattern">\S+</param>
+                  </data>
                </oneOrMore>
             </list>
          </attribute>
@@ -6734,7 +6835,9 @@ Sample values include: 1] image; 2] character; 3] theme; 4] allusion</a:document
       <optional>
          <attribute name="sameAs">
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">points to an element that is the same as the current element.</a:documentation>
-            <data type="anyURI"/>
+            <data type="anyURI">
+               <param name="pattern">\S+</param>
+            </data>
          </attribute>
       </optional>
    </define>
@@ -6742,7 +6845,9 @@ Sample values include: 1] image; 2] character; 3] theme; 4] allusion</a:document
       <optional>
          <attribute name="copyOf">
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">points to an element of which the current element is a copy.</a:documentation>
-            <data type="anyURI"/>
+            <data type="anyURI">
+               <param name="pattern">\S+</param>
+            </data>
          </attribute>
       </optional>
    </define>
@@ -6750,7 +6855,9 @@ Sample values include: 1] image; 2] character; 3] theme; 4] allusion</a:document
       <optional>
          <attribute name="next">
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">points to the next element of a virtual aggregate of which the current element is part.</a:documentation>
-            <data type="anyURI"/>
+            <data type="anyURI">
+               <param name="pattern">\S+</param>
+            </data>
          </attribute>
       </optional>
    </define>
@@ -6758,7 +6865,9 @@ Sample values include: 1] image; 2] character; 3] theme; 4] allusion</a:document
       <optional>
          <attribute name="prev">
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(previous) points to the previous element of a virtual aggregate of which the current element is part.</a:documentation>
-            <data type="anyURI"/>
+            <data type="anyURI">
+               <param name="pattern">\S+</param>
+            </data>
          </attribute>
       </optional>
    </define>
@@ -6768,7 +6877,9 @@ Sample values include: 1] image; 2] character; 3] theme; 4] allusion</a:document
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">points to elements that are in exclusive alternation with the current element.</a:documentation>
             <list>
                <oneOrMore>
-                  <data type="anyURI"/>
+                  <data type="anyURI">
+                     <param name="pattern">\S+</param>
+                  </data>
                </oneOrMore>
             </list>
          </attribute>
@@ -6780,7 +6891,9 @@ Sample values include: 1] image; 2] character; 3] theme; 4] allusion</a:document
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">selects one or more alternants; if one alternant is selected, the ambiguity or uncertainty is marked as resolved. If more than one alternant is selected, the degree of ambiguity or uncertainty is marked as reduced by the number of alternants not selected.</a:documentation>
             <list>
                <oneOrMore>
-                  <data type="anyURI"/>
+                  <data type="anyURI">
+                     <param name="pattern">\S+</param>
+                  </data>
                </oneOrMore>
             </list>
          </attribute>
@@ -6822,7 +6935,7 @@ Sample values include: 1] image; 2] character; 3] theme; 4] allusion</a:document
             </oneOrMore>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="testPure1-linkGrp-eight_is_enough-constraint-report-19">
+                  id="testPure1-linkGrp-eight_is_enough-constraint-report-20">
             <rule context="tei:linkGrp">
                <sch:report xmlns="http://www.tei-c.org/ns/1.0"
                            xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -6841,7 +6954,7 @@ Sample values include: 1] image; 2] character; 3] theme; 4] allusion</a:document
          <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(anonymous block) 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. [16.3. Blocks, Segments, and Anchors]</a:documentation>
          <ref name="t_macro.paraContent"/>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="testPure1-ab-abstractModel-structure-ab-in-ab-or-p-constraint-report-20">
+                  id="testPure1-ab-abstractModel-structure-ab-in-ab-or-p-constraint-report-21">
             <rule context="tei:ab">
                <sch:report xmlns="http://www.tei-c.org/ns/1.0"
                            xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -6853,7 +6966,7 @@ Sample values include: 1] image; 2] character; 3] theme; 4] allusion</a:document
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="testPure1-ab-abstractModel-structure-ab-in-l-or-lg-constraint-report-21">
+                  id="testPure1-ab-abstractModel-structure-ab-in-l-or-lg-constraint-report-22">
             <rule context="tei:ab">
                <sch:report xmlns="http://www.tei-c.org/ns/1.0"
                            xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -6953,7 +7066,9 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
          <optional>
             <attribute name="since">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">identifies the reference point for determining the time of the current <code xmlns="http://www.w3.org/1999/xhtml"><when></code> element, which is obtained by adding the interval to the time of the reference point.</a:documentation>
-               <data type="anyURI"/>
+               <data type="anyURI">
+                  <param name="pattern">\S+</param>
+               </data>
             </attribute>
          </optional>
          <empty/>
@@ -6969,7 +7084,9 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
          <optional>
             <attribute name="origin">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">designates the origin of the timeline, i.e. the time at which it begins.</a:documentation>
-               <data type="anyURI"/>
+               <data type="anyURI">
+                  <param name="pattern">\S+</param>
+               </data>
             </attribute>
          </optional>
          <optional>
@@ -7024,10 +7141,16 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
             <attribute name="target">
                <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the destination of the reference by supplying one or more URI References</a:documentation>
                <list>
-                  <data type="anyURI"/>
-                  <data type="anyURI"/>
+                  <data type="anyURI">
+                     <param name="pattern">\S+</param>
+                  </data>
+                  <data type="anyURI">
+                     <param name="pattern">\S+</param>
+                  </data>
                   <zeroOrMore>
-                     <data type="anyURI"/>
+                     <data type="anyURI">
+                        <param name="pattern">\S+</param>
+                     </data>
                   </zeroOrMore>
                </list>
             </attribute>
@@ -7185,7 +7308,9 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
             <a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">specifies the destination of the reference by supplying one or more URI References</a:documentation>
             <list>
                <oneOrMore>
-                  <data type="anyURI"/>
+                  <data type="anyURI">
+                     <param name="pattern">\S+</param>
+                  </data>
                </oneOrMore>
             </list>
          </attribute>
@@ -7549,7 +7674,7 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
             </optional>
          </group>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="testPure1-div-abstractModel-structure-div-in-l-or-lg-constraint-report-22">
+                  id="testPure1-div-abstractModel-structure-div-in-l-or-lg-constraint-report-23">
             <rule context="tei:div">
                <sch:report xmlns="http://www.tei-c.org/ns/1.0"
                            xmlns:rng="http://relaxng.org/ns/structure/1.0"
@@ -7560,7 +7685,7 @@ Suggested values include: 1] d (days); 2] h (hours); 3] min (minutes); 4] s (sec
             </rule>
          </pattern>
          <pattern xmlns="http://purl.oclc.org/dsdl/schematron"
-                  id="testPure1-div-abstractModel-structure-div-in-ab-or-p-constraint-report-23">
+                  id="testPure1-div-abstractModel-structure-div-in-ab-or-p-constraint-report-24">
             <rule context="tei:div">
                <sch:report xmlns="http://www.tei-c.org/ns/1.0"
                            xmlns:rng="http://relaxng.org/ns/structure/1.0"
diff --git a/source/p5subset.xml b/source/p5subset.xml
index a91d3a791..b37f1c4fa 100644
--- a/source/p5subset.xml
+++ b/source/p5subset.xml
@@ -6,8 +6,8 @@
         <title>The TEI Guidelines
       
       
-        Version 4.4.0a. Last updated on
-        14th March 2022, revision 3a89ab0a0
+        Version 4.5.0a. Last updated on
+        1st June 2022, revision aeba95253
       
       
         TEI Consortium
@@ -1480,7 +1480,7 @@ of any adjacent whitespace
     
   
 
-
+
   provides attributes for those elements in the TEI header which
   may be independently selected by means of  the special purpose decls attribute.
   특별한 목적의 decls 속성을 통해서 독립적으로 선택될 수 있는 TEI 헤더의 요소에 대한 속성을 제공한다.
@@ -1560,7 +1560,7 @@ il est sélectionné si son parent a été choisi
     
   
 
-
+
   provides attributes for elements which may be independently associated with a particular declarable element within the header, thus overriding the inherited default for that element.
   헤더에서 선언 가능한 어떤 요소와 독립적으로 연관될 수 있는 속성을 제공한다. 이를 통해 그 요소의 상속된 기본값은 무효가 된다.
   提供元素屬性，這些元素可單獨與標頭中一特定可宣告元素相關連，因此超越該特定元素本身的預設值。
@@ -1573,6 +1573,8 @@ il est sélectionné si son parent a été choisi
   assegna attributi agli elementi che possono essere autonomamente associati a un determinato elemento dichiarato nell'intestazione, non tenendo conto del default ereditato per quell'elemento
   
     
+      declarations
+      déclarations
       identifies one or more declarable elements within the
 header, which are understood to apply to the element bearing this
 attribute and its content.
@@ -1581,7 +1583,7 @@ attribute and its content.
       TEIヘダーにある，1つ以上の宣言可能要素を示す．
       当該属性を持つ要素や内容に適応されると解釈される．
       identifie un ou plusieurséléments
-            déclarables dans l'en-tête TEI, qui sont destinés à s'appliquer à l'élément
+            déclarables dans l'en-tête TEI, qui sont destinés à s'appliquer à l'élément
           portant cet attribut et à son contenu.
       identifica uno o más elementos declarables al interno del encabezado, los cuales son válidos para el elemento al cual es adscrito el atributo en cuestión y su contenido.
       identifica uno o più elementi dichiarabili all'interno dell'intestazione,
@@ -2001,7 +2003,6 @@ associated with a dated element, at the time indicated.
       signifies the degree of certainty associated with the intervention or interpretation.
       간섭 또는 해석과 연관된 확실성의 정도를 나타낸다.
       表示該更動或詮釋的相關正確度。
-      当該解釈や調整の確信度を示す．
       donne le degré de certitude associée à l'intervention
         ou à l'interprétation.
       significa el grado de certeza asociado con la
@@ -2347,7 +2348,7 @@ the TEI header.

     
   
 
-
+
   provides attributes used by elements to point to an
     external source.
   外部ソースを参照する要素によって用いられる属性を示す。
@@ -2359,18 +2360,40 @@ the TEI header.

       
         
       
+      
+        
+          
+            
+            
+              When used on a schema description element (like
+              ), the @source attribute
+              should have only 1 value. (This one has .)
+            
+          
+        
+      
       
-        
The source attribute points to an external source. When used on elements
-          describing schema components such as schemaSpec or moduleRef it
-          identifies the source from which declarations for the components of the object being
-          defined may be obtained. 

-        
 On other elements it provides a pointer to the bibliographical source from which a
-          quotation or citation is drawn. 

-        
In either case, the location may be provided using any form of URI, for example an
-          absolute URI, a relative URI, or private scheme URI that is expanded to an absolute URI as
-          documented in a prefixDef.

-        
If more than one location is specified, the default assumption is that the required
-          source should be obtained by combining the resources indicated. 

+        
The source attribute points to an external
+        source. When used on an element describing a schema component
+        (classRef, dataRef, elementRef,
+        macroRef, moduleRef, or
+        
+        schemaSpec), it identifies the source from which
+        declarations for the components should be obtained.

+        
On other elements it provides a pointer to the
+        bibliographical source from which a quotation or citation is
+        drawn.

+        
In either case, the location may be provided using any form
+        of URI, for example an absolute URI, a relative URI, a private
+        scheme URI of the form tei:x.y.z, where
+        x.y.z indicates the version number, e.g.
+        tei:4.3.2 for TEI P5 release 4.3.2 or (as a
+        special case) tei:current for whatever is the
+        latest release, or a private scheme URI that is expanded to an
+        absolute URI as documented in a prefixDef.

+        
When used on elements describing schema components,
+        source should have only one value; when used on
+        other elements multiple values are permitted.

       
     
   
@@ -2959,21 +2982,95 @@ ressource informatique selon une taxinomie normalisée.
       analyse ou une interprétation formelles.
   proporciona atributos para elementos que represental un análisis o interpretación formal.
   assegna degli attributi agli elementi che rappresentano un'analisi o un'interpretazione formali
-  
-    
-  
-  
+  
   
+    
+      indicates what kind of phenomenon is being noted in the passage.
+      현 단락에 표기되고 있는 현상의 종류를 나타낸다.
+      指出段落中所註解的現象類別。
+      当該部分で，どのような面が指摘されているのかを示す．
+      indique quel genre de phénomène est noté dans le
+          passage.
+      indica que tipo de fenómeno está siendo anotado en el pasaje.
+      indica quale sia il fenomeno osservato nella porzione di testo in questione
+      
+      
+        
+          identifies an image in the passage.
+          단락에서 이미지를 식별한다.
+          標明段落中的影像。
+          identifica una imagen en el pasaje.
+          当該部分の画像を指示する．
+          identifie une image dans le passage.
+          identifica un'immagine all'interno della porzione di testo
+        
+        
+          identifies a character associated with the passage.
+          단락과 연관된 문자를 식별한다.
+          標明與段落相關聯的人物。
+          identifica un carácter asociado al pasaje.
+          当該部分に関連する文字を指示する．
+          identifie un personnage associé au
+passage.
+          identifica un personaggio associato al brano in questione
+        
+        
+          identifies a theme in the passage.
+          단락에서 주제를 식별한다.
+          標明段落中的主題。
+          identifica un tema en el pasaje.
+          当該部分にあるテーマを指示する．
+          identifie un thème dans le passage.
+          identifica un tema rispetto al brano in questione
+        
+        
+          identifies an allusion to another text.
+          다른 텍스트에 대한 언급을 식별한다.
+          標明另一個文本的引用。
+          identifica una alusión a otro texto.
+          別テキストへの言及．
+          identifie une allusion à un autre
+texte.
+          identifica un'allusione a un altro testo
+        
+      
+    
+    
+    
+    
+      subtype
+      sous-type
+      provides a sub-categorization of the phenomenon is being noted in the passage, if needed
+      
+      
+        
The subtype attribute may be used to provide any
+        sub-classification for the element additional to that provided
+        by its type attribute.

+      
+      
+        
L'attribut subtype peut être employé pour
+        fournir une sous-classification pour cet élément, en plus de
+        celle fournie par son propre attribut type.

+      
+      
+        
El atributo subtype (subtipo) se puede utilizar
+        para proporcionar cualquier subclasificación para el elemento,
+        adicional a ésa proporcionada por su type (tipo) de
+        atributo.

+      
+      
+        

+        属性subtypeは，属性typeに加えて，当該要
+    素の下位分類を示すために使われる．
+    

+      
+    
+    
     
       instances
       실례
@@ -7850,7 +7947,7 @@ value.
     indicare i nomi degli spazi in XML come stabilito dalle raccomandazioni tecniche del W3C per gli
     spazi dei nomi in XML.
   
-      
+      
    
   
       
The range of syntactically valid values is defined by RFC 3986 Uniform Resource Identifier
@@ -7885,7 +7982,7 @@ value.</desc>
     <alternate>
       <dataRef name="anyURI">
         <!-- no slashes before the required first colon, thus to exclude relative URIs -->
-        <dataFacet name="pattern" value="[^/]+:.*"/>
+        <dataFacet name="pattern" value="[^/\s]+:\S*"/>
       </dataRef>
       <dataRef name="Name">
         <!-- require a colon[1] -->
@@ -8037,7 +8134,7 @@ bibliography and link to that (LB 2013-03-13) -->
       <facsimile>
 	<surface ulx="0" uly="0" lrx="400" lry="280">
 	  <zone points="220,100 300,210 170,250 123,234">
-	    <graphic url="handwriting.png "/>
+	    <graphic url="handwriting.png"/>
 	  </zone>
 	</surface>
       </facsimile>
@@ -8065,7 +8162,7 @@ resource, either within the current document or elsewhere.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">define una gama de valores de atributos usados para proporcionar un indicador de cualquier recurso, bien en el documento corriente o en otro.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">definisce la gamma di valori di attributi usati per indicare un unico puntatore rispetto a qualsiasi altra risorsa all'interno del documento corrente o altrove</desc>
   <content>
-      <dataRef name="anyURI"/>
+      <dataRef restriction="\S+" name="anyURI"/>
    </content>
   <remarks versionDate="2011-12-12" xml:lang="en">
       <p>The range of syntactically valid values is defined by
@@ -8379,7 +8476,7 @@ integer or the string "unbounded".</desc>
 </dataSpec></div></div>
 <div type="div2" xml:id="STOV"><head>The TEI Infrastructure Module</head>
 <moduleSpec xml:id="DSTTEI2" ident="tei" type="core">
-        <altIdent type="FPI">TEI Infrastructure</altIdent>
+        <idno type="FPI">TEI Infrastructure</idno>
         <desc xml:lang="en" versionDate="2018-07-12">Declarations for classes, datatypes, and macros available to all TEI modules</desc>
         <desc xml:lang="fr" versionDate="2018-07-09">Infrastructure de la TEI</desc>
         <desc xml:lang="zh-TW" versionDate="2018-07-09">所有TEI模組可用的元素集、資料類型、巨集指令之宣告</desc>
@@ -9615,23 +9712,24 @@ distribution of a text.</desc>
     <ptr target="#COBICOI"/>
   </listRef>
 </elementSpec>
-<elementSpec module="header" ident="availability">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="header" ident="availability">
   <gloss xml:lang="en" versionDate="2007-06-12">availability</gloss>
   <gloss versionDate="2007-06-12" xml:lang="fr">disponibilité</gloss>
-    <gloss versionDate="2016-11-17" xml:lang="de">Verfügbarkeit</gloss>
+  <gloss versionDate="2022-06-01" xml:lang="it">disponibilità</gloss>
+  <gloss versionDate="2016-11-17" xml:lang="de">Verfügbarkeit</gloss>
   <desc versionDate="2011-11-17" xml:lang="en">supplies information about the availability of a text, for example any restrictions on its
-    use or distribution, its copyright status, any licence applying to it, etc.</desc>
+  use or distribution, its copyright status, any licence applying to it, etc.</desc>
   <desc versionDate="2009-01-05" xml:lang="fr">renseigne sur la disponibilité du texte, par exemple sur
-    toutes restrictions quant à son usage ou sa diffusion, son copyright, etc.</desc>
+  toutes restrictions quant à son usage ou sa diffusion, son copyright, etc.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">텍스트 이용에 관한 정보를 제시한다. 예를 들어 사용 또는 배포의 제한, 저작권 상태 등.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">提供關於文件可利用性的資訊，例如使用或發行上的任何限制、版權狀態等。</desc>
   <desc versionDate="2008-04-06" xml:lang="ja">テキストの利用可能性に関する情報を示す．例えば，その使用や頒布， 著作権に関する制限など．</desc>
-    <desc versionDate="2016-11-17" xml:lang="de">liefert Informationen zur Verfügbarkeit eines Textes, zum Beispiel Einschränkungen bezüglich des Gebrauchs oder der Weitergabe, Lizensierungen usw.</desc>
+  <desc versionDate="2016-11-17" xml:lang="de">liefert Informationen zur Verfügbarkeit eines Textes, zum Beispiel Einschränkungen bezüglich des Gebrauchs oder der Weitergabe, Lizensierungen usw.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">proporciona información sobre la disponibilidad de un
-    texto, por ejemplo cualquier restricción en cuanto a su uso o distribución, su copyright, etc.</desc>
+  texto, por ejemplo cualquier restricción en cuanto a su uso o distribución, su copyright, etc.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">fornisce informazioni sulla disponibilità di un testo,
-    per esempio su qualsiasi restrizione che si applica alla sua utilizzazione o distribuzione, il
-    suo statuto in merito al copyright, etc.</desc>
+  per esempio su qualsiasi restrizione che si applica alla sua utilizzazione o distribuzione, il
+  suo statuto in merito al copyright, etc.</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="model.publicationStmtPart.detail"/>
@@ -9639,12 +9737,10 @@ distribution of a text.</desc>
     <memberOf key="model.biblPart"/>
   </classes>
   <content>
-    
-      <alternate minOccurs="1" maxOccurs="unbounded">
-        <classRef key="model.availabilityPart"/>
-        <classRef key="model.pLike"/>
-      </alternate>
-    
+    <alternate minOccurs="1" maxOccurs="unbounded">
+      <classRef key="model.availabilityPart"/>
+      <classRef key="model.pLike"/>
+    </alternate>    
   </content>
   <attList>
     <attDef ident="status" usage="opt">
@@ -9652,15 +9748,15 @@ distribution of a text.</desc>
       <gloss versionDate="2016-11-25" xml:lang="de">Statuscode</gloss>
       <desc versionDate="2005-01-14" xml:lang="en">supplies a code identifying the current availability of the text.</desc>
       <desc versionDate="2009-01-05" xml:lang="fr">donne un code caractérisant la disponibilité
-        actuelle d’un texte.</desc>
+      actuelle d’un texte.</desc>
       <desc versionDate="2007-12-20" xml:lang="ko">텍스트의 현재 이용 가능성을 식별하는 부호를 제공한다.</desc>
       <desc versionDate="2007-05-02" xml:lang="zh-TW">提供一個代號，用來確認文件目前的可利用性。</desc>
       <desc versionDate="2008-04-06" xml:lang="ja">当該テキストの，現在の利用可能性を表すコードを示す．</desc>
-        <desc versionDate="2016-11-17" xml:lang="de">gibt einen Code an, der die derzeitige Nutzbarkeit eines Textes festlegt.</desc>
+      <desc versionDate="2016-11-17" xml:lang="de">gibt einen Code an, der die derzeitige Nutzbarkeit eines Textes festlegt.</desc>
       <desc versionDate="2007-05-04" xml:lang="es">proporciona un código identificativo de la
-        disponibilidad actual del texto.</desc>
+      disponibilidad actual del texto.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">fornisce un codice che identifica l'attuale
-        disponibilità del testo.</desc>
+      disponibilità del testo.</desc>
       <datatype><dataRef key="teidata.enumerated"/></datatype>
       <valList type="closed">
         <valItem ident="free">
@@ -9685,7 +9781,7 @@ distribution of a text.</desc>
           <desc versionDate="2008-04-06" xml:lang="es">el estatus del texto es desconocido.</desc>
           <desc versionDate="2008-04-06" xml:lang="ja">当該テキストの利用可能性は不明．</desc>
           <desc versionDate="2007-01-21" xml:lang="it">la disponibilità del testo non è nota</desc>
-            <desc versionDate="2016-11-17" xml:lang="de">der Status des Textes ist unbekannt.</desc>
+          <desc versionDate="2016-11-17" xml:lang="de">der Status des Textes ist unbekannt.</desc>
         </valItem>
         <valItem ident="restricted">
           <gloss xml:lang="en" versionDate="2016-11-25">restricted</gloss>
@@ -9697,7 +9793,7 @@ distribution of a text.</desc>
           <desc versionDate="2008-04-06" xml:lang="es">el texto no está libremente disponible.</desc>
           <desc versionDate="2008-04-06" xml:lang="ja">当該テキストは，自由に使用できない．</desc>
           <desc versionDate="2007-01-21" xml:lang="it">il testo non è disponibile gratuitamente.</desc>
-            <desc versionDate="2016-11-17" xml:lang="de">der Text ist nicht frei verfügbar.</desc>
+          <desc versionDate="2016-11-17" xml:lang="de">der Text ist nicht frei verfügbar.</desc>
         </valItem>
       </valList>
     </attDef>
@@ -9719,8 +9815,8 @@ distribution of a text.</desc>
     <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#fr-ex-Abes">
       <availability status="restricted">
         <p>L' ABES a adopté le système Créative Commons pour permettre à tous ceux qui le
-            souhaitent, de reproduire tout ou partie des rubriques du site de l'ABES sur support
-            papier ou support électronique.</p>
+        souhaitent, de reproduire tout ou partie des rubriques du site de l'ABES sur support
+        papier ou support électronique.</p>
       </availability>
     </egXML>
   </exemplum>
@@ -9742,23 +9838,23 @@ distribution of a text.</desc>
       <availability>
         <licence target="http://opensource.org/licenses/MIT">
           <p>The MIT License
-            applies to this document.</p>
+          applies to this document.</p>
           <p>Copyright (C) 2011 by The University of Victoria</p>
           <p>Permission is hereby granted, free of charge, to any person obtaining a copy
-            of this software and associated documentation files (the "Software"), to deal
-            in the Software without restriction, including without limitation the rights
-            to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-            copies of the Software, and to permit persons to whom the Software is
-            furnished to do so, subject to the following conditions:</p>
+          of this software and associated documentation files (the "Software"), to deal
+          in the Software without restriction, including without limitation the rights
+          to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+          copies of the Software, and to permit persons to whom the Software is
+          furnished to do so, subject to the following conditions:</p>
           <p>The above copyright notice and this permission notice shall be included in
-            all copies or substantial portions of the Software.</p>
+          all copies or substantial portions of the Software.</p>
           <p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-            IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-            FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-            AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-            LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-            OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-            THE SOFTWARE.</p>
+          IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+          FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+          AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+          LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+          OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+          THE SOFTWARE.</p>
         </licence>
       </availability>
     </egXML>
@@ -9776,7 +9872,7 @@ distribution of a text.</desc>
     <p rend="dataDesc"> 永続的な形式で示されるべきである． </p>
   </remarks>
   <remarks xml:lang="de" versionDate="2016-11-17">
-      <p rend="dataDesc">Es sollte ein einheitliches Format verwendet werden.</p>
+    <p rend="dataDesc">Es sollte ein einheitliches Format verwendet werden.</p>
   </remarks>
   <listRef>
     <ptr target="#HD24"/>
@@ -10028,7 +10124,7 @@ définissant les droits d'utilisation.</desc>
   </listRef>
 </elementSpec></div>
 <div type="div3" xml:id="HD3"><head>The Source Description</head>
-<elementSpec module="header" ident="sourceDesc">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="header" ident="sourceDesc">
   <gloss versionDate="2007-07-04" xml:lang="en">source description</gloss>
   <gloss versionDate="2009-01-05" xml:lang="fr">description de la source</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">원전 기술</gloss>
@@ -10050,8 +10146,8 @@ définissant les droits d'utilisation.</desc>
         "born digital" für einen nur in elektronischer Form vorliegenden Text.  </desc>
   <desc versionDate="2007-05-04" xml:lang="es">proporciona una descripción del texto (o textos) fuente
     del que un texto electrónico deriva o ha sido generado.</desc>
-  <desc versionDate="2007-01-21" xml:lang="it"> fornisce una descrizionei relativa alla o alle fonti da
-    cui è derivato o generato un documento elettronico.</desc>
+  <desc versionDate="2007-01-21" xml:lang="it"> fornisce una descrizione relativa alla o alle fonti da
+    cui è derivato o generato un documento elettronico.</desc>  
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="att.declarable"/>
@@ -10100,7 +10196,7 @@ définissant les droits d'utilisation.</desc>
     <ptr target="#HD3"/>
   </listRef>
 </elementSpec>
-<elementSpec module="header" ident="biblFull">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="header" ident="biblFull">
   <gloss versionDate="2007-07-04" xml:lang="en">fully-structured bibliographic citation</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">완전히 구조화된 서지 인용 정보</gloss>
   <gloss versionDate="2007-05-02" xml:lang="zh-TW"/>
@@ -10320,7 +10416,7 @@ formatting or layout information preserved.</p>
   </listRef>
 </elementSpec>
 <div type="div3" xml:id="HD51"><head>The Project Description</head>
-<elementSpec module="header" ident="projectDesc">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="header" ident="projectDesc">
   <gloss versionDate="2005-01-14" xml:lang="en">project description</gloss>
   <gloss versionDate="2009-01-05" xml:lang="fr">description du projet</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">프로젝트 기술</gloss>
@@ -10400,7 +10496,7 @@ formatting or layout information preserved.</p>
   </listRef>
 </elementSpec></div>
 <div type="div3" xml:id="HD52"><head>The Sampling Declaration</head>
-<elementSpec module="header" ident="samplingDecl">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="header" ident="samplingDecl">
   <gloss versionDate="2005-01-14" xml:lang="en">sampling declaration</gloss>
   <gloss versionDate="2009-01-05" xml:lang="fr">déclaration d'échantillonnage</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">표본 추출 선언</gloss>
@@ -10485,7 +10581,7 @@ formatting or layout information preserved.</p>
   </listRef>
 </elementSpec></div>
 <div type="div3" xml:id="HD53"><head>The Editorial Practices Declaration</head>
-<elementSpec module="header" ident="editorialDecl">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="header" ident="editorialDecl">
   <gloss versionDate="2005-01-14" xml:lang="en">editorial practice declaration</gloss>
   <gloss versionDate="2009-01-05" xml:lang="fr">déclaration des pratiques éditoriales</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">편집 실행 선언</gloss>
@@ -10562,7 +10658,7 @@ during the encoding of a text.</desc>
     <ptr target="#CCAS2"/>
   </listRef>
 </elementSpec>
-<elementSpec module="header" ident="correction">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="header" ident="correction">
   <gloss versionDate="2005-01-14" xml:lang="en">correction principles</gloss>
   <gloss versionDate="2009-01-05" xml:lang="fr">règles de correction</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">수정 원리</gloss>
@@ -10735,7 +10831,7 @@ during the encoding of a text.</desc>
     <ptr target="#CCAS2"/>
   </listRef>
 </elementSpec>
-<elementSpec module="header" ident="normalization">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="header" ident="normalization">
   <gloss xml:lang="en" versionDate="2009-01-05">normalization</gloss>
   <gloss versionDate="2009-01-05" xml:lang="fr">normalisation</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">indicates the extent of normalization or regularization of the original source carried out
@@ -10881,7 +10977,7 @@ during the encoding of a text.</desc>
     <ptr target="#CCAS2"/>
   </listRef>
 </elementSpec>
-<elementSpec module="header" ident="quotation">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="header" ident="quotation">
   <gloss xml:lang="en" versionDate="2007-06-12">quotation</gloss>
   <gloss versionDate="2007-06-12" xml:lang="fr">citation</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">specifies editorial practice adopted with respect to quotation marks in the original.</desc>
@@ -11046,7 +11142,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
     <ptr target="#CCAS2"/>
   </listRef>
 </elementSpec>
-<elementSpec module="header" ident="hyphenation">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="header" ident="hyphenation">
   <gloss xml:lang="en" versionDate="2009-04-27">hyphenation</gloss>
   <gloss versionDate="2009-04-27" xml:lang="fr">césurage</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">summarizes the way in which hyphenation in a source text has been treated in an encoded
@@ -11178,7 +11274,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
     <ptr target="#CCAS2"/>
   </listRef>
 </elementSpec>
-<elementSpec module="header" ident="segmentation">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="header" ident="segmentation">
   <gloss xml:lang="en" versionDate="2007-06-12">segmentation</gloss>
   <gloss versionDate="2007-06-12" xml:lang="fr">segmentation</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">describes the principles according to which the text has been segmented, for example into
@@ -11226,7 +11322,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
     <ptr target="#CCAS2"/>
   </listRef>
 </elementSpec>
-<elementSpec module="header" ident="stdVals">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="header" ident="stdVals">
   <gloss versionDate="2007-07-04" xml:lang="en">standard values</gloss>
   <gloss versionDate="2009-01-05" xml:lang="fr">valeurs normalisées</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">표준 값</gloss>
@@ -11244,7 +11340,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
     oder Zahlenwerte genutzt wird.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">indica el formato usado cuando aparecen fechas
     estandarizadas o valores numéricos.</desc>
-  <desc versionDate="2007-01-21" xml:lang="it">specidica il formato usato quando vengono fornite date e
+  <desc versionDate="2007-01-21" xml:lang="it">specifica il formato usato quando vengono fornite date e
     altri valori numerici standardizzati.</desc>
   <classes>
     <memberOf key="att.global"/>
@@ -11282,7 +11378,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
     <ptr target="#CCAS2"/>
   </listRef>
 </elementSpec>
-<elementSpec module="header" ident="interpretation">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="header" ident="interpretation">
   <gloss xml:lang="en" versionDate="2007-06-12">interpretation</gloss>
   <gloss versionDate="2007-06-12" xml:lang="fr">Interprétation</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">describes the scope of any analytic or interpretive information added to the text in
@@ -11296,7 +11392,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
     die zusätzlich zur Transkription dem Text hinzugefügt wurde.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">describe la finalidad de cualquier información analítica
     o descriptiva añadida al texto en la transcripción.</desc>
-  <desc versionDate="2007-01-21" xml:lang="it">descrive l'estenione di qualsiasi informazione analitica
+  <desc versionDate="2007-01-21" xml:lang="it">descrive l'estensione di qualsiasi informazione analitica
     o interpretativa inserita nel testo, in aggiunta alla trascrizione</desc>
   <classes>
     <memberOf key="att.global"/>
@@ -11335,7 +11431,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
     <ptr target="#HD53"/>
   </listRef>
 </elementSpec>
-<elementSpec module="header" ident="punctuation">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="header" ident="punctuation">
   <desc versionDate="2013-06-20" xml:lang="en">specifies editorial practice adopted with respect to punctuation marks in the original.</desc>
   <classes>
     <memberOf key="att.declarable"/>
@@ -11777,7 +11873,7 @@ the target element</desc>
     <ptr target="#HD57"/>
   </listRef>
 </elementSpec>
-<elementSpec module="header" ident="styleDefDecl">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="header" ident="styleDefDecl">
   <gloss versionDate="2012-10-06" xml:lang="en">style definition language declaration</gloss>
   <desc versionDate="2013-04-12" xml:lang="en">specifies the name of the formal language in which style or
   renditional information is supplied elsewhere in the document. The
@@ -11812,7 +11908,7 @@ the target element</desc>
 <div type="div4" xml:id="HD54P"><head>Prose Method</head></div>
 <div type="div4" xml:id="HD54S"><head>Search-and-Replace Method</head></div>
 <div type="div4" xml:id="HD54M"><head>Milestone Method</head>
-<elementSpec module="header" ident="refsDecl">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="header" ident="refsDecl">
   <gloss versionDate="2005-01-14" xml:lang="en">references declaration</gloss>
   <gloss versionDate="2009-01-05" xml:lang="fr">Déclaration du système de références</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">참조 선언</gloss>
@@ -12006,7 +12102,7 @@ the target element</desc>
       <gloss versionDate="2020-02-03" xml:lang="en">property</gloss>
       <desc versionDate="2020-02-03" xml:lang="en">A URI indicating a property definition.</desc>
       <datatype>
-        <dataRef name="anyURI"/>
+        <dataRef key="teidata.pointer"/>
       </datatype>
     </attDef>    
   </attList>
@@ -12016,8 +12112,7 @@ the target element</desc>
         <citeData property="http://purl.org/dc/terms/title" use="head"/>
       </citeStructure>
     </egXML>
-  </exemplum>
-  
+  </exemplum>  
   <listRef>
     <ptr target="#CORS6"/>
     <ptr target="#SACRCS"/>
@@ -12931,7 +13026,7 @@ codes used elsewhere in the text.</desc>
   </listRef>
 </elementSpec></div>
 <div type="div3" xml:id="HDGDECL"><head>The Geographic Coordinates Declaration</head>
-<elementSpec module="header" ident="geoDecl">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="header" ident="geoDecl">
   <gloss versionDate="2007-09-23" xml:lang="en">geographic coordinates declaration</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">지리적 좌표 선언</gloss>
   <gloss versionDate="2008-04-06" xml:lang="es">declaración de las coordenadas geográficas</gloss>
@@ -13727,7 +13822,7 @@ elements of  <gi>profileDesc</gi> unless these are documenting multiple texts.</
   </listRef>
 </elementSpec></div>
 <div type="div3" xml:id="HD41"><head>Language Usage</head>
-<elementSpec module="header" ident="langUsage">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="header" ident="langUsage">
   <gloss versionDate="2005-01-14" xml:lang="en">language usage</gloss>
   <gloss versionDate="2009-01-05" xml:lang="fr">langue utilisée</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">언어 사용</gloss>
@@ -13913,7 +14008,7 @@ langues, registres, dialectes, etc. présents à l’intérieur d’un texte.</d
   </listRef>
 </elementSpec></div>
 <div type="div3" xml:id="HD43"><head>The Text Classification</head>
-<elementSpec module="header" ident="textClass">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="header" ident="textClass">
   <gloss versionDate="2005-01-14" xml:lang="en">text classification</gloss>
   <gloss versionDate="2009-01-05" xml:lang="fr">classification du texte</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">텍스트 분류</gloss>
@@ -14494,11 +14589,13 @@ should be supplied for the <att>scheme</att> attribute.</p>
   </listRef>
 </elementSpec></div>
 <div type="div3" xml:id="HD44CD"><head>Correspondence Description</head>
-<elementSpec module="header" ident="correspDesc">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="header" ident="correspDesc">
   <gloss versionDate="2014-01-13" xml:lang="en">correspondence
     description</gloss>
+  <gloss versionDate="2021-02-02" xml:lang="it">descrizione di corrispondenza epistolare</gloss>
   <desc versionDate="2015-01-29" xml:lang="en">contains a description
     of the actions related to one act of correspondence.</desc>
+  <desc versionDate="2021-02-02" xml:lang="it">contiene una descrizione delle azioni intorno a un atto di corrispondenza epistolare.</desc>
   <classes>
     <memberOf key="model.profileDescPart"/>
     <memberOf key="att.declarable"/>
@@ -14665,7 +14762,7 @@ should be supplied for the <att>scheme</att> attribute.</p>
         elements for describing correspondence</desc>
 </classSpec></div></div>
 <div type="div2" xml:id="HD9"><head>Non-TEI Metadata</head>
-<elementSpec module="header" ident="xenoData">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="header" ident="xenoData">
   <gloss versionDate="2015-05-30" xml:lang="en">non-TEI metadata</gloss>
   <desc versionDate="2015-05-30" xml:lang="en">provides a container
   element into which metadata in non-TEI formats may be
@@ -15153,7 +15250,7 @@ supplied to printer.</change>
 <div type="div2" xml:id="HD8"><head>Note for Library Cataloguers</head></div>
 <div><head>The TEI Header Module</head>
 <moduleSpec xml:id="DHD" ident="header">
-    <altIdent type="FPI">Common Metadata</altIdent>
+    <idno type="FPI">Common Metadata</idno>
     <desc xml:lang="en" versionDate="2006-09-13">The TEI header</desc>
     <desc xml:lang="fr" versionDate="2018-07-12">En-tête TEI</desc>
     <desc xml:lang="zh-TW" versionDate="2018-07-12">TEI標頭</desc>
@@ -19414,6 +19511,7 @@ my <num type="ordinal" value="21">twenty-first</num> birthday</p>
   <attList>
     <attDef ident="type" mode="change">
       <gloss xml:lang="en" versionDate="2017-06-25">type</gloss>
+      <gloss xml:lang="es" versionDate="2022-04-28">tipo</gloss>
       <gloss versionDate="2017-06-25" xml:lang="de">Typ</gloss>
       <desc versionDate="2005-01-14" xml:lang="en">allows the encoder to classify the abbreviation according to some convenient
                 typology.</desc>
@@ -19422,8 +19520,7 @@ my <num type="ordinal" value="21">twenty-first</num> birthday</p>
       <desc versionDate="2008-04-05" xml:lang="ja">符号化する人の分類に従って省略名称を付与することができる．</desc>
       <desc versionDate="2009-01-06" xml:lang="fr">permet à l'encodeur de caractériser
                 l'abréviation selon une typologie adéquate</desc>
-      <desc versionDate="2007-05-04" xml:lang="es">permite al codificador clasificar la
-                abreviatura según la tipología conveniente.</desc>
+      <desc versionDate="2022-04-29" xml:lang="es">permite al codificador clasificar la abreviatura según la tipología conveniente.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">pemette al codificatore di classificare
                 l'abbreviazione secondo una tipologia funzionale.</desc>
       <desc versionDate="2016-11-25" xml:lang="de">erlaubt es, die Abkürzung nach einer geeigneten Typologie zu klassifizieren.</desc>
@@ -19539,8 +19636,7 @@ my <num type="ordinal" value="21">twenty-first</num> birthday</p>
           <desc versionDate="2007-06-27" xml:lang="en">the abbreviation is for a geographic name.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">약어가 지명에 대한 것이다.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">用於地理名稱的縮寫。</desc>
-          <desc versionDate="2008-04-06" xml:lang="es">la abreviatura se usa para un nombre
-                        geográfico.</desc>
+          <desc versionDate="2022-04-28" xml:lang="es">la abreviatura se usa para un nombre geográfico.</desc>
           <desc versionDate="2008-04-05" xml:lang="ja">地名の省略形．</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">l'abréviation recouvre un nom
                         géographique.</desc>
@@ -21150,21 +21246,22 @@ psychological significance.
       elektronische Verarbeitung automatisch rekonstruiert werden kann, kann es als unnötig angesehen
       werden, die Nummerierung anzugeben.</p>
   </exemplum>
-  <remarks xml:lang="fr" versionDate="2007-06-12">
-    <p>L'attribut global<att>n</att> indique le
-    symbole ou le nombre utilisé pour marquer le point d'insertion
-    dans le texte source, comme dans l'exemple suivant :
-<egXML xmlns="http://www.tei-c.org/ns/Examples" xml:lang="en">Mevorakh b. Saadya's
-    mother, the matriarch of the family during the second half of the
-    eleventh century, <note n="126" anchored="true"> The alleged
-    mention of Judah Nagid's mother in a letter from 1071 is, in fact,
-    a reference to Judah's children; cf. above, nn. 111 and
-    54. </note> is well known from Geniza documents published by Jacob
-    Mann.</egXML> Cependant, si les notes sont ordonnées et numérotées
-    et qu’on veuille reconstruire automatiquement leur numérotation
-    par un traitement informatique, il est inutile d’enregistrer le
-    numéro des notes.</p>
-  </remarks>
+  <exemplum xml:lang="fr" versionDate="2007-06-12">
+    <p>L'attribut global <att>n</att> indique le
+      symbole ou le nombre utilisé pour marquer le point d'insertion
+      dans le texte source, comme dans l'exemple suivant :</p>
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" xml:lang="en">Mevorakh b. Saadya's
+      mother, the matriarch of the family during the second half of the
+      eleventh century, <note n="126" anchored="true"> The alleged
+        mention of Judah Nagid's mother in a letter from 1071 is, in fact,
+        a reference to Judah's children; cf. above, nn. 111 and
+        54. </note> is well known from Geniza documents published by Jacob
+      Mann.</egXML> 
+    <p>Cependant, si les notes sont ordonnées et numérotées
+      et qu’on veuille reconstruire automatiquement leur numérotation
+      par un traitement informatique, il est inutile d’enregistrer le
+      numéro des notes.</p>
+  </exemplum>
   <listRef>
     <ptr target="#CONONO" type="div2"/>
     <ptr target="#HD27"/>
@@ -21385,6 +21482,7 @@ the resource specified by the <att>url</att> attribute.</p>
     <memberOf key="att.media"/>
     <memberOf key="att.resourced"/>
     <memberOf key="att.declaring"/>
+    <memberOf key="att.typed"/>
   </classes>
   <content>
        <classRef key="model.descLike" minOccurs="0" maxOccurs="unbounded"/>   
@@ -21432,6 +21530,35 @@ the resource specified by the <att>url</att> attribute.</p>
       </facsimile>
     </egXML>
   </exemplum>
+  <exemplum versionDate="2022-04-08" xml:lang="en">
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" xml:lang="und" source="#UND">
+      <facsimile>
+        <surfaceGrp n="leaf1" xml:id="spi001">
+          <surface xml:id="spi001r">
+            <graphic type="normal" subtype="thumbnail" url="spi/thumb/001r.jpg"/>
+            <graphic type="normal" subtype="low-res" url="spi/normal/lowRes/001r.jpg"/>
+            <graphic type="normal" subtype="high-res" url="spi/normal/highRes/001r.jpg"/>
+            <graphic type="high-contrast" subtype="low-res" url="spi/contrast/lowRes/001r.jpg"/>
+            <graphic type="high-contrast" subtype="high-res" url="spi/contrast/highRes/001r.jpg"/>
+          </surface>
+          <surface xml:id="spi001v">
+            <graphic type="normal" subtype="thumbnail" url="spi/thumb/001v.jpg"/>
+            <graphic type="normal" subtype="low-res" url="spi/normal/lowRes/001v.jpg"/>
+            <graphic type="normal" subtype="high-res" url="spi/normal/highRes/001v.jpg"/>
+            <graphic type="high-contrast" subtype="low-res" url="spi/contrast/lowRes/001v.jpg"/>
+            <graphic type="high-contrast" subtype="high-res" url="spi/contrast/highRes/001v.jpg"/>
+            <zone xml:id="spi001v_detail01">
+              <graphic type="normal" subtype="thumbnail" url="spi/thumb/001v-detail01.jpg"/>
+              <graphic type="normal" subtype="low-res" url="spi/normal/lowRes/001v-detail01.jpg"/>
+              <graphic type="normal" subtype="high-res" url="spi/normal/highRes/001v-detail01.jpg"/>
+              <graphic type="high-contrast" subtype="low-res" url="spi/contrast/lowRes/001v-detail01.jpg"/>
+              <graphic type="high-contrast" subtype="high-res" url="spi/contrast/highRes/001v-detail01.jpg"/>
+            </zone>
+          </surface>
+        </surfaceGrp>
+      </facsimile>
+    </egXML>
+  </exemplum>
   <remarks versionDate="2016-03-07" xml:lang="en">
     <p>The <att>mimeType</att> attribute should be used to supply the MIME media type of the image
       specified by the <att>url</att> attribute.</p><p>Within the body of a text, a <gi>graphic</gi> element  indicates the 
@@ -23563,7 +23690,7 @@ epistemology, methodology and history of
 </elementSpec></div>
 <div type="div4" xml:id="COBICOS"><head>Series Information</head></div>
 <div type="div4" xml:id="COBIRI"><head>Related Items</head>
-<elementSpec module="core" ident="bibl">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="core" ident="bibl">
   <gloss versionDate="2005-01-14" xml:lang="en">bibliographic citation</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">서지 인용</gloss>
   <gloss versionDate="2007-05-02" xml:lang="zh-TW">書目資料</gloss>
@@ -23685,7 +23812,7 @@ epistemology, methodology and history of
     <ptr target="#CCAS2"/>
   </listRef>
 </elementSpec>
-<elementSpec module="core" ident="biblStruct">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="core" ident="biblStruct">
   <gloss versionDate="2005-04-15" xml:lang="en">structured bibliographic citation</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">구조화된 서지 인용</gloss>
   <gloss versionDate="2007-05-02" xml:lang="zh-TW">結構次要書目</gloss>
@@ -23786,7 +23913,7 @@ epistemology, methodology and history of
     <ptr target="#CCAS2"/>
   </listRef>
 </elementSpec>
-<elementSpec module="core" ident="listBibl">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="core" ident="listBibl">
   <gloss versionDate="2005-01-14" xml:lang="en">citation list</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">인용 목록</gloss>
   <gloss versionDate="2007-05-02" xml:lang="zh-TW">書目列表</gloss>
@@ -24299,7 +24426,7 @@ relatedItem element must be empty</sch:report>
     </egXML>
   </exemplum>
   <exemplum xml:lang="zh-TW">
-    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n23">
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n23-24">
       <sp>
         <speaker>祝英台</speaker>
         <p>我就是英台。三年前我想出外求學，故而改扮男裝，不期与梁兄相遇，三載同窗多蒙照顧，英台感激不盡。</p>
@@ -24405,7 +24532,7 @@ relatedItem element must be empty</sch:report>
     </egXML>
   </exemplum>
   <exemplum xml:lang="zh-TW">
-    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n24">
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n23-24">
       <sp who="#zh-tw_ni #zh-tw_rsa">
         <speaker>梁山伯與祝英台t</speaker>
         <stage type="演講或歌唱">（同時)</stage>
@@ -24449,6 +24576,7 @@ relatedItem element must be empty</sch:report>
     <memberOf key="att.ascribed.directed"/>
     <memberOf key="att.global"/>
     <memberOf key="att.placement"/>
+    <memberOf key="att.written"/>
     <memberOf key="model.stageLike"/>
   </classes>
   <content>
@@ -24644,7 +24772,7 @@ by the stage direction.</p>
 </elementSpec></div></div>
 <div type="div2" xml:id="COOV"><head>Overview of the Core Module </head>
 <moduleSpec xml:id="DCO" ident="core">
-     <altIdent type="FPI">Common Core</altIdent>
+     <idno type="FPI">Common Core</idno>
      <desc xml:lang="en" versionDate="2006-09-13">Elements common to all TEI documents</desc>
      <desc xml:lang="fr" versionDate="2018-07-12">Éléments disponibles pour tous les documents TEI</desc>
      <desc xml:lang="zh-TW" versionDate="2018-07-12">所有TEI文件所通用的元素</desc>
@@ -24674,8 +24802,7 @@ by the stage direction.</p>
   <desc versionDate="2017-06-13" xml:lang="de">enthält ein einzelnes TEI-konformes Dokument, das aus einem einzigen TEI-Header und einem oder
     mehreren Mitgliedern der <ident type="class">model.resource</ident>-Klasse besteht. Mehrere
     <gi>TEI</gi>-Elemente können in einem <gi>teiCorpus</gi>-Element zusammengefasst werden.</desc>
-  <desc versionDate="2017-02-06" xml:lang="es">contiene un solo documento conforme a la norma TEI, combinando una sola cabecera TEI (teiHeader) con uno o más miembros de la clase <ident type="class">model.resource</ident>. Múltiples elementos TEI se pueden combinar para formar un elemento <gi>teiCorpus</gi>.
-   </desc>
+  <desc versionDate="2022-05-02" xml:lang="es">contiene un solo documento conforme a la norma TEI, combinando una sola cabecera TEI (teiHeader) con uno o más miembros de la clase <ident type="class">model.resource</ident>. Múltiples elementos TEI se pueden combinar para formar un elemento <gi>TEI</gi> o <gi>teiCorpus</gi>.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">contiene un documento TEI-conforme, comprendente un'intestazione e un testo, sia esso isolato o parte di un elemento <gi>teiCorpus</gi>
    </desc>
   <classes>
@@ -24688,11 +24815,11 @@ by the stage direction.</p>
     <sequence>
       <elementRef key="teiHeader"/>
       <alternate>
-	<sequence>
-	  <classRef key="model.resource" minOccurs="1" maxOccurs="unbounded"/>
-	  <elementRef key="TEI" minOccurs="0" maxOccurs="unbounded"/>
-	</sequence>
-	<elementRef key="TEI" minOccurs="1" maxOccurs="unbounded"/>
+        <sequence>
+          <classRef key="model.resource" minOccurs="1" maxOccurs="unbounded"/>
+          <elementRef key="TEI" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+        <elementRef key="TEI" minOccurs="1" maxOccurs="unbounded"/>
       </alternate>
     </sequence>
   </content>
@@ -24716,7 +24843,7 @@ by the stage direction.</p>
       <desc versionDate="2018-12-17" xml:lang="ja">当該文書が妥当（に符号化される）TEIスキームの版を示す．</desc>
       <desc versionDate="2007-06-12" xml:lang="fr">la version majeure du schéma TEI</desc>
       <desc versionDate="2018-07-18" xml:lang="de">gibt die Versionsnummer der TEI-Richtlinien an, gegen die dieses Dokument validiert wird.</desc>
-      <desc versionDate="2007-05-04" xml:lang="es">Versión del esquema TEI</desc>
+      <desc versionDate="2022-05-02" xml:lang="es">especifica el número de versión de las Directrices TEI frente a las cuales este documento es válido.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">versione dello schema TEI</desc>
       <datatype><dataRef key="teidata.version"/></datatype>
       <remarks versionDate="2018-01-24" xml:lang="en">
@@ -24725,8 +24852,9 @@ by the stage direction.</p>
           releases of the fifth major edition of the Guidelines, known as P5. This attribute may be 
           used to associate a TEI document with a specific release of the P5 Guidelines, in the absence 
           of a more precise association provided by the <att>source</att> attribute on the associated 
-          <gi>schemaSpec</gi>. </p>
+          <gi>schemaSpec</gi>.</p>
       </remarks>
+      <remarks versionDate="2022-05-02" xml:lang="es"><p>Durante mucho tiempo, se ha hecho referencia informalmente a las principales ediciones de las Directrices con un nombre compuesto por la letra P (de Propuesta) seguida de un dígito. El lanzamiento actual es uno de los muchos lanzamientos de la quinta edición principal de las Directrices, conocida como P5. Este atributo puede utilizarse para asociar un documento TEI con una publicación específica de las Directrices P5, en ausencia de una asociación más precisa proporcionada por el atributo fuente en el <gi>schemaSpec</gi> asociado.</p></remarks>
       <remarks versionDate="2018-07-18" xml:lang="de">
         <p>Hauptausgaben der TEI-Richtlinien werden seit langem informell mit einem Namen bezeichnet, der sich aus dem Buchstaben P (für proposal) 
           und einer Ziffer zusammensetzt. Die aktuelle Ausgabe ist eine der vielen Ausgaben 
@@ -24749,7 +24877,7 @@ by the stage direction.</p>
             </titleStmt>
             <publicationStmt>
               <p>First published as part of TEI P2, this is the P5
-	      version using a name space.</p>
+              version using a namespace.</p>
             </publicationStmt>
             <sourceDesc>
               <p>No source: this is an original work.</p>
@@ -24780,12 +24908,12 @@ by the stage direction.</p>
             </sourceDesc>
           </fileDesc>
         </teiHeader>
-	<facsimile>
-	  <graphic url="page1.png"/>
-	  <graphic url="page2.png"/>
-	  <graphic url="page3.png"/>
-	  <graphic url="page4.png"/>
-	</facsimile>
+        <facsimile>
+          <graphic url="page1.png"/>
+          <graphic url="page2.png"/>
+          <graphic url="page3.png"/>
+          <graphic url="page4.png"/>
+        </facsimile>
       </TEI>
     </egXML>
   </exemplum>
@@ -24838,10 +24966,11 @@ by the stage direction.</p>
       </TEI>
     </egXML>
   </exemplum>
-  <remarks versionDate="2015-03-10" xml:lang="en">
-    <p>This element is required. It is customary to specify the
-    TEI namespace <code>http://www.tei-c.org/ns/1.0</code> on it, using
-    the <att>xmlns</att> attribute.</p>
+  <remarks versionDate="2022-04-04" xml:lang="en">
+    <p>This element is required. It is customary to specify the TEI
+    namespace <ident type="ns">http://www.tei-c.org/ns/1.0</ident> on
+    it, for example: <tag type="start">TEI version="4.4.0"
+    xml:lang="it" xmlns="http://www.tei-c.org/ns/1.0"</tag>.</p>
   </remarks>
   <remarks xml:lang="fr" versionDate="2007-06-12">
     <p>Cet élément est obligatoire.</p>
@@ -24851,9 +24980,11 @@ by the stage direction.</p>
       当該要素は必須であり，<att>xmlns</att> 属性を用いてTEIの名前空間 <code>http://www.tei-c.org/ns/1.0</code> を指定することになっている．
     </p>
   </remarks>
-  <remarks versionDate="2017-06-13" xml:lang="de">
-    <p>Dieses Element ist obligatorisch. Es ist notwendig, darin den TEI-Namensraum <ident type="ns">http://www.tei-c.org/ns/1.0</ident> mithilfe des <att>xmlns</att>-Attributs zu
-      spezifizieren.</p>
+  <remarks versionDate="2022-04-07" xml:lang="de">
+    <p>Dieses Element ist obligatorisch. Es ist notwendig, 
+      auch den TEI-Namensraum <ident type="ns">http://www.tei-c.org/ns/1.0</ident> anzugeben, z.B. 
+      <tag type="start">TEI version="4.4.0" xml:lang="it" 
+        xmlns="http://www.tei-c.org/ns/1.0"</tag>.</p>
   </remarks>
   <listRef>
     <ptr target="#DS"/>
@@ -25743,7 +25874,7 @@ by the stage direction.</p>
     </egXML>
   </exemplum>
   <exemplum xml:lang="zh-TW">
-    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n51">
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n51-55">
       <body>
         <div type="part">
           <head>對話的喧囂：巴赫汀文化理論述評</head>
@@ -26034,7 +26165,7 @@ by the stage direction.</p>
     </egXML>
   </exemplum>
   <exemplum xml:lang="zh-TW">
-    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n53">
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n51-55">
       <div1 n="3" type="part">
         <head>第三章：對話性—文化理論的基石</head>
         <div2 n="3.1" type="section">
@@ -26182,7 +26313,7 @@ by the stage direction.</p>
     </egXML>
   </exemplum>
   <exemplum xml:lang="zh-TW">
-    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n54">
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n51-55">
       <div2 n="3.2" type="section">
         <div3 n="3.2.1" type="member">
           <head>打破內在/外在、主觀/客觀的二元對立</head>
@@ -26315,7 +26446,7 @@ by the stage direction.</p>
     </egXML>
   </exemplum>
   <exemplum xml:lang="zh-TW">
-    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n55">
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n51-55">
       <div3 n="3.2.1" type="member">
         <head>打破內在/外在、主觀/客觀的二元對立</head>
         <div4 n="3.2.1.1" type="subsection">
@@ -27407,7 +27538,7 @@ Tubes formed by Lightning — House struck</p>
     </egXML>
   </exemplum>
   <exemplum xml:lang="zh-TW">
-    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n56">
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n56-57">
       <epigraph xml:lang="zh">
         <cit>
           <bibl>俞平伯</bibl>
@@ -28828,7 +28959,7 @@ the date of the entire document, not for any subset or part of it.</p>
     </egXML>
   </exemplum>
   <exemplum xml:lang="zh-TW">
-    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n57">
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n56-57">
       <front>
         <epigraph>
           <quote>小燕子其實也無所愛，只是沉浸在朦朧而飄忽的夏夜夢里罷了。 </quote>
@@ -29109,7 +29240,7 @@ the date of the entire document, not for any subset or part of it.</p>
 </elementSpec></div>
 <div type="div2" xml:id="DSSTRUC"><head>Module for Default Text Structure</head>
 <moduleSpec xml:id="DDS" ident="textstructure">
-    <altIdent type="FPI">Default Text Structure</altIdent>
+    <idno type="FPI">Default Text Structure</idno>
     <desc xml:lang="en" versionDate="2006-09-13">Default text structure</desc>
     <desc xml:lang="fr" versionDate="2018-07-12">Structure textuelle par défaut</desc>
     <desc xml:lang="zh-TW" versionDate="2018-07-12">預設文件結構</desc>
@@ -29139,7 +29270,7 @@ the date of the entire document, not for any subset or part of it.</p>
 <div xml:id="WDCAV"><head>Caveat</head></div>
 <div type="div2" xml:id="WSD-DEF"><head>Formal Definition</head>
 <moduleSpec xml:id="DWD" ident="gaiji">
-  <altIdent type="FPI">Character and Glyph Documentation</altIdent>
+  <idno type="FPI">Character and Glyph Documentation</idno>
   <desc xml:lang="en" versionDate="2006-09-13">Character and glyph documentation</desc>
   <desc xml:lang="fr" versionDate="2018-07-12">Représentation des caractères et des glyphes non standard</desc>
   <desc xml:lang="zh-TW" versionDate="2018-07-12">文字與字體說明</desc>
@@ -30846,7 +30977,7 @@ and <val>simplified</val>  for simplified characters. The
 <div type="div3" xml:id="VEMEana"><head>Metrical Analysis of Stanzaic Verse</head></div></div>
 <div type="div2" xml:id="VERH"><head>Rhyme</head></div>
 <div xml:id="HDMN"><head>Metrical Notation Declaration</head>
-<elementSpec module="verse" ident="metDecl">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="verse" ident="metDecl">
   <gloss versionDate="2007-07-04" xml:lang="en">metrical notation declaration</gloss>
   <gloss versionDate="2009-01-05" xml:lang="fr">déclaration sur la métrique</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">운율적 표기법 선언</gloss>
@@ -31215,7 +31346,7 @@ and <val>simplified</val>  for simplified characters. The
 <div type="div2" xml:id="VEETC"><head>Encoding Procedures for Other Verse Features</head></div>
 <div type="div2" xml:id="VESTR"><head>Module for Verse</head>
 <moduleSpec xml:id="DVE" ident="verse">
-       <altIdent type="FPI">Verse</altIdent>
+       <idno type="FPI">Verse</idno>
        <desc xml:lang="en" versionDate="2006-09-13">Verse structures</desc>
        <desc xml:lang="fr" versionDate="2018-07-12">Poésie</desc>
        <desc xml:lang="zh-TW" versionDate="2018-07-12">韻文結構</desc>
@@ -31489,7 +31620,7 @@ enjambement is not of particular interest.</p>
     </egXML>
   </exemplum>
   <exemplum xml:lang="zh-TW">
-    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n64">
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n62-64">
       <l>枯藤<caesura/>老樹<caesura/>昏鴉</l>
       <l>小橋<caesura/>流水<caesura/>人家</l>
       <l>古道<caesura/>西風<caesura/>瘦馬</l>
@@ -31867,7 +31998,7 @@ enjambement is not of particular interest.</p>
     </egXML>
   </exemplum>
   <exemplum xml:lang="zh-TW">
-    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n35">
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n35-36">
       <prologue>
         <sp>
           <l>何時姊妹再相逢，雷電轟轟雨蒙蒙？</l>
@@ -32603,7 +32734,7 @@ elements within a cast list.</desc>
     </egXML>
   </exemplum>
   <exemplum xml:lang="zh-TW">
-    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n30">
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n30-31">
       <castGroup rend="braced">
         <castItem>
           <role>程蝶衣</role>
@@ -32740,7 +32871,7 @@ either a single role or a list of non-speaking roles.</desc>
     </egXML>
   </exemplum>
   <exemplum xml:lang="zh-TW">
-    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n31">
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n30-31">
       <castItem type="list">張國榮、張豐毅、鞏俐…等等</castItem>
     </egXML>
   </exemplum>
@@ -32786,7 +32917,7 @@ either a single role or a list of non-speaking roles.</desc>
     </egXML>
   </exemplum>
   <exemplum xml:lang="zh-TW">
-    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n36">
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n35-36">
       <role xml:id="zh-tw_王">鄧肯</role>
       <roleDesc>蘇格蘭國王</roleDesc>
     </egXML>
@@ -33700,7 +33831,7 @@ technical direction applies.</desc>
 </elementSpec></div></div>
 <div><head>Module for Performance Texts</head>
 <moduleSpec xml:id="DDR" ident="drama">
-    <altIdent type="FPI">Performance Texts</altIdent>
+    <idno type="FPI">Performance Texts</idno>
     <desc xml:lang="en" versionDate="2006-09-13">Performance texts</desc>
     <desc xml:lang="fr" versionDate="2018-07-12">Théâtre</desc>
     <desc xml:lang="zh-TW" versionDate="2018-07-12">劇本</desc>
@@ -33711,7 +33842,7 @@ technical direction applies.</desc>
 <div type="div1" xml:id="TS" n="11"><head>Transcriptions of Speech</head>
 <div type="div2" xml:id="TSOV"><head>General Considerations and Overview</head></div>
 <div type="div3" xml:id="HD32"><head>Documenting the Source of Transcribed Speech</head>
-<elementSpec module="spoken" ident="scriptStmt">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="spoken" ident="scriptStmt">
   <gloss versionDate="2005-01-14" xml:lang="en">script statement</gloss>
   <gloss versionDate="2009-04-17" xml:lang="fr">déclaration du script</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">스크립트 진술</gloss>
@@ -33827,7 +33958,7 @@ distinct recordings made by hidden microphone in early February
     <ptr target="#HD3"/>
   </listRef>
 </elementSpec>
-<elementSpec module="spoken" ident="recording">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="spoken" ident="recording">
   <gloss versionDate="2005-01-14" xml:lang="en">recording event</gloss>
   <gloss versionDate="2009-01-05" xml:lang="fr">enregistrement</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">녹음 사건</gloss>
@@ -34065,7 +34196,7 @@ a public broadcast.</desc>
     <ptr target="#CCAS2"/>
   </listRef>
 </elementSpec>
-<elementSpec module="spoken" ident="equipment">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="spoken" ident="equipment">
   <gloss xml:lang="en" versionDate="2009-04-17">equipment</gloss>
   <gloss xml:lang="fr" versionDate="2009-04-17">matériel</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">provides technical details of the equipment and media used for
@@ -34144,7 +34275,7 @@ an audio or video recording used as the source for a spoken text.</desc>
     <ptr target="#CCAS2"/>
   </listRef>
 </elementSpec>
-<elementSpec module="spoken" ident="broadcast">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="spoken" ident="broadcast">
   <gloss xml:lang="en" versionDate="2009-04-17">broadcast</gloss>
   <gloss xml:lang="fr" versionDate="2009-04-17">diffusion</gloss>
   <desc versionDate="2005-01-14" xml:lang="en">describes a broadcast used as the source of a spoken text.</desc>
@@ -34935,7 +35066,7 @@ very loudly.</p>
 <div type="div3" xml:id="TSTPAC"><head>Analytic Coding</head></div></div>
 <div><head>Module for Transcribed Speech</head>
 <moduleSpec xml:id="DTS" ident="spoken">
-    <altIdent type="FPI">Transcribed Speech</altIdent>
+    <idno type="FPI">Transcribed Speech</idno>
     <desc xml:lang="en" versionDate="2006-09-13">Transcribed Speech</desc>
     <desc xml:lang="fr" versionDate="2018-07-12">Transcriptions de la parole</desc>
     <desc xml:lang="zh-TW" versionDate="2018-07-12">轉錄的言詞</desc>
@@ -39212,7 +39343,7 @@ headword  such as noun, verb, or adjective.</desc>
 <div type="div2" xml:id="DIFR"><head>Unstructured Entries</head></div>
 <div><head>The Dictionary Module</head>
 <moduleSpec xml:id="DDIBO" ident="dictionaries">
-    <altIdent type="FPI">Dictionaries</altIdent>
+    <idno type="FPI">Dictionaries</idno>
     <desc xml:lang="en" versionDate="2018-07-12">Dictionaries</desc>
     <desc xml:lang="fr" versionDate="2018-07-09">Dictionnaires</desc>
     <desc xml:lang="zh-TW" versionDate="2018-07-09">紙本字典</desc>
@@ -44212,9 +44343,9 @@ Edgar Holden in 1993. Donor number: 1993-034.</p>
           <change when="2009-10-05" who="Markova">Description mise à jour le <date type="crea">5
                 octobre 2009 </date>en vue de l'encodage en TEI des descriptions des reliure de la
               Réserve des livres rares</change>
-          <change when="2009-06-01" who="Le Bars">Description revue le <date type="maj">1er juin
+          <change when="2009-06-01" who="#Le_Bars">Description revue le <date type="maj">1er juin
                 2009 </date> par Fabienne Le Bars</change>
-          <change when="2009-06-25" who="Le Bars">Description validée le<date type="valid">25
+          <change when="2009-06-25" who="#Le_Bars">Description validée le<date type="valid">25
                 juin 2009</date>par Fabienne Le Bars</change>
         </recordHist>
       </adminInfo>
@@ -44771,7 +44902,7 @@ deprecated.
 </elementSpec></div>
 <div type="div2" xml:id="MSref"><head>Module for Manuscript Description</head>
 <moduleSpec xml:id="DMSD2" ident="msdescription">
-    <altIdent type="FPI">Manuscript Description</altIdent>
+    <idno type="FPI">Manuscript Description</idno>
     <desc xml:lang="en" versionDate="2006-09-13">Manuscript Description</desc>
     <desc xml:lang="fr" versionDate="2018-07-12">Description de manuscrits</desc>
     <desc xml:lang="zh-TW" versionDate="2018-07-12">寫本描述</desc>
@@ -45234,13 +45365,13 @@ in section <ptr target="#PH-surfzone"/>.    </p>
       <facsimile>
         <surface ulx="50" uly="20" lrx="400" lry="280">
           <zone ulx="0" uly="0" lrx="500" lry="321">
-            <graphic url="graphic.png "/>
+            <graphic url="graphic.png"/>
           </zone>
         </surface>
       </facsimile>
     </egXML>
     <p>This example defines a zone which has been defined as larger than its parent
-surface in order to match the dimensions of the  graphic it contains.   </p>
+surface in order to match the dimensions of the  graphic it contains.</p>
   </exemplum>
   <remarks versionDate="2018-04-08" xml:lang="en">
     <p>The position of every zone for a given surface is always
@@ -45417,7 +45548,7 @@ en-tête et un texte, constitue un document TEI.</desc>
 <div type="div2" xml:id="PHTRXX"><head>Other Primary Source Features not Covered in these Guidelines</head></div>
 <div><head>Module for Transcription of Primary Sources</head>
 <moduleSpec xml:id="DPH" ident="transcr">
-       <altIdent type="FPI">Transcription of Primary Sources</altIdent>
+       <idno type="FPI">Transcription of Primary Sources</idno>
        <desc xml:lang="en" versionDate="2006-09-13">Transcription of primary sources</desc>
        <desc xml:lang="zh-TW" versionDate="2018-07-12">原文轉錄</desc>
        <desc xml:lang="fr" versionDate="2018-07-12">Représentation de sources primaires</desc>
@@ -46331,7 +46462,7 @@ horizontal components should be classed as <val>vertical</val>.</p>
         horizontale se dépose sur la <space quantity="3" unit="lignes"/>feuille blanche.</egXML>
   </exemplum>
   <exemplum xml:lang="zh-TW">
-    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n62">
+    <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#biblzh-tw_n62-64">
       夕陽西下<space quantity="1" unit="minims"/>斷腸人在天涯</egXML>
   </exemplum>
   <remarks versionDate="2005-01-14" xml:lang="en">
@@ -47169,11 +47300,13 @@ reading groups, each associated with witness specifications.</p>
     <ptr target="#TCAPEN"/>
   </listRef>
 </elementSpec>
-<elementSpec module="textcrit" ident="listApp">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="textcrit" ident="listApp">
   <gloss versionDate="2012-08-14" xml:lang="en">list of apparatus entries</gloss>
   <gloss versionDate="2012-07-14" xml:lang="fr">liste d'entrées dans un apparat critique</gloss>
+  <gloss versionDate="2021-02-02" xml:lang="it">lista delle voci di un apparato critico</gloss>
   <desc versionDate="2012-07-15" xml:lang="en">contains a list of apparatus entries.</desc>
   <desc versionDate="2012-07-14" xml:lang="fr">contient une liste d'entrées dans un apparat critique.</desc>
+  <desc versionDate="2021-02-02" xml:lang="it">contiene una lista delle voci di un apparato critico.</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="att.sortable"/>
@@ -47998,7 +48131,7 @@ witness.</desc>
 <div><head>Strategies for Encoding Variation</head></div>
 <div><head>Module for Critical Apparatus</head>
 <moduleSpec xml:id="DTC" ident="textcrit">
-      <altIdent type="FPI">Text Criticism</altIdent>
+      <idno type="FPI">Text Criticism</idno>
       <desc xml:lang="en" versionDate="2018-07-12">Critical Apparatus</desc>
       <desc xml:lang="fr" versionDate="2018-07-09">Apparat critique</desc>
       <desc xml:lang="zh-TW" versionDate="2018-07-09">學術編輯註解</desc>
@@ -48100,9 +48233,9 @@ or external to it.</desc>
       <constraintSpec ident="variantEncodingLocation" scheme="schematron">
         <constraint>
           <sch:rule context="tei:variantEncoding">
-            <sch:assert test="(@location != 'external') or (@method != 'parallel-segmentation')">
+            <sch:report test="@location eq 'external'  and  @method eq 'parallel-segmentation'">
               The @location value "external" is inconsistent with the
-              parallel-segmentation method of apparatus markup.</sch:assert>
+              parallel-segmentation method of apparatus markup.</sch:report>
           </sch:rule>
         </constraint>
       </constraintSpec>
@@ -48921,16 +49054,16 @@ different witnesses.
   </exemplum>
   <exemplum xml:lang="en" versionDate="2019-07-15">
     <egXML xmlns="http://www.tei-c.org/ns/Examples">
-      <p>The <roleName role="#solicitor_general">S.G.</roleName> is the only national public official,
+      <p>The <roleName role="solicitor_general">S.G.</roleName> is the only national public official,
       including the Supreme Court justices, required by statute to be “learned in the law.”</p>
     </egXML>
   </exemplum>
   <exemplum xml:lang="en" versionDate="2019-07-15">
     <egXML xmlns="http://www.tei-c.org/ns/Examples">
-      <p><persName ref="#NJF"><roleName role="#solicitor_general">Solicitor General</roleName> Noel J. Francisco</persName>,
+      <p><persName ref="#NJF"><roleName role="solicitor_general">Solicitor General</roleName> Noel J. Francisco</persName>,
       representing the administration, asserted in rebuttal that there was nothing to disavow (...)
       <persName ref="#NJF">Francisco</persName> had violated the scrupulous standard of candor about the facts and
-      the law that <roleName role="#solicitor_general">S.G.s</roleName>, in Republican and Democratic administrations
+      the law that <roleName role="solicitor_general">S.G.s</roleName>, in Republican and Democratic administrations
       alike, have repeatedly said they must honor.</p>
     </egXML>
   </exemplum>
@@ -50439,7 +50572,7 @@ different witnesses.
     <ptr target="#CCAHPA"/>
   </listRef>
 </elementSpec>
-<elementSpec module="namesdates" ident="listOrg">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="namesdates" ident="listOrg">
   <gloss versionDate="2007-07-04" xml:lang="en">list of organizations</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">조직 목록</gloss>
   <gloss versionDate="2008-04-06" xml:lang="es">lista de organizaciones</gloss>
@@ -50525,12 +50658,14 @@ different witnesses.
     <ptr target="#NDORG"/>
   </listRef>
 </elementSpec>
-<elementSpec module="namesdates" ident="listEvent">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="namesdates" ident="listEvent">
   <gloss versionDate="2009-01-21" xml:lang="en">list of events</gloss>
   <gloss xml:lang="fr" versionDate="2009-03-19">liste d'événements</gloss>
+  <gloss versionDate="2021-02-02" xml:lang="it">list di eventi</gloss>
   <desc versionDate="2009-01-21" xml:lang="en">contains a list of descriptions, each of which provides information
     about an identifiable event.</desc>
   <desc versionDate="2009-03-19" xml:lang="fr">contient une liste de descriptions, chacune d'entre elles fournissant des informations sur un événement connu.</desc>
+  <desc versionDate="2021-02-02" xml:lang="it">contiene una lista di descrizioni, ognuna delle quali fornisce informazioni a proposito di un determinato evento.</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="att.typed"/>
@@ -50598,7 +50733,7 @@ raiders and saved the town from capture.</desc>
     <ptr target="#NDPERSbp"/>
   </listRef>
 </elementSpec>
-<elementSpec module="namesdates" ident="listPerson">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="namesdates" ident="listPerson">
   <gloss versionDate="2007-07-04" xml:lang="en">list of persons</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">개인 목록</gloss>
   <gloss versionDate="2008-04-06" xml:lang="es">lista de personas</gloss>
@@ -50622,7 +50757,7 @@ raiders and saved the town from capture.</desc>
     los participantes de una interacción verbal o las personas referidas en una fuente histórica.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">contiene una lista di descrizioni, ciascuna delle quali
     fornisce informazioni relative a una persona specifica o a un gruppo di persone, per esempio i
-    partecipanti a un'interazione verbale o le persone identificate da una fonte storica</desc>
+    partecipanti a un'interazione verbale o le persone identificate da una fonte storica</desc>  
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="att.typed"/>
@@ -50693,7 +50828,7 @@ raiders and saved the town from capture.</desc>
     <ptr target="#CCAS2"/>
   </listRef>
 </elementSpec>
-<elementSpec module="namesdates" ident="listPlace">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="namesdates" ident="listPlace">
   <gloss versionDate="2007-07-04" xml:lang="en">list of places</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">장소 목록</gloss>
   <gloss versionDate="2008-04-06" xml:lang="es">lista de lugares</gloss>
@@ -52827,12 +52962,14 @@ specification.</p></remarks>
     <ptr target="#NDOBJ"/>
   </listRef>
  </elementSpec>
-<elementSpec module="namesdates" ident="listObject">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="namesdates" ident="listObject">
   <gloss versionDate="2018-07-15" xml:lang="en">list of objects</gloss>
   <gloss versionDate="2019-01-22" xml:lang="de">Liste der Objekte</gloss>
+  <gloss versionDate="2021-02-02" xml:lang="it">lista di oggetti</gloss>
   <desc versionDate="2019-01-22" xml:lang="en">contains a list of descriptions, each of which provides information about an
     identifiable physical object.</desc>
   <desc versionDate="2019-01-22" xml:lang="de">enthält eine Liste von Beschreibungen, die jeweils Informationen zu einem identifizierbaren physischen Objekt liefern.</desc>
+  <desc versionDate="2021-02-02" xml:lang="it">contiene una lista di descrizioni, ognuna delle quali fornisce informazioni a proposito di un determinato oggetto fisico.</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="att.typed"/>
@@ -52920,7 +53057,7 @@ specification.</p></remarks>
     <memberOf key="model.biblPart"/>
   </classes>
   <content>
-    <alternate minOccurs="0" maxOccurs="unbounded">
+    <alternate minOccurs="1" maxOccurs="unbounded">
       <classRef key="model.placeNamePart"/>
       <elementRef key="institution"/>
       <elementRef key="repository"/>
@@ -52932,11 +53069,6 @@ specification.</p></remarks>
       <elementRef key="address"/>
     </alternate>
    </content>
-  <constraintSpec scheme="schematron" ident="objectIdentifier_minimal">
-    <constraint>
-      <report xmlns="http://purl.oclc.org/dsdl/schematron" test="not(count(*) gt 0)">An objectIdentifier must contain at minimum a single piece of locating or identifying information.</report>
-    </constraint>
-  </constraintSpec>
   <exemplum xml:lang="en">
     <egXML xmlns="http://www.tei-c.org/ns/Examples">
       <objectIdentifier>
@@ -53060,7 +53192,7 @@ specification.</p></remarks>
     <ptr target="#NDNYM" type="div2"/>
   </listRef>
 </elementSpec>
-<elementSpec module="namesdates" ident="listNym">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="namesdates" ident="listNym">
   <gloss versionDate="2007-07-04" xml:lang="en">list of canonical names</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">표준 이름 목록</gloss>
   <gloss versionDate="2008-04-06" xml:lang="es">lista de nombres canónicos</gloss>
@@ -53280,16 +53412,16 @@ one initial.</desc>
     relative a luoghi e relazioni corrispondenti</desc>
 </classSpec>
 <classSpec module="namesdates" xml:id="DATABLEISO" type="atts" predeclare="true" ident="att.datable.iso">
-  <desc versionDate="2007-04-09" xml:lang="en">provides attributes for normalization of elements that contain datable events using the ISO 8601 standard.</desc>
-  <desc versionDate="2007-12-20" xml:lang="ko">ISO 8601 표준을 사용해서 날짜를 추정할 수 있는 사건을 포함하는 요소의 규격화를 위한 속성을 제공한다.</desc>
-  <desc versionDate="2007-05-02" xml:lang="zh-TW">用於紀錄規格化時間的屬性，該規格使用ISO 8601標準</desc>
-  <desc versionDate="2008-04-05" xml:lang="ja">ISO8601に従い，時間事象の正規的方法を示す属性を示す．</desc>
-  <desc versionDate="2009-03-19" xml:lang="fr">fournit des attributs pour la normalisation, selon la norme ISO 8601, d'éléments contenant des évènements
+  <desc versionDate="2022-03-23" xml:lang="en">provides attributes for normalization of elements that contain datable events using the ISO 8601:2004 standard.</desc>
+  <desc versionDate="2022-03-23" xml:lang="ko">ISO 8601:2004 표준을 사용해서 날짜를 추정할 수 있는 사건을 포함하는 요소의 규격화를 위한 속성을 제공한다.</desc>
+  <desc versionDate="2022-03-23" xml:lang="zh-TW">用於紀錄規格化時間的屬性，該規格使用ISO 8601:2004標準</desc>
+  <desc versionDate="2022-03-23" xml:lang="ja">ISO8601:2004に従い，時間事象の正規的方法を示す属性を示す．</desc>
+  <desc versionDate="2022-03-23" xml:lang="fr">fournit des attributs pour la normalisation, selon la norme ISO 8601:2004, d'éléments contenant des évènements
         datables.</desc>
-  <desc versionDate="2007-11-06" xml:lang="it">indica attributi per la normalizzazione tramite lo standard ISO 8601 di elementi che contengono eventi
+  <desc versionDate="2022-03-23" xml:lang="it">indica attributi per la normalizzazione tramite lo standard ISO 8601:2004 di elementi che contengono eventi
         databili</desc>
-  <desc versionDate="2007-05-04" xml:lang="es">proporciona atributos para la normalización de elementos que contienen eventos datables usando el
-        estándard ISO 8601.</desc>
+  <desc versionDate="2022-03-23" xml:lang="es">proporciona atributos para la normalización de elementos que contienen eventos datables usando el
+        estándard ISO 8601:2004.</desc>
   <attList>
     <!-- org="choice">-->
     <attDef ident="when-iso" usage="opt">
@@ -53297,7 +53429,7 @@ one initial.</desc>
       <desc versionDate="2007-12-20" xml:lang="ko">표준형의 날짜 또는 시간 값을 제시한다.</desc>
       <desc versionDate="2008-04-06" xml:lang="es">proporciona el valor de fecha o de tiempo en una forma estándar.</desc>
       <desc versionDate="2008-04-05" xml:lang="ja">日付や時間を，標準形式で示す．</desc>
-      <desc versionDate="2008-12-09" xml:lang="fr">précise une date exacte pour l'évènement selon la forme normalisée ISO 8601, c'est-à-dire
+      <desc versionDate="2008-12-09" xml:lang="fr">précise une date exacte pour l'évènement selon la forme normalisée ISO 8601:2004, c'est-à-dire
                 aaaa-mm-jj.</desc>
       <desc versionDate="2007-11-06" xml:lang="it">indica il valore di una data o di un orario in un formato standard</desc>
       <datatype><dataRef key="teidata.temporal.iso"/></datatype>
@@ -53397,7 +53529,7 @@ one initial.</desc>
   <remarks versionDate="2008-07-23" xml:lang="en">
     <p>The value of these attributes should be a normalized
     representation of the date, time, or combined date & time
-    intended, in any of the standard formats specified by ISO 8601,
+    intended, in any of the standard formats specified by ISO 8601:2004,
     using the Gregorian calendar.</p>
     <p>If both <att>when-iso</att> and <att>dur-iso</att> are specified, the values should be interpreted as indicating a span of time by its
       starting time (or date) and duration. That is, <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#UND"><date when-iso="2007-06-01" dur-iso="P8D"/></egXML> indicates the same time period as <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#UND"><date when-iso="2007-06-01/P8D"/></egXML>
@@ -53405,9 +53537,9 @@ one initial.</desc>
     <p>In providing a <soCalled>regularized</soCalled> form, no claim is made that the form in the source text is incorrect; the regularized form
       is simply that chosen as the main form for purposes of unifying variant forms under a single heading.</p>
   </remarks>
-  <remarks versionDate="2019-03-29" xml:lang="ja"><p>この属性の値は，グレゴリオ暦を用い、ISO8601で定義されるいずれかの標準形式で正規化された日付や時刻，あるいはその組み合わせである。</p>
+  <remarks versionDate="2019-03-29" xml:lang="ja"><p>この属性の値は，グレゴリオ暦を用い、ISO8601:2004で定義されるいずれかの標準形式で正規化された日付や時刻，あるいはその組み合わせである。</p>
     
-    <p> 属性<att>when-iso</att>の値は，ISO8601に従った，日付や時間，ま たはその組み合わせになる．属性<att>calendar</att>がある場合に は，要素内容の歴システムが示される．属<att>calendar</att>は，
+    <p> 属性<att>when-iso</att>の値は，ISO8601:2004に従った，日付や時間，ま たはその組み合わせになる．属性<att>calendar</att>がある場合に は，要素内容の歴システムが示される．属<att>calendar</att>は，
       属性<att>when</att>
       <att>when-iso</att>の歴システムを示すもので はない．これは普通はグレゴリオ暦になる． </p>
     <p> 属性<att>when-iso</att>と<att>dur-iso</att>が付与されている場合， 当該属性値は時間幅を示し，それぞれ始点と幅を示すものになる． 例えば，以下のような場合， <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#UND"><date when-iso="2007-06-01" dur-iso="P8D"/></egXML> この記述は，以下のようにも書くことができる． <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#UND"><date when-iso="2007-06-01/P8D"/></egXML>
@@ -53416,7 +53548,7 @@ one initial.</desc>
   </remarks>
   <remarks versionDate="2009-03-19" xml:lang="fr">
     <p>La valeur de <att>when-iso</att> doit être une représentation normalisée de la date, de la durée ou d'une combinaison de date et de
-    durée, dans l'un des formats spécifiés dans ISO 8601, selon le calendrier grégorien.</p>
+    durée, dans l'un des formats spécifiés dans ISO 8601:2004, selon le calendrier grégorien.</p>
     <p>Si les attributs <att>when-iso</att> et <att>dur-iso</att> sont tous les deux spécifiés, les valeurs doivent être interprétées comme
       indiquant un intervalle de temps au moyen de son point de départ (ou date) et de sa durée. C'est à dire, <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#UND"><date when-iso="2007-06-01" dur-iso="P8D"/></egXML> indique la même période temporelle que <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#UND"><date when-iso="2007-06-01/P8D"/></egXML>
     </p>
@@ -53515,12 +53647,12 @@ one initial.</desc>
          <dataRef name="token" restriction="[0-9.,DHMPRSTWYZ/:+\-]+"/>
       </alternate>
    </content>
-  <remarks versionDate="2007-04-13" xml:lang="en">
+  <remarks versionDate="2022-03-23" xml:lang="en">
       <p>If it is likely that the value used is to be compared with another, then a time zone
       indicator should always be included, and only the dateTime representation should be used.</p>
-      <p>For all representations for which ISO 8601 describes both a <term>basic</term> and an
+      <p>For all representations for which ISO 8601:2004 describes both a <term>basic</term> and an
         <term>extended</term> format, these Guidelines recommend use of the extended format.</p>
-      <p>While ISO 8601 permits the use of both <code>00:00</code> and <code>24:00</code> to represent
+      <p>While ISO 8601:2004 permits the use of both <code>00:00</code> and <code>24:00</code> to represent
       midnight, these Guidelines strongly recommend against the use of <code>24:00</code>.
       <!-- As
     there are only 24 hours in a day, numbered "00" through "23", use
@@ -53528,10 +53660,10 @@ one initial.</desc>
     Note that when there is a leap second, it should be indicated with
     23:59:60. --></p>
   </remarks>
-  <remarks xml:lang="ja" versionDate="2008-04-05">
+  <remarks xml:lang="ja" versionDate="2022-03-23">
       <p> 当該属性値が他の値と比較される場合，時間帯は必ず示されるべきである． またはdateTimeを使うべきである(訳注：この文は修正されるかもしれな い)． </p>
-      <p> ISO 8601には<term>基本形式</term>と<term>拡張形式</term>がある． 本ガイドラインでは拡張形式を使うことを推奨する． </p>
-      <p> ISO 8601では，深夜の12時を示す方法として， <code>00:00</code>と<code>24:00</code>の両方を認めているが，
+      <p> ISO 8601:2004には<term>基本形式</term>と<term>拡張形式</term>がある． 本ガイドラインでは拡張形式を使うことを推奨する． </p>
+      <p> ISO 8601:2004では，深夜の12時を示す方法として， <code>00:00</code>と<code>24:00</code>の両方を認めているが，
         本ガイドラインでは，<code>24:00</code>とは表記しないことを強く推奨 している．
       <!-- As there are only 24 hours in a day, numbered "00" through "23",
     use of "24:00" implies a 25th hour, and some software may be
@@ -53539,14 +53671,14 @@ one initial.</desc>
     indicated with 23:59:60. -->
     </p>
   </remarks>
-  <remarks xml:lang="fr" versionDate="2007-06-12">
+  <remarks xml:lang="fr" versionDate="2022-03-23">
       <p> S'il est vraisemblable que la valeur utilisée soit destinée à être comparer à d’autres
       valeurs, alors une indication du fuseau horaire devrait toujours être incluse, et seule la
       représentation <term>dateTime</term> devrait être employée.</p>
-      <p>Pour toutes les représentations pour lesquelles l’ISO 8601 décrit à la fois un format
+      <p>Pour toutes les représentations pour lesquelles l’ISO 8601:2004 décrit à la fois un format
         <term>basique</term> et un format<term> étendu </term>, ce guide d’encodage recommandande
       l’emploi du format <term> étendu </term>.</p>
-      <p> Même si l’ ISO 8601 permet d’écrire à la fois <code>00:00</code> et <code>24:00</code> pour
+      <p> Même si l’ ISO 8601:2004 permet d’écrire à la fois <code>00:00</code> et <code>24:00</code> pour
       minuit, ce guide d’encodage déconseille vivement d’écrire <code>24:00</code>.
       <!-- As
         there are only 24 hours in a day, numbered "00" through "23", use
@@ -53639,7 +53771,7 @@ one initial.</desc>
 <div type="div2" xml:id="NDDATECUSTOM"><head>Using Non-Gregorian Calendars</head></div></div>
 <div><head>Module for Names and Dates</head>
 <moduleSpec xml:id="DND" ident="namesdates">
-        <altIdent type="FPI">Names, dates, persons and places</altIdent>
+        <idno type="FPI">Names, dates, persons and places</idno>
         <desc xml:lang="en" versionDate="2006-09-13">Names and dates</desc>
         <desc xml:lang="fr" versionDate="2018-07-12">Noms, dates, personnes et lieux</desc>
         <desc xml:lang="zh-TW" versionDate="2018-07-12">名稱與日期</desc>
@@ -54253,7 +54385,7 @@ purposes.</p>
 <div type="div3" xml:id="FTGRAMPEG"><head>Photographic and Motion Video Formats</head></div></div>
 <div><head>Module for Tables, Formulæ, Notated Music, and Graphics</head>
 <moduleSpec xml:id="DFTFF" ident="figures">
-      <altIdent type="FPI">Tables, Formulæ, Notated Music, Figures</altIdent>
+      <idno type="FPI">Tables, Formulæ, Notated Music, Figures</idno>
       <desc xml:lang="en" versionDate="2018-07-12">Tables, formulæ, notated music, and figures</desc>
       <desc xml:lang="fr" versionDate="2018-07-09">Tableaux, formules et graphiques</desc>
       <desc xml:lang="zh-TW" versionDate="2018-07-09">表格、方程式與圖表</desc>
@@ -54264,7 +54396,7 @@ purposes.</p>
 <div type="div1" xml:id="CC" n="23"><head>Language Corpora</head>
 <div type="div2" xml:id="CCDEF"><head>Varieties of Composite Text</head></div>
 <div type="div2" xml:id="CCAH"><head>Contextual Information</head>
-<elementSpec module="corpus" ident="textDesc">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="corpus" ident="textDesc">
   <gloss versionDate="2005-01-14" xml:lang="en">text description</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">텍스트 기술</gloss>
   <gloss versionDate="2007-05-02" xml:lang="zh-TW">文本描述</gloss>
@@ -54343,7 +54475,7 @@ situational parameters.</desc>
     <ptr target="#CCAHTD"/>
   </listRef>
 </elementSpec>
-<elementSpec module="corpus" ident="particDesc">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="corpus" ident="particDesc">
     <gloss versionDate="2005-01-14" xml:lang="en">participation description</gloss>
     <gloss versionDate="2007-12-20" xml:lang="ko">참여 기술</gloss>
     <gloss versionDate="2007-05-02" xml:lang="zh-TW">參與描述</gloss>
@@ -54443,7 +54575,7 @@ situational parameters.</desc>
     <ptr target="#CCAS2"/>-->
     </listRef>
 </elementSpec>
-<elementSpec module="corpus" ident="settingDesc">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="corpus" ident="settingDesc">
     <gloss versionDate="2005-01-14" xml:lang="en">setting description</gloss>
     <gloss versionDate="2007-12-20" xml:lang="ko">무대 기술</gloss>
     <gloss versionDate="2007-05-02" xml:lang="zh-TW">背景描述</gloss>
@@ -55836,7 +55968,7 @@ Information with a Text</head>
 <div type="div2" xml:id="CCREC"><head>Recommendations for the Encoding of Large Corpora</head></div>
 <div><head>Module for Language Corpora</head>
 <moduleSpec xml:id="DCCHDR" ident="corpus">
-    <altIdent type="FPI">Metadata for Language Corpora</altIdent>
+    <idno type="FPI">Metadata for Language Corpora</idno>
     <desc xml:lang="en" versionDate="2018-07-12">Corpus texts</desc>
     <desc xml:lang="fr" versionDate="2018-07-09">Corpus linguistiques</desc>
     <desc xml:lang="zh-TW" versionDate="2018-07-09">文集文本</desc>
@@ -56090,6 +56222,7 @@ Information with a Text</head>
   <remarks versionDate="2005-01-14" xml:lang="en">
     <p>The <gi>ab</gi> element may be used at the encoder's discretion to mark any component-level elements in a text for which no other more specific appropriate markup is defined.</p>
   </remarks>
+  <remarks versionDate="2022-05-02" xml:lang="es"><p>El elemento <gi>ab</gi> se puede utilizar a discreción del codificador para marcar cualquier elemento a nivel de componente en un texto para el que no se haya definido ningún otro marcado apropiado más específico.</p></remarks>
   <remarks xml:lang="fr" versionDate="2009-10-06">
     <p>L'élément <gi>ab</gi> peut être utilisé à la discrétion de l'encodeur pour marquer dans un texte tout élément de niveau composant pour lequel aucune méthode appropriée de balisage plus spécifique n'est définie.</p>
   </remarks>
@@ -57519,7 +57652,7 @@ You must supply at least two values for @target on <name/>
 <div type="div2" xml:id="SAAN"><head>Connecting Analytic and Textual Markup</head></div>
 <div type="div2" xml:id="SAref"><head>Module for Linking, Segmentation, and Alignment</head>
 <moduleSpec xml:id="DSA" ident="linking">
-    <altIdent type="FPI">Linking, Segmentation, and Alignment</altIdent>
+    <idno type="FPI">Linking, Segmentation, and Alignment</idno>
     <desc xml:lang="en" versionDate="2019-07-07">Linking, segmentation, and alignment</desc>
     <desc xml:lang="fr" versionDate="2018-07-12">Liens, segmentation et alignement</desc>
     <desc xml:lang="zh-TW" versionDate="2020-12-20">連結、分割與隊列</desc>
@@ -58727,65 +58860,6 @@ The attributes @to and @from on <name/> may each contain only a single value</re
     </constraint>
   </constraintSpec>
   <attList>
-    <!--
-        The following <attDef> is a copy of the one in the
-        specifications of <interpGrp>, <span>, and <spanGrp>. It
-        *should* be part of the specification of att.interpLike rather
-        than in the specifications of the individual members of that
-        class. However, a bug in the Stylesheets means that won't work
-        at the moment. (See Stylesheets issue #370.)
-    -->
-    <attDef ident="type" usage="rec" mode="replace">
-      <desc versionDate="2005-10-10" xml:lang="en">indicates what kind of phenomenon is being noted in the passage.</desc>
-      <desc versionDate="2007-12-20" xml:lang="ko">현 단락에 표기되고 있는 현상의 종류를 나타낸다.</desc>
-      <desc versionDate="2007-05-02" xml:lang="zh-TW">指出段落中所註解的現象類別。</desc>
-      <desc versionDate="2008-04-05" xml:lang="ja">当該部分で，どのような面が指摘されているのかを示す．</desc>
-      <desc versionDate="2007-06-12" xml:lang="fr">indique quel genre de phénomène est noté dans le
-      passage.</desc>
-      <desc versionDate="2007-05-04" xml:lang="es">indica que tipo de fenómeno está siendo anotado en el pasaje.</desc>
-      <desc versionDate="2007-01-21" xml:lang="it">indica quale sia il fenomeno osservato nella porzione di testo in questione</desc>
-      <datatype><dataRef key="teidata.enumerated"/></datatype>
-      <valList type="open">
-        <valItem ident="image">
-          <desc versionDate="2007-06-27" xml:lang="en">identifies an image in the passage.</desc>
-          <desc versionDate="2007-12-20" xml:lang="ko">단락에서 이미지를 식별한다.</desc>
-          <desc versionDate="2007-05-02" xml:lang="zh-TW">標明段落中的影像。</desc>
-          <desc versionDate="2008-04-06" xml:lang="es">identifica una imagen en el pasaje.</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該部分の画像を指示する．</desc>
-          <desc versionDate="2008-03-30" xml:lang="fr">identifie une image dans le passage.</desc>
-          <desc versionDate="2007-01-21" xml:lang="it">identifica un'immagine all'interno della porzione di testo</desc>
-        </valItem>
-        <valItem ident="character">
-          <desc versionDate="2007-06-27" xml:lang="en">identifies a character associated with the passage.</desc>
-          <desc versionDate="2007-12-20" xml:lang="ko">단락과 연관된 문자를 식별한다.</desc>
-          <desc versionDate="2007-05-02" xml:lang="zh-TW">標明與段落相關聯的人物。</desc>
-          <desc versionDate="2008-04-06" xml:lang="es">identifica un carácter asociado al pasaje.</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該部分に関連する文字を指示する．</desc>
-          <desc versionDate="2009-05-27" xml:lang="fr">identifie un personnage associé au
-          passage.</desc>
-          <desc versionDate="2007-01-21" xml:lang="it">identifica un personaggio associato al brano in questione</desc>
-        </valItem>
-        <valItem ident="theme">
-          <desc versionDate="2007-06-27" xml:lang="en">identifies a theme in the passage.</desc>
-          <desc versionDate="2007-12-20" xml:lang="ko">단락에서 주제를 식별한다.</desc>
-          <desc versionDate="2007-05-02" xml:lang="zh-TW">標明段落中的主題。</desc>
-          <desc versionDate="2008-04-06" xml:lang="es">identifica un tema en el pasaje.</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該部分にあるテーマを指示する．</desc>
-          <desc versionDate="2008-03-30" xml:lang="fr">identifie un thème dans le passage.</desc>
-          <desc versionDate="2007-01-21" xml:lang="it">identifica un tema rispetto al brano in questione</desc>
-        </valItem>
-        <valItem ident="allusion">
-          <desc versionDate="2007-06-27" xml:lang="en">identifies an allusion to another text.</desc>
-          <desc versionDate="2007-12-20" xml:lang="ko">다른 텍스트에 대한 언급을 식별한다.</desc>
-          <desc versionDate="2007-05-02" xml:lang="zh-TW">標明另一個文本的引用。</desc>
-          <desc versionDate="2008-04-06" xml:lang="es">identifica una alusión a otro texto.</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">別テキストへの言及．</desc>
-          <desc versionDate="2008-03-30" xml:lang="fr">identifie une allusion à un autre
-          texte.</desc>
-          <desc versionDate="2007-01-21" xml:lang="it">identifica un'allusione a un altro testo</desc>
-        </valItem>
-      </valList>
-    </attDef>
     <attDef ident="from" usage="opt">
       <desc versionDate="2013-01-15" xml:lang="en">gives the identifier of the node which is the starting point of the span of text being annotated; if not accompanied by a <att>to</att> attribute, gives the identifier of the node of the entire span of text being annotated.</desc>
       <desc versionDate="2007-12-20" xml:lang="ko">현재 부호를 붙이는 단락의 처음을 명시함; <att>to</att> 속성과 같이 쓰이지 않으면
@@ -58868,67 +58942,6 @@ The attributes @to and @from on <name/> may each contain only a single value</re
       <elementRef key="span" minOccurs="0" maxOccurs="unbounded"/>
     </sequence>
   </content>
-  <attList>
-    <!--
-        The following <attDef> is a copy of the one in the
-        specifications of <interpGrp>, <span>, and <spanGrp>. It
-        *should* be part of the specification of att.interpLike rather
-        than in the specifications of the individual members of that
-        class. However, a bug in the Stylesheets means that won't work
-        at the moment. (See Stylesheets issue #370.)
-    -->
-    <attDef ident="type" usage="rec" mode="replace">
-      <desc versionDate="2005-10-10" xml:lang="en">indicates what kind of phenomenon is being noted in the passage.</desc>
-      <desc versionDate="2007-12-20" xml:lang="ko">현 단락에 표기되고 있는 현상의 종류를 나타낸다.</desc>
-      <desc versionDate="2007-05-02" xml:lang="zh-TW">指出段落中所註解的現象類別。</desc>
-      <desc versionDate="2008-04-05" xml:lang="ja">当該部分で，どのような面が指摘されているのかを示す．</desc>
-      <desc versionDate="2007-06-12" xml:lang="fr">indique quel genre de phénomène est noté dans le
-      passage.</desc>
-      <desc versionDate="2007-05-04" xml:lang="es">indica que tipo de fenómeno está siendo anotado en el pasaje.</desc>
-      <desc versionDate="2007-01-21" xml:lang="it">indica quale sia il fenomeno osservato nella porzione di testo in questione</desc>
-      <datatype><dataRef key="teidata.enumerated"/></datatype>
-      <valList type="open">
-        <valItem ident="image">
-          <desc versionDate="2007-06-27" xml:lang="en">identifies an image in the passage.</desc>
-          <desc versionDate="2007-12-20" xml:lang="ko">단락에서 이미지를 식별한다.</desc>
-          <desc versionDate="2007-05-02" xml:lang="zh-TW">標明段落中的影像。</desc>
-          <desc versionDate="2008-04-06" xml:lang="es">identifica una imagen en el pasaje.</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該部分の画像を指示する．</desc>
-          <desc versionDate="2008-03-30" xml:lang="fr">identifie une image dans le passage.</desc>
-          <desc versionDate="2007-01-21" xml:lang="it">identifica un'immagine all'interno della porzione di testo</desc>
-        </valItem>
-        <valItem ident="character">
-          <desc versionDate="2007-06-27" xml:lang="en">identifies a character associated with the passage.</desc>
-          <desc versionDate="2007-12-20" xml:lang="ko">단락과 연관된 문자를 식별한다.</desc>
-          <desc versionDate="2007-05-02" xml:lang="zh-TW">標明與段落相關聯的人物。</desc>
-          <desc versionDate="2008-04-06" xml:lang="es">identifica un carácter asociado al pasaje.</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該部分に関連する文字を指示する．</desc>
-          <desc versionDate="2009-05-27" xml:lang="fr">identifie un personnage associé au
-          passage.</desc>
-          <desc versionDate="2007-01-21" xml:lang="it">identifica un personaggio associato al brano in questione</desc>
-        </valItem>
-        <valItem ident="theme">
-          <desc versionDate="2007-06-27" xml:lang="en">identifies a theme in the passage.</desc>
-          <desc versionDate="2007-12-20" xml:lang="ko">단락에서 주제를 식별한다.</desc>
-          <desc versionDate="2007-05-02" xml:lang="zh-TW">標明段落中的主題。</desc>
-          <desc versionDate="2008-04-06" xml:lang="es">identifica un tema en el pasaje.</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">当該部分にあるテーマを指示する．</desc>
-          <desc versionDate="2008-03-30" xml:lang="fr">identifie un thème dans le passage.</desc>
-          <desc versionDate="2007-01-21" xml:lang="it">identifica un tema rispetto al brano in questione</desc>
-        </valItem>
-        <valItem ident="allusion">
-          <desc versionDate="2007-06-27" xml:lang="en">identifies an allusion to another text.</desc>
-          <desc versionDate="2007-12-20" xml:lang="ko">다른 텍스트에 대한 언급을 식별한다.</desc>
-          <desc versionDate="2007-05-02" xml:lang="zh-TW">標明另一個文本的引用。</desc>
-          <desc versionDate="2008-04-06" xml:lang="es">identifica una alusión a otro texto.</desc>
-          <desc versionDate="2008-04-05" xml:lang="ja">別テキストへの言及．</desc>
-          <desc versionDate="2008-03-30" xml:lang="fr">identifie une allusion à un autre
-          texte.</desc>
-          <desc versionDate="2007-01-21" xml:lang="it">identifica un'allusione a un altro testo</desc>
-        </valItem>
-      </valList>
-    </attDef>
-  </attList>
   <exemplum xml:lang="en">
     <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#CONAAB-eg-150">
       <u xml:id="UU1">Can I have ten oranges and a kilo of bananas please?</u>
@@ -58988,67 +59001,6 @@ The attributes @to and @from on <name/> may each contain only a single value</re
       <classRef key="model.certLike"/>
     </alternate>
   </content>
-  <attList>
-    <!--
-	The following <attDef> is a copy of the one in the
-	specifications of <interpGrp>, <span>, and <spanGrp>. It
-	*should* be part of the specification of att.interpLike rather
-	than in the specifications of the individual members of that
-	class. However, a bug in the Stylesheets means that won't work
-	at the moment. (See Stylesheets issue #370.)
-    -->
-    <attDef ident="type" usage="rec" mode="replace">
-      <desc versionDate="2005-10-10" xml:lang="en">indicates what kind of phenomenon is being noted in the passage.</desc>
-      <desc versionDate="2007-12-20" xml:lang="ko">현 단락에 표기되고 있는 현상의 종류를 나타낸다.</desc>
-      <desc versionDate="2007-05-02" xml:lang="zh-TW">指出段落中所註解的現象類別。</desc>
-      <desc versionDate="2008-04-05" xml:lang="ja">当該部分で，どのような面が指摘されているのかを示す．</desc>
-      <desc versionDate="2007-06-12" xml:lang="fr">indique quel genre de phénomène est noté dans le
-      passage.</desc>
-      <desc versionDate="2007-05-04" xml:lang="es">indica que tipo de fenómeno está siendo anotado en el pasaje.</desc>
-      <desc versionDate="2007-01-21" xml:lang="it">indica quale sia il fenomeno osservato nella porzione di testo in questione</desc>
-      <datatype><dataRef key="teidata.enumerated"/></datatype>
-      <valList type="open">
-	<valItem ident="image">
-	  <desc versionDate="2007-06-27" xml:lang="en">identifies an image in the passage.</desc>
-	  <desc versionDate="2007-12-20" xml:lang="ko">단락에서 이미지를 식별한다.</desc>
-	  <desc versionDate="2007-05-02" xml:lang="zh-TW">標明段落中的影像。</desc>
-	  <desc versionDate="2008-04-06" xml:lang="es">identifica una imagen en el pasaje.</desc>
-	  <desc versionDate="2008-04-05" xml:lang="ja">当該部分の画像を指示する．</desc>
-	  <desc versionDate="2008-03-30" xml:lang="fr">identifie une image dans le passage.</desc>
-	  <desc versionDate="2007-01-21" xml:lang="it">identifica un'immagine all'interno della porzione di testo</desc>
-	</valItem>
-	<valItem ident="character">
-	  <desc versionDate="2007-06-27" xml:lang="en">identifies a character associated with the passage.</desc>
-	  <desc versionDate="2007-12-20" xml:lang="ko">단락과 연관된 문자를 식별한다.</desc>
-	  <desc versionDate="2007-05-02" xml:lang="zh-TW">標明與段落相關聯的人物。</desc>
-	  <desc versionDate="2008-04-06" xml:lang="es">identifica un carácter asociado al pasaje.</desc>
-	  <desc versionDate="2008-04-05" xml:lang="ja">当該部分に関連する文字を指示する．</desc>
-	  <desc versionDate="2009-05-27" xml:lang="fr">identifie un personnage associé au
-	  passage.</desc>
-	  <desc versionDate="2007-01-21" xml:lang="it">identifica un personaggio associato al brano in questione</desc>
-	</valItem>
-	<valItem ident="theme">
-	  <desc versionDate="2007-06-27" xml:lang="en">identifies a theme in the passage.</desc>
-	  <desc versionDate="2007-12-20" xml:lang="ko">단락에서 주제를 식별한다.</desc>
-	  <desc versionDate="2007-05-02" xml:lang="zh-TW">標明段落中的主題。</desc>
-	  <desc versionDate="2008-04-06" xml:lang="es">identifica un tema en el pasaje.</desc>
-	  <desc versionDate="2008-04-05" xml:lang="ja">当該部分にあるテーマを指示する．</desc>
-	  <desc versionDate="2008-03-30" xml:lang="fr">identifie un thème dans le passage.</desc>
-	  <desc versionDate="2007-01-21" xml:lang="it">identifica un tema rispetto al brano in questione</desc>
-	</valItem>
-	<valItem ident="allusion">
-	  <desc versionDate="2007-06-27" xml:lang="en">identifies an allusion to another text.</desc>
-	  <desc versionDate="2007-12-20" xml:lang="ko">다른 텍스트에 대한 언급을 식별한다.</desc>
-	  <desc versionDate="2007-05-02" xml:lang="zh-TW">標明另一個文本的引用。</desc>
-	  <desc versionDate="2008-04-06" xml:lang="es">identifica una alusión a otro texto.</desc>
-	  <desc versionDate="2008-04-05" xml:lang="ja">別テキストへの言及．</desc>
-	  <desc versionDate="2008-03-30" xml:lang="fr">identifie une allusion à un autre
-	  texte.</desc>
-	  <desc versionDate="2007-01-21" xml:lang="it">identifica un'allusione a un altro testo</desc>
-	</valItem>
-      </valList>
-    </attDef>
-  </attList>
   <exemplum xml:lang="en">
     <egXML xmlns="http://www.tei-c.org/ns/Examples">
       <interp type="structuralunit" xml:id="ana_am">aftermath</interp>
@@ -59108,67 +59060,6 @@ The attributes @to and @from on <name/> may each contain only a single value</re
       <elementRef key="interp" minOccurs="1" maxOccurs="unbounded"/>
     </sequence>
   </content>
-  <attList>
-    <!--
-	The following <attDef> is a copy of the one in the
-	specifications of <interpGrp>, <span>, and <spanGrp>. It
-	*should* be part of the specification of att.interpLike rather
-	than in the specifications of the individual members of that
-	class. However, a bug in the Stylesheets means that won't work
-	at the moment. (See Stylesheets issue #370.)
-    -->
-    <attDef ident="type" usage="rec" mode="replace">
-      <desc versionDate="2005-10-10" xml:lang="en">indicates what kind of phenomenon is being noted in the passage.</desc>
-      <desc versionDate="2007-12-20" xml:lang="ko">현 단락에 표기되고 있는 현상의 종류를 나타낸다.</desc>
-      <desc versionDate="2007-05-02" xml:lang="zh-TW">指出段落中所註解的現象類別。</desc>
-      <desc versionDate="2008-04-05" xml:lang="ja">当該部分で，どのような面が指摘されているのかを示す．</desc>
-      <desc versionDate="2007-06-12" xml:lang="fr">indique quel genre de phénomène est noté dans le
-      passage.</desc>
-      <desc versionDate="2007-05-04" xml:lang="es">indica que tipo de fenómeno está siendo anotado en el pasaje.</desc>
-      <desc versionDate="2007-01-21" xml:lang="it">indica quale sia il fenomeno osservato nella porzione di testo in questione</desc>
-      <datatype><dataRef key="teidata.enumerated"/></datatype>
-      <valList type="open">
-	<valItem ident="image">
-	  <desc versionDate="2007-06-27" xml:lang="en">identifies an image in the passage.</desc>
-	  <desc versionDate="2007-12-20" xml:lang="ko">단락에서 이미지를 식별한다.</desc>
-	  <desc versionDate="2007-05-02" xml:lang="zh-TW">標明段落中的影像。</desc>
-	  <desc versionDate="2008-04-06" xml:lang="es">identifica una imagen en el pasaje.</desc>
-	  <desc versionDate="2008-04-05" xml:lang="ja">当該部分の画像を指示する．</desc>
-	  <desc versionDate="2008-03-30" xml:lang="fr">identifie une image dans le passage.</desc>
-	  <desc versionDate="2007-01-21" xml:lang="it">identifica un'immagine all'interno della porzione di testo</desc>
-	</valItem>
-	<valItem ident="character">
-	  <desc versionDate="2007-06-27" xml:lang="en">identifies a character associated with the passage.</desc>
-	  <desc versionDate="2007-12-20" xml:lang="ko">단락과 연관된 문자를 식별한다.</desc>
-	  <desc versionDate="2007-05-02" xml:lang="zh-TW">標明與段落相關聯的人物。</desc>
-	  <desc versionDate="2008-04-06" xml:lang="es">identifica un carácter asociado al pasaje.</desc>
-	  <desc versionDate="2008-04-05" xml:lang="ja">当該部分に関連する文字を指示する．</desc>
-	  <desc versionDate="2009-05-27" xml:lang="fr">identifie un personnage associé au
-	  passage.</desc>
-	  <desc versionDate="2007-01-21" xml:lang="it">identifica un personaggio associato al brano in questione</desc>
-	</valItem>
-	<valItem ident="theme">
-	  <desc versionDate="2007-06-27" xml:lang="en">identifies a theme in the passage.</desc>
-	  <desc versionDate="2007-12-20" xml:lang="ko">단락에서 주제를 식별한다.</desc>
-	  <desc versionDate="2007-05-02" xml:lang="zh-TW">標明段落中的主題。</desc>
-	  <desc versionDate="2008-04-06" xml:lang="es">identifica un tema en el pasaje.</desc>
-	  <desc versionDate="2008-04-05" xml:lang="ja">当該部分にあるテーマを指示する．</desc>
-	  <desc versionDate="2008-03-30" xml:lang="fr">identifie un thème dans le passage.</desc>
-	  <desc versionDate="2007-01-21" xml:lang="it">identifica un tema rispetto al brano in questione</desc>
-	</valItem>
-	<valItem ident="allusion">
-	  <desc versionDate="2007-06-27" xml:lang="en">identifies an allusion to another text.</desc>
-	  <desc versionDate="2007-12-20" xml:lang="ko">다른 텍스트에 대한 언급을 식별한다.</desc>
-	  <desc versionDate="2007-05-02" xml:lang="zh-TW">標明另一個文本的引用。</desc>
-	  <desc versionDate="2008-04-06" xml:lang="es">identifica una alusión a otro texto.</desc>
-	  <desc versionDate="2008-04-05" xml:lang="ja">別テキストへの言及．</desc>
-	  <desc versionDate="2008-03-30" xml:lang="fr">identifie une allusion à un autre
-	  texte.</desc>
-	  <desc versionDate="2007-01-21" xml:lang="it">identifica un'allusione a un altro testo</desc>
-	</valItem>
-      </valList>
-    </attDef>
-  </attList>
   <exemplum xml:lang="en">
     <egXML xmlns="http://www.tei-c.org/ns/Examples">
       <interpGrp resp="#TMA" type="structuralunit">
@@ -59233,7 +59124,7 @@ interpretive framework -->
 <div type="div3" xml:id="AILASP"><head>Spoken Text</head></div></div>
 <div><head>Module for Analysis and Interpretation</head>
 <moduleSpec xml:id="DAI" ident="analysis">
-    <altIdent type="FPI">Analysis and Interpretation</altIdent>
+    <idno type="FPI">Analysis and Interpretation</idno>
     <desc xml:lang="en" versionDate="2006-09-13">Simple analytic mechanisms</desc>
     <desc xml:lang="fr" versionDate="2018-07-12">Mécanismes analytiques simples</desc>
     <desc xml:lang="zh-TW" versionDate="2018-07-12">簡易分析機制</desc>
@@ -60309,7 +60200,7 @@ human readability of the feature-system declaration.</p>
 <div type="div2" xml:id="FDEG"><head>A Complete Example</head></div></div>
 <div type="div2" xml:id="FSDEF"><head>Formal Definition and Implementation</head>
 <moduleSpec xml:id="DFS" ident="iso-fs">
-    <altIdent type="FPI">Feature Structures</altIdent>
+    <idno type="FPI">Feature Structures</idno>
     <desc xml:lang="en" versionDate="2006-09-13">Feature structures</desc>
     <desc xml:lang="fr" versionDate="2018-07-12">Structures de traits</desc>
     <desc xml:lang="zh-TW" versionDate="2018-07-12">功能結構 (Feature Structures)</desc>
@@ -63298,7 +63189,7 @@ trees (triangles).</p>
 <div xml:id="GDstem"><head>Representing Textual Transmission</head></div>
 <div><head>Module for Graphs, Networks, and Trees</head>
 <moduleSpec xml:id="DGD" ident="nets">
-    <altIdent type="FPI">Graphs, networks, and trees</altIdent>
+    <idno type="FPI">Graphs, networks, and trees</idno>
     <desc xml:lang="en" versionDate="2018-07-12">Graphs, networks, and trees</desc>
     <desc xml:lang="fr" versionDate="2018-07-09">Graphes, réseaux et arbres</desc>
     <desc xml:lang="zh-TW" versionDate="2018-07-09">圖形、網絡與樹狀結構</desc>
@@ -63901,7 +63792,7 @@ statement, or change log.</p>
 </elementSpec></div>
 <div><head>The Certainty Module</head>
 <moduleSpec xml:id="DCE" ident="certainty">
-  <altIdent type="FPI">Certainty and Uncertainty</altIdent>
+  <idno type="FPI">Certainty and Uncertainty</idno>
   <desc xml:lang="en" versionDate="2019-07-07">Certainty, Precision, and Responsibility</desc>
   <desc xml:lang="fr" versionDate="2018-07-12">Degré de certitude et responsabilité</desc>
   <desc xml:lang="zh-TW" versionDate="2018-07-12">確定程度與不確定程度</desc>
@@ -65134,6 +65025,13 @@ Child elements of <name/> are only allowed when an external module is being load
           </rule>
         </constraint>
       </constraintSpec>
+      <constraintSpec scheme="schematron" ident="not-except-and-include">
+        <constraint>
+          <rule xmlns="http://purl.oclc.org/dsdl/schematron" context="tei:moduleRef">
+            <report test="@except and @include">It is an error to supply both the @include and @except attributes</report>
+          </rule>
+        </constraint>
+      </constraintSpec>
       <remarks versionDate="2011-09-21" xml:lang="en">
         <p>Use of this attribute avoids name collisions (and
         thus invalid schemas) when the external schema being
@@ -65209,7 +65107,7 @@ RELAX NG par une localisation externe.</desc>
     </egXML>
   </exemplum>
   <remarks versionDate="2010-05-09" xml:lang="en">
-    <p>If neither <att>include</att> nor <att>exclude</att> is
+    <p>If neither <att>include</att> nor <att>except</att> is
     supplied, the effect of this element is to make all the declarations
     contained by the referenced module available to the schema being
     compiled. If both attributes are supplied, an ODD
@@ -65220,9 +65118,9 @@ processor should signal an error. </p>
     online source from which the specification of that module may be
     read. A URI may alternatively be supplied in the case of a non-TEI
     module, and this is expected to be written as a RELAX NG schema.
-    </p><p>If the <att>uri</att> attribute is used, the <gi>content</gi> element may also be supplied as 
+    </p><p>If the <att>url</att> attribute is used, the <gi>content</gi> element may also be supplied as 
     a child of this element. Its content (which is assumed to be a fragment of RELAX NG code) will be copied
-    along with the content of the resource indicated by the  <att>uri</att> attribute into the 
+    along with the content of the resource indicated by the  <att>url</att> attribute into the 
       target RELAX NG schema. </p>
   </remarks>
   <remarks xml:lang="fr" versionDate="2007-06-12">
@@ -65261,8 +65159,8 @@ module, i.e. a named and externally visible group of declarations.</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">いちモジュールの構造，内容，目的を記録する．例えば，外部から名前で参
   照可能な宣言集合などである．</desc>
   <desc versionDate="2007-06-12" xml:lang="fr">documente la structure, le contenu et les
-			fonctions d'un module, i.e. d'un groupe de déclarations nommé et 
-			visible extérieurement.</desc>
+                        fonctions d'un module, i.e. d'un groupe de déclarations nommé et 
+                        visible extérieurement.</desc>
   <desc versionDate="2007-05-04" xml:lang="es">documenta la estructura, el contenido y la finalidad de un único módulo, es decir, un grupo de declaraciones específicamente indicado y visible externamente.</desc>
   <desc versionDate="2007-01-21" xml:lang="it">documenta struttura, contenuto e scopo di un unico modulo, cioè un gruppo di dichiarazioni specificamente indicato ed esternamente visibile</desc>
   <classes>
@@ -65272,28 +65170,21 @@ module, i.e. a named and externally visible group of declarations.</desc>
     <memberOf key="att.typed"/>
   </classes>
   <content>
-    <sequence>
-      
+    <sequence>      
         <alternate minOccurs="0" maxOccurs="unbounded">
           <classRef key="model.glossLike"/>
+          <elementRef key="idno"/>
           <classRef key="model.descLike"/>
         </alternate>
-      
-      
         <elementRef key="exemplum" minOccurs="0" maxOccurs="unbounded"/>
-      
-      
         <elementRef key="remarks" minOccurs="0"/>
-      
-      
         <elementRef key="listRef" minOccurs="0" maxOccurs="unbounded"/>
-      
     </sequence>
   </content>
   <exemplum xml:lang="en">
     <egXML xmlns="http://www.tei-c.org/ns/Examples">
       <moduleSpec ident="namesdates">
-        <altIdent type="FPI">Names and Dates</altIdent>
+        <idno type="FPI">Names and Dates</idno>
         <desc>Additional elements for names and dates</desc>
       </moduleSpec>
     </egXML>
@@ -65334,6 +65225,7 @@ module, i.e. a named and externally visible group of declarations.</desc>
       <alternate minOccurs="0" maxOccurs="unbounded">
         <classRef key="model.oddRef"/>
         <classRef key="model.oddDecl"/>
+	<elementRef key="listRef"/>
       </alternate>      
     </sequence>
   </content>
@@ -65425,6 +65317,10 @@ module, i.e. a named and externally visible group of declarations.</desc>
       <desc versionDate="2007-05-04" xml:lang="es">indica la lengua que se ha de utilizar para la creación de la documentación en el caso en que las descripciones de elementos, atributos, clases o macros esten disponibles en más lenguas.</desc>
       <desc versionDate="2007-01-21" xml:lang="it">indica la lingua da utilizzare per la creazione della documentazione nel caso in cui le descrizioni di elementi, attributi, classi o macro siano disponibili in più lingue</desc>
       <datatype minOccurs="1" maxOccurs="unbounded"><dataRef key="teidata.language"/></datatype>
+      <remarks xml:lang="en" versionDate="2022-04-04">
+        <p>Although multiple languages may be specified, the current
+        TEI ODD processor is only capable of handling one.</p>
+      </remarks>
     </attDef>
     <attDef ident="defaultExceptions" usage="rec">
       <gloss versionDate="2016-11-20" xml:lang="en">default namespace
@@ -65538,13 +65434,12 @@ module, i.e. a named and externally visible group of declarations.</desc>
     <memberOf key="model.oddDecl"/>
   </classes>
   <content>
-    
-      <alternate minOccurs="0" maxOccurs="unbounded">
-        <classRef key="model.oddDecl"/>
-        <classRef key="model.oddRef"/>
-        <classRef key="model.divPart"/>
-      </alternate>
-    
+    <alternate minOccurs="0" maxOccurs="unbounded">
+      <classRef key="model.oddDecl"/>
+      <classRef key="model.oddRef"/>
+      <classRef key="model.divPart"/>
+      <elementRef key="listRef"/>
+    </alternate>
   </content>
   <exemplum xml:lang="und">
     <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#UND">
@@ -65781,6 +65676,12 @@ contains specifications for the elements
     </sequence>
   </content>
   <constraintSpec scheme="schematron" ident="child-constraint-based-on-mode">
+    <!-- 
+         This constraint specification is much like the
+         "empty-based-on-mode" for <constraintSpec> itself, which does
+         something something similar (in that it is based on @mode),
+         but not quite the same.
+    -->
     <constraint>
       <sch:rule context="tei:elementSpec[ @mode eq 'delete' ]">
         <sch:report test="child::*">This elementSpec element has a mode= of "delete" even though it has child elements. Change the mode= to "add", "change", or "replace", or remove the child elements.</sch:report>
@@ -66299,35 +66200,47 @@ portion of an ODD document.</desc>
     <ptr target="#TDENT"/>
   </listRef>
 </elementSpec>
-<elementSpec module="tagdocs" xml:id="LISTREF" ident="listRef">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="tagdocs" xml:id="LISTREF" ident="listRef">
   <gloss versionDate="2005-01-14" xml:lang="en">list of references</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">참조 목록</gloss>
   <gloss versionDate="2007-05-02" xml:lang="zh-TW">參照列表</gloss>
   <gloss versionDate="2007-06-12" xml:lang="fr">liste de références</gloss>
   <gloss versionDate="2007-05-04" xml:lang="es">lista de referencias</gloss>
   <gloss versionDate="2007-01-21" xml:lang="it">lista di riferimenti</gloss>
-  <desc versionDate="2005-01-14" xml:lang="en">supplies a list of significant references to places where this element is discussed, in the
-    current document or elsewhere.</desc>
+  <desc versionDate="2022-03-11" xml:lang="en">supplies a list of significant references in the current document or elsewhere.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">현 문서 또는 그 밖의 어디든지 이 요소는 논의된 위치에 대한 중요한 참조 목록을 제공한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">提供一個重要參照的列表，這些參照連結到詳述此元素的位置，在此文件裡或是其他地方。</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">場所への参照のリストを示す．当該文書中でも外部文書でもよい．</desc>
-  <desc versionDate="2007-06-12" xml:lang="fr">fournit une liste de références signifiantes là où cet
-    élément est commenté, dans le document courant ou ailleurs.</desc>
-  <desc versionDate="2007-05-04" xml:lang="es">proporciona una lista de referencias significativas a
-    puntos, en el documento corriente u otro lugar, en el que se discute el elemento en cuestión.</desc>
-  <desc versionDate="2007-01-21" xml:lang="it">fornisce una lista di riferimenti significativi a punti,
-    nel documento corrente o altrove, in cui è discusso l'elemento in questione</desc>
+  <desc versionDate="2022-03-11" xml:lang="fr">fournit une liste de références signifiantes dans le document courant ou ailleurs.</desc>
+  <desc versionDate="2022-03-11" xml:lang="es">proporciona una lista de referencias significativas a
+    puntos en el documento corriente u otro lugar.</desc>
+  <desc versionDate="2022-03-11" xml:lang="it">fornisce una lista di riferimenti significativi a punti
+    nel documento corrente o altrove.</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="att.typed"/>
-    <memberOf key="model.oddDecl"/>
+    <memberOf key="model.ptrLike"/>
   </classes>
   <content>
     <sequence>
       <elementRef key="desc" minOccurs="0" maxOccurs="unbounded"/>
-    <classRef key="model.ptrLike" minOccurs="1" maxOccurs="unbounded"/>
+      <classRef key="model.ptrLike" minOccurs="1" maxOccurs="unbounded"/>
     </sequence>
   </content>
+ <constraintSpec ident="TagDocsNestinglistRef" scheme="schematron">
+    <constraint>
+      <sch:rule context="( tei:classSpec | tei:dataSpec | tei:elementSpec | tei:macroSpec | tei:moduleSpec | tei:schemaSpec | tei:specGrp )/tei:listRef">
+        <sch:report test="tei:listRef">In the context of tagset documentation, the listRef element must not self-nest.</sch:report>
+      </sch:rule>
+    </constraint>
+  </constraintSpec>
+  <constraintSpec ident="TagDocslistRefChildren" scheme="schematron">
+    <constraint>
+      <sch:rule context="( tei:classSpec | tei:dataSpec | tei:elementSpec | tei:macroSpec | tei:moduleSpec | tei:schemaSpec | tei:specGrp )/tei:listRef/tei:ptr                        | ( tei:classSpec | tei:dataSpec | tei:elementSpec | tei:macroSpec | tei:moduleSpec | tei:schemaSpec | tei:specGrp )/tei:listRef/tei:ref">
+        <sch:assert test="@target and not( matches( @target,'\s') )">In the context of tagset documentation, each ptr or ref element inside a listRef must have a target attribute with only 1 pointer as its value.</sch:assert>
+      </sch:rule>
+    </constraint>
+  </constraintSpec>
   <exemplum xml:lang="und">
     <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#UND">
       <listRef>
@@ -66342,6 +66255,17 @@ portion of an ODD document.</desc>
       </listRef>
     </egXML>
   </exemplum>
+  <remarks versionDate="2022-03-11" xml:lang="en">
+    <p>When <gi>listRef</gi> is used in the context of <ident type="module">tagdocs</ident>, further restrictons apply:
+    <list>
+      <item>It may only contain <gi>ptr</gi> or <gi>ref</gi>
+        elements.</item>
+      <item>Each <gi>ptr</gi> or <gi>ref</gi> child should bear a
+        <att>target</att> attribute, the value of which should be a
+        single URI pointer.</item>
+    </list>
+    </p>
+  </remarks>
 </elementSpec>
 <elementSpec module="tagdocs" ident="exemplum">
   <gloss xml:lang="en" versionDate="2007-06-12">exemplum</gloss>
@@ -66799,7 +66723,7 @@ déclaration de même nom dans la définition courante.</desc>
     <ptr target="#TDcrystalsCEdc"/>
   </listRef>
 </elementSpec>
-<elementSpec module="tagdocs" xml:id="ALTIDENT" ident="altIdent">
+<elementSpec xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="tagdocs" xml:id="ALTIDENT" ident="altIdent">
   <gloss versionDate="2007-07-04" xml:lang="en">alternate identifier</gloss>
   <gloss versionDate="2007-12-20" xml:lang="ko">교체 확인소</gloss>
   <gloss versionDate="2008-04-06" xml:lang="es">identificador alterno</gloss>
@@ -66811,10 +66735,15 @@ déclaration de même nom dans la définition courante.</desc>
   <desc versionDate="2007-12-20" xml:lang="ko">어떤 언어에서 요소, 부류, 속성에 대해 권고된 XML 이름을 제시한다.</desc>
   <desc versionDate="2007-05-02" xml:lang="zh-TW">標誌用另一種語言來表示的XML元素、元素集、屬性等的名稱。</desc>
   <desc versionDate="2008-04-05" xml:lang="ja">特定言語において，XMLの要素，クラス，属性などで推奨される名前を示す．</desc>
-  <desc versionDate="2007-06-12" xml:lang="fr">fournit le nom XML recommandé pour un
-                  élément, une classe, un attribut, etc. dans un langage quelconque.</desc>
-  <desc versionDate="2007-05-04" xml:lang="es">proporciona el nombre XML recomendado para un elemento, clase, atributo, etc. en alguna lengua.</desc>
-  <desc versionDate="2007-01-21" xml:lang="it">fornisce il nome XML consigliato per un elemento, classe, attributo, ecc. in una lingua.</desc>
+  <desc versionDate="2007-06-12" xml:lang="fr">fournit le nom XML
+  recommandé pour un élément, une classe, un attribut, etc. dans un
+  langage quelconque.</desc>
+  <desc versionDate="2007-05-04" xml:lang="es">proporciona el nombre
+  XML recomendado para un elemento, clase, atributo, etc. en alguna
+  lengua.</desc>
+  <desc versionDate="2007-01-21" xml:lang="it">fornisce il nome XML
+  consigliato per un elemento, classe, attributo, ecc. in una
+  lingua.</desc>
   <classes>
     <memberOf key="att.global"/>
     <memberOf key="att.typed"/>
@@ -66824,6 +66753,41 @@ déclaration de même nom dans la définition courante.</desc>
     <textNode/>
     <!--ref xmlns="http://relaxng.org/ns/structure/1.0" name="macro.xtext"/-->
   </content>
+  <constraintSpec scheme="schematron" ident="deprecate_altIdent_in_non-ODD_places">
+    <desc>
+      The <gi>altIdent</gi> element should only be a child of
+      <gi>attDef</gi>, <gi>classSpec</gi>, <gi>constraintSpec</gi>,
+      <gi>dataSpec</gi>, <gi>elementSpec</gi>, <gi>macroSpec</gi>, or
+      <gi>valItem</gi>. Thus its use in other places is being
+      deprecated.
+    </desc>
+    <constraint>
+      <sch:report test="  parent::tei:model                         | parent::tei:modelGrp                         | parent::tei:modelSequence                         | parent::tei:paramSpec                         | parent::tei:schemaSpec" role="nonfatal">
+        Use of <altIdent> as a child of <<sch:value-of select="name(..)"/>> is
+        deprecated, and will no longer be valid after 2022-07-14.
+      </sch:report>
+      <sch:report test="parent::tei:moduleSpec" role="nonfatal">
+        Use of <altIdent> to declare the FPI of a module is
+        deprecated, and will no longer be valid after 2022-07-14;
+        please use <idno type="FPI"> instead.
+      </sch:report>
+    </constraint>
+  </constraintSpec>
+  <constraintSpec scheme="schematron" ident="altIdent_usually_an_NCName">
+    <desc>
+      Other than when used to indicate the formal public identifier of
+      a module (which is a deprecated usage), the content of
+      <gi>altIdent</gi> should be a single <ident type="datatype">teidata.xmlName</ident>.
+      </desc>
+    <constraint>
+      <sch:rule context="tei:altIdent[ not( parent::tei:moduleSpec or @type eq 'FPI' ) ]">
+        <sch:assert test=". castable as xs:NCName">
+          The content of this 'altIdent' element (<sch:value-of select="normalize-space(.)"/>)
+          should conform to teidata.xmlName.
+        </sch:assert>
+      </sch:rule>
+    </constraint>
+  </constraintSpec>
   <exemplum xml:lang="und">
     <egXML xmlns="http://www.tei-c.org/ns/Examples" source="#NONE">
       <altIdent xml:lang="fr">balisageDoc</altIdent>
@@ -66835,11 +66799,11 @@ déclaration de même nom dans la définition courante.</desc>
     </egXML>
   </exemplum>
   <remarks versionDate="2005-01-14" xml:lang="en">
-    <p>All documentation elements in ODD
-have a  canonical name, supplied as the value for their
-  <att>ident</att> attribute. The <gi>altIdent</gi> element is used to
-  supply an alternative name for the corresponding XML object, perhaps
-  in a different language.</p>
+    <p>All documentation elements in ODD have a canonical name,
+    supplied as the value for their <att>ident</att> attribute. The
+    <gi>altIdent</gi> element is used to supply an alternative name
+    for the corresponding XML object, perhaps in a different
+    language.</p>
   </remarks>
   <remarks xml:lang="fr" versionDate="2007-06-12">
     <p>Tous les éléments de documentation en ODD ont un nom canonique
@@ -66848,7 +66812,12 @@ have a  canonical name, supplied as the value for their
     l'objet XML correspondant, éventuellement dans un langage
     différent.</p>
   </remarks>
-  <remarks versionDate="2018-12-28" xml:lang="ja"><p>ODDのすべてのドキュメント要素には，<att>ident</att>属性の値として提供される標準名がある．<gi>altIdent</gi>要素は，例えば異なる言語で，対応するXMLオブジェクトの代替名を提供するために使用される．</p></remarks>
+  <remarks versionDate="2018-12-28" xml:lang="ja">
+    <p>ODDのすべてのドキュメント要素には，<att>ident</att>属性の値とし
+    て提供される標準名がある．<gi>altIdent</gi>要素は，例えば異なる言
+    語で，対応するXMLオブジェクトの代替名を提供するために使用される．
+    </p>
+  </remarks>
   <listRef>
     <ptr target="#COHTG"/>
     <ptr target="#TDcrystalsCEdc"/>
@@ -68145,20 +68114,22 @@ have a  canonical name, supplied as the value for their
       <elementRef key="constraint" minOccurs="0" maxOccurs="1"/>
     </sequence>
   </content>
-  <!--
-      Following <constraintSpec> might be more clearly accomplished
-      using abstract patterns, but our build process does not
-      currently support that. For an attempt at using them, see
-      https://github.com/TEIC/TEI/tree/sydb_issue-2179_1st_via_abstract_pats,
-      which was my first attempt at doing this. —Syd, 2021-10-13
-  -->
-  <constraintSpec scheme="schematron" ident="constraint-unless-delete">
+  <constraintSpec scheme="schematron" ident="empty-based-on-mode">
+    <!-- 
+         This constraint specification is much like the
+         "child-constraint-based-on-mode" for <elementSpec>, which
+         does something something similar (in that it is based on
+         @mode), but not quite the same.
+    -->
     <constraint>
-      <sch:rule context="tei:constraintSpec[ @mode eq 'delete' ]">
-        <sch:report test="child::tei:constraint">This 'constraintSpec' element has a mode= of "delete" even though it has a child constraint. Change the mode= to "add", "change", or "replace", or remove the 'constraint' child.</sch:report>
+      <sch:rule context="tei:constraintSpec[ @mode eq 'delete']">
+        <sch:report test="child::*">This constraintSpec element has a mode= of "delete" even though it has child elements. Change the mode= to "add", "change", or "replace", or remove the child elements.</sch:report>
+      </sch:rule>
+      <sch:rule context="tei:constraintSpec[ @mode eq 'change']">
+        <sch:assert test="child::*">This constraintSpec element has a mode= of "change", but does not have any child elements. Specify child elements, or change the mode= to "delete".</sch:assert>
       </sch:rule>
       <sch:rule context="tei:constraintSpec[ @mode = ('add','replace') ]">
-        <sch:assert test="child::tei:constraint">This 'constraintSpec' element has a mode= of "<sch:value-of select="@mode"/>", but does not a 'constraint' child element. Specify a constraint or change the mode= to "delete".</sch:assert>
+        <sch:assert test="child::tei:constraint">This constraintSpec element has a mode= of "<sch:value-of select="@mode"/>", but does not have a child 'constraint' element. Use a child 'constraint' element or change the mode= to "delete" or "change".</sch:assert>
       </sch:rule>
     </constraint>
   </constraintSpec>
@@ -68271,6 +68242,15 @@ have a  canonical name, supplied as the value for their
       </constraintSpec>
     </egXML>
   </exemplum>
+  <remarks xml:lang="en" versionDate="2022-04-09">
+    <p>A child <gi>constraint</gi> is required when the
+    <att>mode</att> attribute has the value <val>replace</val> or
+    <val>add</val> (or is not specified, as <val>add</val> is the
+    default). No child elements are permitted when the <att>mode</att>
+    attribute has the value <val>delete</val>. At least one child
+    element is required when the <att>mode</att> attribute has the
+    value <val>change</val>.</p>
+  </remarks>
   <listRef>
     <ptr target="#TDTAG"/>
   </listRef>
@@ -69423,8 +69403,7 @@ an attribute may take, additional to the information carried by the
       <defaultVal>add</defaultVal>
       <valList type="closed">
         <valItem ident="add">
-          <desc versionDate="2010-05-11" xml:lang="en">this declaration is added to the current
-            definitions</desc>
+          <desc versionDate="2022-04-12" xml:lang="en">this declaration is part of the current definitions.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">이 선언은 현 정의에 추가된다.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">該宣告添加在現有定義中</desc>
           <desc versionDate="2008-04-06" xml:lang="es">esta declaración se agrega a las definiciones
@@ -69432,12 +69411,12 @@ an attribute may take, additional to the information carried by the
           <desc xml:lang="ja" versionDate="2019-01-19">当該宣言は現行定義に追加される．</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">cette déclaration s'ajoute aux définitions
             courantes.</desc>
-          <desc versionDate="2007-01-21" xml:lang="it">la dichiarazione è aggiunta alle definizioni
+          <desc versionDate="2022-04-12" xml:lang="it">la dichiarazione fa parte alle definizioni
             correnti</desc>
         </valItem>
         <valItem ident="delete">
-          <desc versionDate="2010-05-11" xml:lang="en">if present already, the whole of the
-            declaration for this object is removed from the current setup</desc>
+          <desc versionDate="2022-04-12" xml:lang="en">the object with the same identifier (and namespace in the case of 
+            an element or attribute) as the current one is no longer part of the current definitions</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">이 선언과 이 선언의 모든 자식들이 현 구성에서 제거된다.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">該宣告以及所有子宣告從現有的設定中被移除</desc>
           <desc versionDate="2008-04-06" xml:lang="es">esta declaración y todos sus hijos se
@@ -69445,12 +69424,12 @@ an attribute may take, additional to the information carried by the
           <desc xml:lang="ja" versionDate="2019-01-19">すでに存在する場合，当該宣言と当該以下の子要素は，現行の配置から外される．</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">cette déclaration et tous ses enfants sont
             retirés du système courant.</desc>
-          <desc versionDate="2007-01-21" xml:lang="it">la dichiarazione e i suoi discendenti sono
-            esclusi dall'impostazione corrente</desc>
+          <desc versionDate="2022-04-12" xml:lang="it">l'oggetto con lo stesso nome (e namespace nel caso di un elemento
+            o attributo) di quello corrente non fa più parte delle definizioni correnti.</desc>
         </valItem>
         <valItem ident="change">
-          <desc versionDate="2010-05-11" xml:lang="en">this declaration changes the declaration of
-            the same name in the current definition</desc>
+          <desc versionDate="2022-04-12" xml:lang="en">this declaration changes the object of the same identifier (and namespace 
+            in the case of an element or attribute) in the current definition</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">이 선언은 현 정의에서 동일 이름의 선언을 변경한다.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">該宣告改變在現有定義中名稱相同的宣告。</desc>
           <desc versionDate="2008-04-06" xml:lang="es">esta declaración cambia la declaración del
@@ -69458,12 +69437,12 @@ an attribute may take, additional to the information carried by the
           <desc xml:lang="ja" versionDate="2019-01-19">当該宣言は，現行定義中の同名宣言を修正する．</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">cette déclaration modifie la déclaration de
             même nom dans la définition courante.</desc>
-          <desc versionDate="2007-01-21" xml:lang="it">la dichiarazione modifica la dichiarazione
-            con lo stesso nome nella definizione corrente</desc>
+          <desc versionDate="2022-04-12" xml:lang="it">la dichiarazione modifica l'oggetto con
+            con lo stesso nome (e namespace nel caso di un elemento o attributo) nella definizione corrente.</desc>
         </valItem>
         <valItem ident="replace">
-          <desc versionDate="2010-05-11" xml:lang="en">this declaration replaces the declaration of
-            the same name in the current definition</desc>
+          <desc versionDate="2022-04-12" xml:lang="en">this declaration replaces the object with the same identifier (and 
+            namespace in the case of an element or attribute) in the current definition.</desc>
           <desc versionDate="2007-12-20" xml:lang="ko">이 선언은 현 정의에서 동일 이름의 선언을 대체한다.</desc>
           <desc versionDate="2007-05-02" xml:lang="zh-TW">該宣告代替在現有定義中名稱相同的宣告</desc>
           <desc versionDate="2008-04-06" xml:lang="es">esta declaración substituye la declaración
@@ -69471,27 +69450,51 @@ an attribute may take, additional to the information carried by the
           <desc xml:lang="ja" versionDate="2019-01-19">当該宣言は，現行定義中の同名宣言を置き換える．</desc>
           <desc versionDate="2008-03-30" xml:lang="fr">cette déclaration remplace la déclaration de
             même nom dans la définition courante.</desc>
-          <desc versionDate="2007-01-21" xml:lang="it">la dichiarazione sostituisce la dichiarazione
-            con lo stesso nome nella definizione corrente</desc>
+          <desc versionDate="2022-04-12" xml:lang="it">la dichiarazione sostituisce l'oggetto
+            con lo stesso nome (e namespace nel caso di un elemento o attributo) nella definizione corrente.</desc>
         </valItem>
       </valList>
     </attDef>
   </attList>
-  <remarks versionDate="2013-10-23" xml:lang="en">
+  <remarks versionDate="2022-04-12" xml:lang="en">
     <p>An ODD processor should handle the values for <att>mode</att> as follows: <list type="gloss">
         <label>add</label>
-        <item>the object should be created (processing any children in <val>add</val> mode); raise
-          an error if an object with the same identifier already exists</item>
+      <item>the object should be created (processing any children in add mode); raise an error if the object has an identifier and 
+        an object with the same identifier (and namespace in the case of an element or attribute) already exists.</item>
         <label>replace</label>
-        <item>use this object in preference to any existing object with the same identifier, and
-          ignore any children of that object; process any new children in <val>replace</val>
-          mode</item>
+      <item>use this object in preference to any existing object with the same identifier (and namespace in the case of an element or attribute), 
+        and ignore any children of that object; process any new children in replace mode</item>
         <label>delete</label>
-        <item>do not process this object or any existing object with the same identifier; raise an
-          error if any new children supplied </item>
+      <item>do not process this object or any existing object with the same identifier (and namespace in the case of an element or attribute); 
+        the element carrying this attribute must be empty: raise an error if there are any children</item>
         <label>change</label>
-        <item>process this object, and process its children, and those of any existing object with
-          the same identifier, in <val>change</val> mode</item>
+      <item>process this object and its children, replacing only those components of an existing object of the same type with the 
+        same identifier (and namespace in case of an element or attribute) that are explicitly specified. This will change only 
+        those existing attribute values and child elements that appear both in the original specification and in the new specification. 
+        Other children from the original specification will be preserved.</item>
+      </list>
+    </p>
+  </remarks>
+  <remarks xml:lang="it" versionDate="2022-04-12">
+    <p>Un processore ODD dovrebbe considerare i valori dell'attributo <att>mode</att> in questo modo:
+      <list type="gloss">
+        <label>add</label>
+        <item>l'oggetto dovrebbe essere creato, trattando tutti gli elementi figlio che hanno anch'essi il valore <val>add</val>.
+          Se esistesse un oggetto con lo stesso nome (e namespace nel caso di un elemento o attributo) bisognerà dare un errore.
+        </item>
+        <label>replace</label>
+        <item>utilizzare questo oggetto al posto di qualsiasi atro oggetto esistente con lo stesso nome (e namespace nel caso di un elemento o attributo),
+          e ignorare gli elementi figlio di quell'oggetto; trattare tutti gli elementi che hanno anch'essi il valore <val>replace</val>.
+        </item>
+        <label>delete</label>
+        <item>non trattare questo oggetto o qualsiasi altro oggetto con lo stesso nome (e namespace nel caso di un elemento o attributo);
+          l'elemento con questo valore deve essere vuoto: dare un error nel caso in cui contenesse elementi figlio.
+        </item>
+        <label>change</label>
+        <item>trattare questo oggetto e tutti i suoi elementi figlio, sustituendo solo i componenti di un oggetto già esistente e 
+          direttamente specificato dello stesso tipo e con lo stesso nome (e namespace nel caso di un elemento o attributo).
+          Questa operazione cambierà solamente i valori di attributi già esistenti ed elementi figlio che sono presenti sia nella specificazione originale
+          che nella nuova specificazione. Gli altri elementi filgio che fanno parte della specificazione originale verranno mantenuti.</item>
       </list>
     </p>
   </remarks>
@@ -69691,7 +69694,7 @@ should correspond to an existing module, via a moduleSpec or
 <div type="div2" xml:id="TD-LinkingSchemas"><head>Linking Schemas to XML Documents</head></div></div>
 <div type="div2" xml:id="TDformal"><head>Module for Documentation Elements</head>
 <moduleSpec xml:id="DTDDTD" ident="tagdocs">
-        <altIdent type="FPI">Documentation Elements</altIdent>
+        <idno type="FPI">Documentation Elements</idno>
         <desc xml:lang="en" versionDate="2019-07-07">Documentation of TEI and other XML markup languages</desc>
         <desc xml:lang="fr" versionDate="2018-07-12">Éléments de déclaration d’un modèle</desc>
         <desc xml:lang="zh-TW" versionDate="2018-07-12">TEI模組說明</desc>
@@ -69750,94 +69753,131 @@ should correspond to an existing module, via a moduleSpec or
 <div><head>About the Datatypes and Macros Appendix</head></div></div>
 <div xml:id="BIB"><head>Bibliography</head>
 <div><head>Works Cited in Examples in these Guidelines</head>
+<bibl xml:id="biblzh-tw_n20"/>
+<bibl xml:id="fr-ex-Acad"/>
 <bibl xml:id="DROTH-eg-57"/>
+<bibl xml:id="fr-ex-Abes"/>
+<bibl xml:id="biblzh-tw_n44"/>
 <bibl xml:id="VEMEana-eg-23"/>
 <bibl xml:id="CONARS-eg-102"/>
 <bibl xml:id="COBICOR-eg-246"/>
 <bibl xml:id="CONADA-eg-144"/>
 <bibl xml:id="COEDADD-eg-91"/>
+<bibl xml:id="fr-ex-Antigone"/>
+<bibl xml:id="WHITMS2"/>
 <bibl xml:id="DIC-CR"/>
 <bibl xml:id="TSSASE-eg-20"/>
 <bibl xml:id="CONARS-eg-101"/>
+<bibl xml:id="biblzh-tw_n25"/>
+<bibl xml:id="biblzh-tw_n26"/>
+<bibl xml:id="biblzh-tw_n59"/>
+<bibl xml:id="NZETC01"/>
+<bibl xml:id="fr-ex-Balzac-Chouans"/>
+<bibl xml:id="fr-ex-Balzac_Goriot"/>
+<bibl xml:id="fr-ex-Balzac_Vie"/>
 <bibl xml:id="COVE-eg-286"/>
 <bibl xml:id="DS-eg-04"/>
-<bibl xml:id="NZETC01"/>
 <bibl xml:id="COEDADD-eg-93"/>
-<bibl xml:id="WD-BASHO"/>
+<bibl xml:id="fr-ex-Bataille_Arbre"/>
+<bibl xml:id="fr-ex-Baudelaire-chats"/>
+<bibl xml:id="fr-ex-Baudelaire-vie"/>
+<bibl xml:id="biblzh-tw_n30-31"/>
+<bibl xml:id="fr-ex-Beck_Morin"/>
 <bibl xml:id="DRCAST-eg-16"/>
 <bibl xml:id="CO-eg-02"/>
+<bibl xml:id="fr-ex-Becque-ee"/>
 <bibl xml:id="PH-eg-05"/>
-<bibl xml:id="divEGs"/>
 <bibl xml:id="DRPRO-eg-10"/>
+<bibl xml:id="fr-ex-Belloc_Kepas"/>
+<bibl xml:id="fr-ex-Belloc_Neons"/>
 <bibl xml:id="bentham"/>
 <bibl xml:id="TCAPLR-eg-11"/>
-<bibl xml:id="VESTR-eg-1"/>
+<bibl xml:id="fr-ex-Bibliog_Renaissance_Ital"/>
+<bibl xml:id="fr-ex-BnF-Reliures"/>
+<bibl xml:id="fr-ex-Billetdoux"/>
 <bibl xml:id="VE-eg-04"/>
 <bibl xml:id="SG132-neg-1"/>
 <bibl xml:id="en-blake-tyger"/>
 <bibl xml:id="SASE-eg-33"/>
 <bibl xml:id="COLI-eg-171"/>
 <bibl xml:id="FTFOR-eg-10"/>
+<bibl xml:id="fr-ex-Bouiller_Rapport"/>
+<bibl xml:id="fr-ex-Mouchette"/>
 <bibl xml:id="SA-eg-02"/>
 <bibl xml:id="PH-eg-15"/>
+<bibl xml:id="fr-ex-Belloy"/>
 <bibl xml:id="DS-eg-06"/>
 <bibl xml:id="STGA-eg-4"/>
 <bibl xml:id="Burnard-db"/>
+<bibl xml:id="fr-ex-TEI-simpl"/>
 <bibl xml:id="COXR-eg-164"/>
 <bibl xml:id="COLI-eg-172"/>
 <bibl xml:id="VESTR-eg-5"/>
 <bibl xml:id="VEST-eg-5"/>
 <bibl xml:id="NDPER-eg-17"/>
+<bibl xml:id="biblzh-tw_n46"/>
 <bibl xml:id="caedmon"/>
 <bibl xml:id="MasCab"/>
-<bibl xml:id="VESA-eg-1"/>
 <bibl xml:id="COEDREG-eg-74"/>
 <bibl xml:id="AI-BIBL-3"/>
-<bibl xml:id="COPA-eg-02"/>
+<bibl xml:id="fr-ex-catechisme"/>
+<bibl xml:id="VESA-eg-1"/>
+<bibl xml:id="fr-ex-TLFI"/>
 <bibl xml:id="TSBAPA-eg-24"/>
 <bibl xml:id="CORS5-eg-01"/>
 <bibl xml:id="Python"/>
 <bibl xml:id="pythonBrian"/>
 <bibl xml:id="PH-eg-11"/>
 <bibl xml:id="VEST-eg-4"/>
+<bibl xml:id="biblzh-tw_n50"/>
 <bibl xml:id="CholNup"/>
 <bibl xml:id="FS-eg-01"/>
+<bibl xml:id="fr-ex-simjar"/>
 <bibl xml:id="AI-BIBL-1"/>
 <bibl xml:id="DSFRONT-eg-69"/>
 <bibl xml:id="NDPER-eg-18"/>
 <bibl xml:id="DRPERF-eg-13"/>
 <bibl xml:id="CONONO-eg-189"/>
 <bibl xml:id="VEST-eg-3"/>
-<bibl xml:id="COHQHF-eg-8"/>
+<bibl xml:id="fr-ex-Colette-Ecole"/>
 <bibl xml:id="DIC-CED"/>
 <bibl xml:id="DIC-CP"/>
 <bibl xml:id="DSOC-eg-34"/>
 <bibl xml:id="SA-BIBL-2"/>
-<bibl xml:id="PHegsurp2"/>
 <bibl xml:id="NDORG-eg-34"/>
+<bibl xml:id="fr-ex-Corneille_Place-Royale"/>
+<bibl xml:id="fr-ex-Corneille_Theodore"/>
 <bibl xml:id="RESPONS-eg-02"/>
 <bibl xml:id="DS-eg-02"/>
 <bibl xml:id="CREELEY"/>
-<bibl xml:id="DSHD-eg-31"/>
+<bibl xml:id="biblzh-tw_n17"/>
 <bibl xml:id="CONARS-eg-109"/>
+<bibl xml:id="fr-ex-Danhauser"/>
 <bibl xml:id="beagle"/>
-<bibl xml:id="PH-eg-12"/>
+<bibl xml:id="fr-ex-Daudet_lundi"/>
+<bibl xml:id="WD-TWac"/>
 <bibl xml:id="PH-eg-02"/>
+<bibl xml:id="PH-eg-12"/>
 <bibl xml:id="defoeMoll"/>
 <bibl xml:id="COLI-eg-176"/>
 <bibl xml:id="AI-BIBL-2"/>
 <bibl xml:id="DR-eg-04"/>
 <bibl xml:id="deloneyThom"/>
-<bibl xml:id="COBICOR-eg-251"/>
-<bibl xml:id="WD-TWac"/>
+<bibl xml:id="fr-ex-Dennery-notations"/>
 <bibl xml:id="COHQHE-eg-14"/>
 <bibl xml:id="CONARS-eg-103"/>
 <bibl xml:id="VEST-eg-1"/>
+<bibl xml:id="fr-ex-Diderot-Corresp_SV"/>
+<bibl xml:id="biblzh-tw_n40"/>
 <bibl xml:id="DSOC-eg-33"/>
 <bibl xml:id="COHQQ-eg-26"/>
 <bibl xml:id="DSGRP-eg-57"/>
 <bibl xml:id="WD-BOUS"/>
+<bibl xml:id="fr-ex-Babel"/>
+<bibl xml:id="fr-ex-Dubois_Dict_Ling"/>
 <bibl xml:id="PH-eg-04"/>
+<bibl xml:id="fr-ex-Dufournaud"/>
+<bibl xml:id="fr-ex-Duhamel-Pasquier"/>
 <bibl xml:id="eg-rhyme-dutt"/>
 <bibl xml:id="VERH-eg-25"/>
 <bibl xml:id="pos4st"/>
@@ -69847,29 +69887,46 @@ should correspond to an existing module, via a moduleSpec or
 <bibl xml:id="SAID-DIRECT-eg-1"/>
 <bibl xml:id="DSAE-eg-38"/>
 <bibl xml:id="COEDADD-eg-89"/>
+<bibl xml:id="SVG-11"/>
+<bibl xml:id="fr-ex-Ernaux-perdre"/>
+<bibl xml:id="fr-ex-Ernaux-photo"/>
+<bibl xml:id="fr-ex-Etudes_Litt"/>
+<bibl xml:id="fr-ex-Constant-Journal"/>
 <bibl xml:id="FieldScreen"/>
 <bibl xml:id="DSDIV3-eg-22"/>
 <bibl xml:id="DRCAST-eg-18"/>
 <bibl xml:id="DS-eg-05"/>
 <bibl xml:id="SAAG-eg-72"/>
 <bibl xml:id="fitrub"/>
+<bibl xml:id="fr-ex-Flaubert_Sal"/>
+<bibl xml:id="fr-ex-Flaubert_Tent"/>
 <bibl xml:id="FTGRA-eg-18"/>
 <bibl xml:id="DSAE-eg-38a"/>
+<bibl xml:id="fr-ex-la-bas-si-jy-suis"/>
+<bibl xml:id="fr-ex-Teleph_sonne"/>
+<bibl xml:id="fr-ex-franglais"/>
 <bibl xml:id="FR1B"/>
+<bibl xml:id="biblzh-tw_n34"/>
 <bibl xml:id="DS-eg-03"/>
 <bibl xml:id="COEDADD-eg-83"/>
+<bibl xml:id="fr-ex-Galland_Mille"/>
 <bibl xml:id="GalswStr"/>
 <bibl xml:id="COEDADD-eg-84"/>
 <bibl xml:id="TSTPPR-eg-58"/>
 <bibl xml:id="COVE-eg-285"/>
 <bibl xml:id="COHTG-eg-43"/>
 <bibl xml:id="FS-BIBL-3"/>
-<bibl xml:id="SASE-eg-40"/>
+<bibl xml:id="GerStra"/>
+<bibl xml:id="PHegsurp2"/>
 <bibl xml:id="STGA-eg-11"/>
-<bibl xml:id="GibAut"/>
+<bibl xml:id="fr-ex-Gide-Journ_fx"/>
+<bibl xml:id="fr-ex-Gide_Journal"/>
 <bibl xml:id="DRPAL-eg-46"/>
 <bibl xml:id="COVE-eg-284"/>
 <bibl xml:id="VEST-eg-2"/>
+<bibl xml:id="fr-ex-Giono-Regain"/>
+<bibl xml:id="fr-ex-Guerre-Troie"/>
+<bibl xml:id="fr-ex-Godefroy"/>
 <bibl xml:id="DRDIV-eg-31"/>
 <bibl xml:id="VE-eg-03"/>
 <bibl xml:id="G2S"/>
@@ -69877,113 +69934,199 @@ should correspond to an existing module, via a moduleSpec or
 <bibl xml:id="PH-eg-07"/>
 <bibl xml:id="DSBACK-eg-86"/>
 <bibl xml:id="DS-eg-01"/>
+<bibl xml:id="fr-ex-Greimas_Courtes"/>
 <bibl xml:id="COXR-eg-166"/>
 <bibl xml:id="DIC-DNT"/>
 <bibl xml:id="hallWell"/>
 <bibl xml:id="CONAAB-eg-150"/>
-<bibl xml:id="eebo87070"/>
 <bibl xml:id="COHQQ-eg-29"/>
+<bibl xml:id="eebo87070"/>
 <bibl xml:id="DR-eg-01"/>
 <bibl xml:id="harveyFour"/>
-<bibl xml:id="ND-eg-99"/>
-<bibl xml:id="CH-eg-01"/>
 <bibl xml:id="leviathan"/>
+<bibl xml:id="biblzh-tw_n3"/>
+<bibl xml:id="biblzh-tw_n43"/>
+<bibl xml:id="fr-ex-Fleurs"/>
 <bibl xml:id="DIC-OALD"/>
+<bibl xml:id="biblzh-tw_n5"/>
+<bibl xml:id="fr-ex-Hugo-Notre-Dame"/>
+<bibl xml:id="fr-ex-Hugo-Nuit"/>
+<bibl xml:id="fr-ex-Hugo-miserables"/>
+<bibl xml:id="fr-ex-Hugo-Fen"/>
+<bibl xml:id="fr-ex-Huizinga_Aut"/>
+<bibl xml:id="COBICOR-eg-248"/>
 <bibl xml:id="DR-eg-02"/>
 <bibl xml:id="PH-ib01"/>
 <bibl xml:id="PH-ib04"/>
 <bibl xml:id="PH-ib05"/>
 <bibl xml:id="DRSTA-eg-40"/>
 <bibl xml:id="DROTH-eg-58"/>
-<bibl xml:id="COBICOR-eg-248"/>
+<bibl xml:id="fr-ex-Melanges_Imbs"/>
+<bibl xml:id="fr-ex-Cyrus"/>
+<bibl xml:id="fr-ex-Ionesco-chauve"/>
+<bibl xml:id="biblzh-tw_n61"/>
 <bibl xml:id="TEI-L_b092ac32.2101"/>
 <bibl xml:id="DRDIV-eg-32"/>
+<bibl xml:id="fr-ex-rousscon"/>
 <bibl xml:id="DSAE-eg-36"/>
+<bibl xml:id="fr-ex-Campe"/>
+<bibl xml:id="GibAut"/>
 <bibl xml:id="JonsBart"/>
 <bibl xml:id="DRSP-eg-37"/>
 <bibl xml:id="DRPAL-eg-44"/>
 <bibl xml:id="DSCO-eg-53"/>
+<bibl xml:id="WD-BASHO"/>
 <bibl xml:id="Karstadt-Distinctiones-Thomistarum"/>
 <bibl xml:id="REF-cb-eg-1"/>
+<bibl xml:id="fr-ex-Kilian-Neige"/>
 <bibl xml:id="MLK01"/>
 <bibl xml:id="COHQHF-eg-5"/>
 <bibl xml:id="COHQHD-eg-18"/>
 <bibl xml:id="COHQQ-eg-27"/>
 <bibl xml:id="KNUTHMAD"/>
+<bibl xml:id="fr-ex-Koltes_Quai_Vol"/>
+<bibl xml:id="PHegsurp"/>
 <bibl xml:id="KYD"/>
+<bibl xml:id="fr-ex-Lafayette-Cleves"/>
 <bibl xml:id="VESE-eg-13"/>
 <bibl xml:id="VESE-eg-13x"/>
+<bibl xml:id="fr-ex-ATILF"/>
 <bibl xml:id="CONARS-eg-108"/>
 <bibl xml:id="CONARS-eg-111"/>
+<bibl xml:id="fr-ex-Lamartine"/>
+<bibl xml:id="fr-ex-manus-Saint-Petersbourg"/>
 <bibl xml:id="COHQQ-eg-33"/>
 <bibl xml:id="LANGENPOST"/>
 <bibl xml:id="VESE-eg-9"/>
 <bibl xml:id="punctuseg"/>
+<bibl xml:id="fr-ex-Lavrentev-TEI-BFM"/>
 <bibl xml:id="PH-eg-06"/>
 <bibl xml:id="PH-eg-01"/>
-<bibl xml:id="COHTG-eg-42"/>
+<bibl xml:id="fr-ex-Grand-Robert"/>
+<bibl xml:id="NH-eg-03"/>
 <bibl xml:id="SACS1-eg-48"/>
+<bibl xml:id="COHTG-eg-42"/>
 <bibl xml:id="COEDADD-eg-92"/>
+<bibl xml:id="fr-ex-Lery"/>
 <bibl xml:id="AI-BIBL-4"/>
-<bibl xml:id="NH-eg-03"/>
+<bibl xml:id="SERAFIN2"/>
 <bibl xml:id="DRCAST-eg-21"/>
 <bibl xml:id="COHQHE-eg-10"/>
+<bibl xml:id="biblzh-tw_n65"/>
+<bibl xml:id="biblzh-tw_n37"/>
+<bibl xml:id="biblzh-tw_n23-24"/>
+<bibl xml:id="biblzh-tw_n29"/>
+<bibl xml:id="biblzh-tw_n41"/>
 <bibl xml:id="DRPRO-eg-7"/>
+<bibl xml:id="biblzh-tw_n58"/>
 <bibl xml:id="COPA-eg-1"/>
 <bibl xml:id="STGA-eg-9"/>
+<bibl xml:id="biblzh-tw_n51-55"/>
+<bibl xml:id="biblzh-tw_n49"/>
 <bibl xml:id="DIC-LDOCE"/>
+<bibl xml:id="fr-ex-Roman-Rose"/>
 <bibl xml:id="FTGRA-eg-16"/>
 <bibl xml:id="lowellAut"/>
+<bibl xml:id="fr-ex-Lichtig"/>
 <bibl xml:id="SASE-eg-41"/>
+<bibl xml:id="biblzh-tw_n2"/>
+<bibl xml:id="biblzh-tw_n6"/>
+<bibl xml:id="biblzh-tw_n9"/>
+<bibl xml:id="biblzh-tw_n15"/>
+<bibl xml:id="biblzh-tw_n16"/>
 <bibl xml:id="VERH-eg-27"/>
 <bibl xml:id="TSBA-eg-19"/>
 <bibl xml:id="MS-eg-001"/>
+<bibl xml:id="fr-ex-Maingeneau_Analyser"/>
 <bibl xml:id="CONARS-eg-106"/>
+<bibl xml:id="fr-ex-Zazie"/>
+<bibl xml:id="fr-ex-Manu_Shan"/>
 <bibl xml:id="PH-BIBL-1"/>
 <bibl xml:id="STGA-eg-10"/>
 <bibl xml:id="COEDADD-eg-85"/>
-<bibl xml:id="SOURCE-eg-01"/>
+<bibl xml:id="fr-ex-Mauriac-Marquise"/>
+<bibl xml:id="fr-ex-Mauss_Sociologie"/>
 <bibl xml:id="NDGEOGste-Falls"/>
+<bibl xml:id="SOURCE-eg-01"/>
 <bibl xml:id="DSHD-eg-30"/>
+<bibl xml:id="fr-ex-Mendes-France"/>
+<bibl xml:id="biblzh-tw_n1"/>
 <bibl xml:id="DRPERF-eg-12"/>
 <bibl xml:id="COHQHE-eg-11"/>
 <bibl xml:id="CO-eg-06"/>
 <bibl xml:id="miltPo"/>
+<bibl xml:id="fr-ex-Moliere_Ecole"/>
+<bibl xml:id="fr-ex-Moliere_Med"/>
+<bibl xml:id="fr-ex-Moliere_Med_Vol"/>
+<bibl xml:id="fr-ex-Montaigne_Essais"/>
+<bibl xml:id="fr-ex-Montesquieu"/>
+<bibl xml:id="fr-ex-Montherlant-Pitie"/>
 <bibl xml:id="PH-eg-03"/>
 <bibl xml:id="PH-eg-09"/>
 <bibl xml:id="CO-eg-04"/>
+<bibl xml:id="COBICOR-eg-251"/>
+<bibl xml:id="divEGs"/>
+<bibl xml:id="fr-ex-Mrejen_Eau"/>
+<bibl xml:id="SA-eg-04"/>
+<bibl xml:id="fr-ex-Hydraul"/>
+<bibl xml:id="fr-ex-Tunis"/>
 <bibl xml:id="PNIN1"/>
 <bibl xml:id="DIC-NPEG"/>
 <bibl xml:id="NJAL"/>
 <bibl xml:id="DR-eg-07"/>
+<bibl xml:id="fr-ex-Ollagnier_Main"/>
+<bibl xml:id="ND-eg-99"/>
+<bibl xml:id="CH-eg-01"/>
+<bibl xml:id="WHITMS1"/>
+<bibl xml:id="fr-ex-Ormesson-douane"/>
 <bibl xml:id="SA-eg-03"/>
 <bibl xml:id="ja-ritsuryo-weights"/>
 <bibl xml:id="PH-eg-16"/>
 <bibl xml:id="COEDADD-eg-90"/>
-<bibl xml:id="PHegsurp"/>
+<bibl xml:id="biblzh-tw_n39"/>
+<bibl xml:id="fr-ex-Pascal_Pensees"/>
 <bibl xml:id="TSSASE-eg-37"/>
 <bibl xml:id="CODR-eg-296"/>
-<bibl xml:id="GerStra"/>
+<bibl xml:id="fr-ex-Pennac_Marchande"/>
+<bibl xml:id="fr-ex-Perec-esp"/>
+<bibl xml:id="fr-ex-Perec-vie"/>
+<bibl xml:id="fr-ex-Perec-choses"/>
 <bibl xml:id="GDFT-eg-12"/>
+<bibl xml:id="fr-ex-Pernoud-femme"/>
 <bibl xml:id="DIC-PLC"/>
 <bibl xml:id="PHILIPOTT"/>
 <bibl xml:id="NH-eg-02"/>
 <bibl xml:id="toWhom-eg-1"/>
 <bibl xml:id="PHOM-eg-secl"/>
 <bibl xml:id="DRSP-eg-34"/>
+<bibl xml:id="fr-ex-Polac"/>
 <bibl xml:id="COHQHE-eg-12"/>
 <bibl xml:id="VEMEsamp-eg-14"/>
 <bibl xml:id="SAPTEG-eg-3"/>
 <bibl xml:id="NDPLAC-eg-55"/>
+<bibl xml:id="fr-ex-Proust-Swann"/>
 <bibl xml:id="COHQQ-eg-23"/>
+<bibl xml:id="biblzh-tw_n52"/>
+<bibl xml:id="fr-ex-Queneau_Journ"/>
+<bibl xml:id="fr-ex-garg"/>
+<bibl xml:id="rab3"/>
+<bibl xml:id="fr-ex-Renard_Journal"/>
 <bibl xml:id="COBICOI-eg-264"/>
+<bibl xml:id="biblzh-tw_n45"/>
 <bibl xml:id="COHTGEG-eg-02"/>
 <bibl xml:id="DIC-PR"/>
+<bibl xml:id="fr-ex-Rohmer-Maud"/>
+<bibl xml:id="fr-ex-Knock"/>
+<bibl xml:id="fr-ex-Cyrano"/>
+<bibl xml:id="fr-ex-Roubaud_Boucle"/>
 <bibl xml:id="COHQQ-eg-35"/>
 <bibl xml:id="AI-eg-01"/>
+<bibl xml:id="fr-ex-Sanctoral-ee"/>
+<bibl xml:id="WD-VERT-IND"/>
+<bibl xml:id="biblzh-tw_n7"/>
+<bibl xml:id="biblzh-tw_n48"/>
 <bibl xml:id="COHTG-eg-44"/>
-<bibl xml:id="SVG-11"/>
-<bibl xml:id="SERAFIN2"/>
+<bibl xml:id="fr-ex-Shakes-Richard-III"/>
 <bibl xml:id="FHENRY5"/>
 <bibl xml:id="THENRY5"/>
 <bibl xml:id="CO-eg-07"/>
@@ -69996,10 +70139,14 @@ should correspond to an existing module, via a moduleSpec or
 <bibl xml:id="TwN"/>
 <bibl xml:id="l-td-eg-1"/>
 <bibl xml:id="VEST-eg-6"/>
+<bibl xml:id="biblzh-tw_n33"/>
+<bibl xml:id="biblzh-tw_n35-36"/>
 <bibl xml:id="SAWS"/>
 <bibl xml:id="DR-eg-08"/>
 <bibl xml:id="DRSP-eg-35"/>
 <bibl xml:id="SASE-eg-32"/>
+<bibl xml:id="COHQHF-eg-8"/>
+<bibl xml:id="biblzh-tw_n32"/>
 <bibl xml:id="DSBACK-eg-83"/>
 <bibl xml:id="PH-eg-10"/>
 <bibl xml:id="SMITHWM"/>
@@ -70010,224 +70157,72 @@ should correspond to an existing module, via a moduleSpec or
 <bibl xml:id="STOW"/>
 <bibl xml:id="NYT1992"/>
 <bibl xml:id="SUE"/>
+<bibl xml:id="NDDATEA-eg-169"/>
+<bibl xml:id="biblzh-tw_n28"/>
+<bibl xml:id="biblzh-tw_n63"/>
 <bibl xml:id="COEDCOR-eg-71"/>
 <bibl xml:id="swiftLaw"/>
 <bibl xml:id="HD-eg-swinb"/>
 <bibl xml:id="CONARS-eg-110"/>
-<bibl xml:id="NDDATEA-eg-169"/>
+<bibl xml:id="biblzh-tw_n12"/>
+<bibl xml:id="biblzh-tw_n18"/>
+<bibl xml:id="biblzh-tw_n47"/>
+<bibl xml:id="biblzh-tw_n27"/>
 <bibl xml:id="TAYLOR"/>
+<bibl xml:id="COPA-eg-02"/>
+<bibl xml:id="DSHD-eg-31"/>
 <bibl xml:id="COHQQ-eg-30"/>
 <bibl xml:id="DSDIV3X-eg-29"/>
+<bibl xml:id="SASE-eg-40"/>
 <bibl xml:id="NDDATEA-eg-170"/>
 <bibl xml:id="COHQQ-eg-34"/>
 <bibl xml:id="COHQQ-eg-31"/>
 <bibl xml:id="CO-eg-01"/>
 <bibl xml:id="DSCO-eg-51"/>
 <bibl xml:id="NDORG-eg-38"/>
+<bibl xml:id="fr-ex-Angl"/>
 <bibl xml:id="COBITY-eg-240"/>
 <bibl xml:id="SA-eg-01"/>
 <bibl xml:id="MENTIOND-eg-1"/>
+<bibl xml:id="fr-ex-Teste"/>
 <bibl xml:id="VE-eg-02"/>
+<bibl xml:id="fr-ex-Verne-Ballon"/>
+<bibl xml:id="fr-ex-Verne_Chasse"/>
+<bibl xml:id="fr-ex-Verne_Vingt"/>
 <bibl xml:id="VINGE"/>
+<bibl xml:id="fr-ex-Viton-dictionnaire"/>
 <bibl xml:id="PH-eg-13"/>
-<bibl xml:id="DSAE-eg-39"/>
 <bibl xml:id="CO-eg-03"/>
+<bibl xml:id="DSAE-eg-39"/>
 <bibl xml:id="COLI-eg-175"/>
 <bibl xml:id="DIC-W7"/>
-<bibl xml:id="WHITMS1"/>
-<bibl xml:id="WHITMS2"/>
+<bibl xml:id="biblzh-tw_n8"/>
+<bibl xml:id="fr-ex-Weil-Atares"/>
 <bibl xml:id="COHQQ-eg-25"/>
+<bibl xml:id="fr-ex-Winock-Jeanne"/>
 <bibl xml:id="NOTE-eg"/>
 <bibl xml:id="CONADA-eg-143"/>
 <bibl xml:id="NH-eg-01"/>
 <bibl xml:id="CO-eg-08"/>
+<bibl xml:id="VESTR-eg-1"/>
+<bibl xml:id="biblzh-tw_n22"/>
 <bibl xml:id="DRPRO-eg-6"/>
-<bibl xml:id="LZ"/>
-<bibl xml:id="SA-eg-04"/>
-<bibl xml:id="WD-VERT-IND"/>
-<bibl xml:id="ZUPKO"/>
-<bibl xml:id="NONE"/>
-<bibl xml:id="SELF"/>
-<bibl xml:id="UND"/>
-<bibl xml:id="fr-ex-garg"/>
-<bibl xml:id="fr-ex-simjar"/>
-<bibl xml:id="fr-ex-rousscon"/>
-<bibl xml:id="fr-ex-ATILF"/>
-<bibl xml:id="fr-ex-Abes"/>
-<bibl xml:id="fr-ex-Acad"/>
-<bibl xml:id="fr-ex-Angl"/>
-<bibl xml:id="fr-ex-Antigone"/>
-<bibl xml:id="fr-ex-Babel"/>
-<bibl xml:id="fr-ex-Balzac-Chouans"/>
-<bibl xml:id="fr-ex-Balzac_Goriot"/>
-<bibl xml:id="fr-ex-Balzac_Vie"/>
-<bibl xml:id="fr-ex-Bataille_Arbre"/>
-<bibl xml:id="fr-ex-Baudelaire-chats"/>
-<bibl xml:id="fr-ex-Baudelaire-vie"/>
-<bibl xml:id="fr-ex-Beck_Morin"/>
-<bibl xml:id="fr-ex-Becque-ee"/>
-<bibl xml:id="fr-ex-Belloc_Kepas"/>
-<bibl xml:id="fr-ex-Belloc_Neons"/>
-<bibl xml:id="fr-ex-Belloy"/>
-<bibl xml:id="fr-ex-Bibliog_Renaissance_Ital"/>
-<bibl xml:id="fr-ex-Billetdoux"/>
-<bibl xml:id="fr-ex-BnF-Reliures"/>
-<bibl xml:id="fr-ex-Bouiller_Rapport"/>
-<bibl xml:id="fr-ex-Campe"/>
-<bibl xml:id="fr-ex-Colette-Ecole"/>
-<bibl xml:id="fr-ex-Constant-Journal"/>
-<bibl xml:id="fr-ex-Corneille_Place-Royale"/>
-<bibl xml:id="fr-ex-Corneille_Theodore"/>
-<bibl xml:id="fr-ex-Cyrano"/>
-<bibl xml:id="fr-ex-Cyrus"/>
-<bibl xml:id="fr-ex-Danhauser"/>
-<bibl xml:id="fr-ex-Daudet_lundi"/>
-<bibl xml:id="fr-ex-Dennery-notations"/>
-<bibl xml:id="fr-ex-Diderot-Corresp_SV"/>
-<bibl xml:id="fr-ex-Dubois_Dict_Ling"/>
-<bibl xml:id="fr-ex-Dufournaud"/>
-<bibl xml:id="fr-ex-Duhamel-Pasquier"/>
-<bibl xml:id="fr-ex-Ernaux-perdre"/>
-<bibl xml:id="fr-ex-Ernaux-photo"/>
-<bibl xml:id="fr-ex-Etudes_Litt"/>
-<bibl xml:id="fr-ex-Flaubert_Sal"/>
-<bibl xml:id="fr-ex-Flaubert_Tent"/>
-<bibl xml:id="fr-ex-Fleurs"/>
-<bibl xml:id="fr-ex-Galland_Mille"/>
-<bibl xml:id="fr-ex-Gide-Journ_fx"/>
-<bibl xml:id="fr-ex-Gide_Journal"/>
-<bibl xml:id="fr-ex-Giono-Regain"/>
-<bibl xml:id="fr-ex-Godefroy"/>
-<bibl xml:id="fr-ex-Grand-Robert"/>
-<bibl xml:id="fr-ex-Greimas_Courtes"/>
-<bibl xml:id="fr-ex-Guerre-Troie"/>
-<bibl xml:id="fr-ex-Hugo-Fen"/>
-<bibl xml:id="fr-ex-Hugo-Notre-Dame"/>
-<bibl xml:id="fr-ex-Hugo-Nuit"/>
-<bibl xml:id="fr-ex-Hugo-miserables"/>
-<bibl xml:id="fr-ex-Huizinga_Aut"/>
-<bibl xml:id="fr-ex-Hydraul"/>
-<bibl xml:id="fr-ex-Ionesco-chauve"/>
-<bibl xml:id="fr-ex-Kilian-Neige"/>
-<bibl xml:id="fr-ex-Knock"/>
-<bibl xml:id="fr-ex-Koltes_Quai_Vol"/>
-<bibl xml:id="fr-ex-Lafayette-Cleves"/>
-<bibl xml:id="fr-ex-Lamartine"/>
-<bibl xml:id="fr-ex-Lavrentev-TEI-BFM"/>
-<bibl xml:id="fr-ex-Lery"/>
-<bibl xml:id="fr-ex-Lichtig"/>
-<bibl xml:id="fr-ex-Maingeneau_Analyser"/>
-<bibl xml:id="fr-ex-Manu_Shan"/>
-<bibl xml:id="fr-ex-Mauriac-Marquise"/>
-<bibl xml:id="fr-ex-Mauss_Sociologie"/>
-<bibl xml:id="fr-ex-Melanges_Imbs"/>
-<bibl xml:id="fr-ex-Mendes-France"/>
-<bibl xml:id="fr-ex-Moliere_Ecole"/>
-<bibl xml:id="fr-ex-Moliere_Med"/>
-<bibl xml:id="fr-ex-Moliere_Med_Vol"/>
-<bibl xml:id="fr-ex-Montaigne_Essais"/>
-<bibl xml:id="fr-ex-Montesquieu"/>
-<bibl xml:id="fr-ex-Montherlant-Pitie"/>
-<bibl xml:id="fr-ex-Mouchette"/>
-<bibl xml:id="fr-ex-Mrejen_Eau"/>
-<bibl xml:id="fr-ex-Ollagnier_Main"/>
-<bibl xml:id="fr-ex-Ormesson-douane"/>
-<bibl xml:id="fr-ex-Pascal_Pensees"/>
-<bibl xml:id="fr-ex-Pennac_Marchande"/>
-<bibl xml:id="fr-ex-Perec-choses"/>
-<bibl xml:id="fr-ex-Perec-esp"/>
-<bibl xml:id="fr-ex-Perec-vie"/>
-<bibl xml:id="fr-ex-Pernoud-femme"/>
-<bibl xml:id="fr-ex-Polac"/>
-<bibl xml:id="fr-ex-Proust-Swann"/>
-<bibl xml:id="fr-ex-Queneau_Journ"/>
-<bibl xml:id="fr-ex-Renard_Journal"/>
-<bibl xml:id="fr-ex-Rohmer-Maud"/>
-<bibl xml:id="fr-ex-Roman-Rose"/>
-<bibl xml:id="fr-ex-Roubaud_Boucle"/>
-<bibl xml:id="fr-ex-Sanctoral-ee"/>
-<bibl xml:id="fr-ex-Shakes-Richard-III"/>
-<bibl xml:id="fr-ex-TEI-simpl"/>
-<bibl xml:id="fr-ex-TLFI"/>
-<bibl xml:id="fr-ex-Teleph_sonne"/>
-<bibl xml:id="fr-ex-Teste"/>
-<bibl xml:id="fr-ex-Tunis"/>
-<bibl xml:id="fr-ex-Verne-Ballon"/>
-<bibl xml:id="fr-ex-Verne_Chasse"/>
-<bibl xml:id="fr-ex-Verne_Vingt"/>
-<bibl xml:id="fr-ex-Viton-dictionnaire"/>
-<bibl xml:id="fr-ex-Weil-Atares"/>
-<bibl xml:id="fr-ex-Winock-Jeanne"/>
-<bibl xml:id="fr-ex-Zazie"/>
-<bibl xml:id="fr-ex-catechisme"/>
-<bibl xml:id="fr-ex-franglais"/>
-<bibl xml:id="fr-ex-la-bas-si-jy-suis"/>
-<bibl xml:id="fr-ex-manus-Saint-Petersbourg"/>
-<bibl xml:id="rab3"/>
-<bibl xml:id="biblzh-tw_n1"/>
-<bibl xml:id="biblzh-tw_n2"/>
-<bibl xml:id="biblzh-tw_n3"/>
-<bibl xml:id="biblzh-tw_n4"/>
-<bibl xml:id="biblzh-tw_n5"/>
-<bibl xml:id="biblzh-tw_n6"/>
-<bibl xml:id="biblzh-tw_n7"/>
-<bibl xml:id="biblzh-tw_n8"/>
-<bibl xml:id="biblzh-tw_n9"/>
 <bibl xml:id="biblzh-tw_n10"/>
-<bibl xml:id="biblzh-tw_n11"/>
-<bibl xml:id="biblzh-tw_n12"/>
-<bibl xml:id="biblzh-tw_n13"/>
-<bibl xml:id="biblzh-tw_n14"/>
-<bibl xml:id="biblzh-tw_n15"/>
-<bibl xml:id="biblzh-tw_n16"/>
-<bibl xml:id="biblzh-tw_n17"/>
-<bibl xml:id="biblzh-tw_n18"/>
-<bibl xml:id="biblzh-tw_n19"/>
-<bibl xml:id="biblzh-tw_n20"/>
 <bibl xml:id="biblzh-tw_n21"/>
-<bibl xml:id="biblzh-tw_n22"/>
-<bibl xml:id="biblzh-tw_n23"/>
-<bibl xml:id="biblzh-tw_n24"/>
-<bibl xml:id="biblzh-tw_n25"/>
-<bibl xml:id="biblzh-tw_n26"/>
-<bibl xml:id="biblzh-tw_n27"/>
-<bibl xml:id="biblzh-tw_n28"/>
-<bibl xml:id="biblzh-tw_n29"/>
-<bibl xml:id="biblzh-tw_n30"/>
-<bibl xml:id="biblzh-tw_n31"/>
-<bibl xml:id="biblzh-tw_n32"/>
-<bibl xml:id="biblzh-tw_n33"/>
-<bibl xml:id="biblzh-tw_n34"/>
-<bibl xml:id="biblzh-tw_n35"/>
-<bibl xml:id="biblzh-tw_n36"/>
-<bibl xml:id="biblzh-tw_n37"/>
-<bibl xml:id="biblzh-tw_n39"/>
-<bibl xml:id="biblzh-tw_n40"/>
-<bibl xml:id="biblzh-tw_n41"/>
 <bibl xml:id="biblzh-tw_n42"/>
-<bibl xml:id="biblzh-tw_n43"/>
-<bibl xml:id="biblzh-tw_n44"/>
-<bibl xml:id="biblzh-tw_n45"/>
-<bibl xml:id="biblzh-tw_n46"/>
-<bibl xml:id="biblzh-tw_n47"/>
-<bibl xml:id="biblzh-tw_n48"/>
-<bibl xml:id="biblzh-tw_n49"/>
-<bibl xml:id="biblzh-tw_n50"/>
-<bibl xml:id="biblzh-tw_n51"/>
-<bibl xml:id="biblzh-tw_n52"/>
-<bibl xml:id="biblzh-tw_n53"/>
-<bibl xml:id="biblzh-tw_n54"/>
-<bibl xml:id="biblzh-tw_n55"/>
-<bibl xml:id="biblzh-tw_n56"/>
-<bibl xml:id="biblzh-tw_n57"/>
-<bibl xml:id="biblzh-tw_n58"/>
-<bibl xml:id="biblzh-tw_n59"/>
 <bibl xml:id="biblzh-tw_n60"/>
-<bibl xml:id="biblzh-tw_n61"/>
-<bibl xml:id="biblzh-tw_n62"/>
-<bibl xml:id="biblzh-tw_n63"/>
-<bibl xml:id="biblzh-tw_n64"/>
-<bibl xml:id="biblzh-tw_n65"/></div>
+<bibl xml:id="biblzh-tw_n62-64"/>
+<bibl xml:id="biblzh-tw_n4"/>
+<bibl xml:id="biblzh-tw_n19"/>
+<bibl xml:id="biblzh-tw_n11"/>
+<bibl xml:id="biblzh-tw_n13"/>
+<bibl xml:id="biblzh-tw_n14"/>
+<bibl xml:id="biblzh-tw_n56-57"/>
+<bibl xml:id="LZ"/>
+<bibl xml:id="ZUPKO"/>
+<bibl xml:id="NONE"/>
+<bibl xml:id="SELF"/>
+<bibl xml:id="UND"/></div>
 <div><head>Works Cited Elsewhere in the Text of these Guidelines</head>
 <biblStruct xml:id="KNUTH"/>
 <biblStruct xml:id="PETTY"/>

From b8db468c31eed9ca19bf2df0e457521663debf75 Mon Sep 17 00:00:00 2001
From: Syd Bauman <s.bauman@northeastern.edu>
Date: Wed, 1 Jun 2022 22:29:06 -0400
Subject: [PATCH 18/23] What gives? Fix expected results test failure that I do
 not grok. When diffed from the Makefile running locally, no differences were
 found.

---
 Test/expected-results/test34.combined.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Test/expected-results/test34.combined.json b/Test/expected-results/test34.combined.json
index edc36af92..f108c8903 100644
--- a/Test/expected-results/test34.combined.json
+++ b/Test/expected-results/test34.combined.json
@@ -1102,8 +1102,8 @@
         "type" : "elementSpec",
         "module" : "header",
         "desc" : 
-        [ "<desc xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" versionDate=\"2011-11-17\" xml:lang=\"en\">supplies information about the availability of a text, for example any restrictions on its\n    use or distribution, its copyright status, any licence applying to it, etc.<\/desc>" ],
-        "shortDesc" : "(availability) supplies information about the availability of a text, for example any restrictions on its\n    use or distribution, its copyright status, any licence applying to it, etc.",
+        [ "<desc xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" versionDate=\"2011-11-17\" xml:lang=\"en\">supplies information about the availability of a text, for example any restrictions on its\n  use or distribution, its copyright status, any licence applying to it, etc.<\/desc>" ],
+        "shortDesc" : "(availability) supplies information about the availability of a text, for example any restrictions on its\n  use or distribution, its copyright status, any licence applying to it, etc.",
         "gloss" : 
         [ "<gloss xmlns=\"http:\/\/www.tei-c.org\/ns\/1.0\" xml:lang=\"en\" versionDate=\"2007-06-12\">availability<\/gloss>" ],
         "altIdent" : 

From 6dc219df5e26a11ec9f6b075ec0f72ead19c5a1b Mon Sep 17 00:00:00 2001
From: Elli Bleeker <elli.bleeker@gmail.com>
Date: Fri, 17 Jun 2022 17:10:49 +0200
Subject: [PATCH 19/23] Update P5subset w/ @sydb following the instructions in
 the Google doc.

---
 Test/expected-results/test.isosch            |  12 +-
 Test/expected-results/test.rng               |  12 +-
 Test/expected-results/test15.odd.html        |   8 +-
 Test/expected-results/test15.odd.rnc         |  10 +-
 Test/expected-results/test21.odd.rnc         |  12 +-
 Test/expected-results/test33.rnc             |  10 +-
 Test/expected-results/testdrama.compiled.xml |  36 +++---
 Test2/expected-results/testPure1.rng         |  10 +-
 source/p5subset.xml                          | 115 +++++++++----------
 9 files changed, 102 insertions(+), 123 deletions(-)

diff --git a/Test/expected-results/test.isosch b/Test/expected-results/test.isosch
index ead22bb9b..860d246d6 100644
--- a/Test/expected-results/test.isosch
+++ b/Test/expected-results/test.isosch
@@ -40,7 +40,7 @@
    <pattern id="schematron-constraint-test-att.global.source-source-only_1_ODD_source-5">
       <rule context="tei:*/@source">
          <let name="srcs" value="tokenize( normalize-space(.),' ')"/>
-         <report test="( parent::tei:classRef                               | parent::tei:dataRef                               | parent::tei:elementRef                               | parent::tei:macroRef                               | parent::tei:moduleRef                               | parent::tei:schemaSpec )                               and                               $srcs[2]">
+         <report test="( parent::tei:classRef | parent::tei:dataRef | parent::tei:elementRef | parent::tei:macroRef | parent::tei:moduleRef | parent::tei:schemaSpec ) and $srcs[2]">
               When used on a schema description element (like
               <value-of select="name(..)"/>), the @source attribute
               should have only 1 value. (This one has <value-of select="count($srcs)"/>.)
@@ -78,14 +78,14 @@ The element indicated by @spanTo (<value-of select="@spanTo"/>) must follow the
    </pattern>
    <pattern id="schematron-constraint-test-p-abstractModel-structure-p-in-ab-or-p-11">
       <rule context="tei:p">
-         <report test="    (ancestor::tei:ab or ancestor::tei:p)                          and not( ancestor::tei:floatingText                                 |parent::tei:exemplum                                 |parent::tei:item                                 |parent::tei:note                                 |parent::tei:q                                 |parent::tei:quote                                 |parent::tei:remarks                                 |parent::tei:said                                 |parent::tei:sp                                 |parent::tei:stage                                 |parent::tei:cell                                 |parent::tei:figure                                )">
+         <report test="(ancestor::tei:ab or ancestor::tei:p) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )">
         Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.
       </report>
       </rule>
    </pattern>
    <pattern id="schematron-constraint-test-p-abstractModel-structure-p-in-l-or-lg-12">
       <rule context="tei:p">
-         <report test="    (ancestor::tei:l or ancestor::tei:lg)                          and not( ancestor::tei:floatingText                                 |parent::tei:figure                                 |parent::tei:note                                )">
+         <report test="(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )">
         Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.
       </report>
       </rule>
@@ -194,7 +194,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
          <let name="firstY" value="xs:float( substring-after( $firstPair, ',') )"/>
          <let name="lastX" value="xs:float( substring-before( $lastPair, ',') )"/>
          <let name="lastY" value="xs:float( substring-after( $lastPair, ',') )"/>
-         <report test="$firstX eq $lastX  and  $firstY eq $lastY">The first and
+         <report test="$firstX eq $lastX and $firstY eq $lastY">The first and
           last elements of this path are the same. To specify a closed polygon, use
           the zone element rather than the path element. </report>
       </rule>
@@ -242,14 +242,14 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
    </pattern>
    <pattern id="schematron-constraint-test-ab-abstractModel-structure-ab-in-ab-or-p-41">
       <rule context="tei:ab">
-         <report test="    (ancestor::tei:p or ancestor::tei:ab)                          and not( ancestor::tei:floatingText                                  |parent::tei:exemplum                                 |parent::tei:item                                 |parent::tei:note                                 |parent::tei:q                                 |parent::tei:quote                                 |parent::tei:remarks                                 |parent::tei:said                                 |parent::tei:sp                                 |parent::tei:stage                                 |parent::tei:cell                                 |parent::tei:figure                                )">
+         <report test="(ancestor::tei:p or ancestor::tei:ab) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )">
         Abstract model violation: ab may not occur inside paragraphs or other ab elements.
       </report>
       </rule>
    </pattern>
    <pattern id="schematron-constraint-test-ab-abstractModel-structure-ab-in-l-or-lg-42">
       <rule context="tei:ab">
-         <report test="    (ancestor::tei:l or ancestor::tei:lg)                         and not( ancestor::tei:floatingText                                 |parent::tei:figure                                 |parent::tei:note                                )">
+         <report test="(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )">
         Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.
       </report>
       </rule>
diff --git a/Test/expected-results/test.rng b/Test/expected-results/test.rng
index 1a9c221b2..c44e9f271 100644
--- a/Test/expected-results/test.rng
+++ b/Test/expected-results/test.rng
@@ -834,7 +834,7 @@ Suggested values include: 1] internal; 2] external; 3] conjecture</a:documentati
   <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-att.global.source-source-only_1_ODD_source-constraint-rule-5">
     <sch:rule xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" context="tei:*/@source">
       <sch:let name="srcs" value="tokenize( normalize-space(.),' ')"/>
-      <sch:report test="( parent::tei:classRef                               | parent::tei:dataRef                               | parent::tei:elementRef                               | parent::tei:macroRef                               | parent::tei:moduleRef                               | parent::tei:schemaSpec )                               and                               $srcs[2]">
+      <sch:report test="( parent::tei:classRef | parent::tei:dataRef | parent::tei:elementRef | parent::tei:macroRef | parent::tei:moduleRef | parent::tei:schemaSpec ) and $srcs[2]">
               When used on a schema description element (like
               <sch:value-of select="name(..)"/>), the @source attribute
               should have only 1 value. (This one has <sch:value-of select="count($srcs)"/>.)
@@ -3482,14 +3482,14 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
       <ref name="macro.paraContent"/>
       <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-p-abstractModel-structure-p-in-ab-or-p-constraint-report-6">
         <rule context="tei:p">
-          <sch:report xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="    (ancestor::tei:ab or ancestor::tei:p)                          and not( ancestor::tei:floatingText                                 |parent::tei:exemplum                                 |parent::tei:item                                 |parent::tei:note                                 |parent::tei:q                                 |parent::tei:quote                                 |parent::tei:remarks                                 |parent::tei:said                                 |parent::tei:sp                                 |parent::tei:stage                                 |parent::tei:cell                                 |parent::tei:figure                                )">
+          <sch:report xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="(ancestor::tei:ab or ancestor::tei:p) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )">
         Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.
       </sch:report>
         </rule>
       </pattern>
       <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-p-abstractModel-structure-p-in-l-or-lg-constraint-report-7">
         <rule context="tei:p">
-          <sch:report xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="    (ancestor::tei:l or ancestor::tei:lg)                          and not( ancestor::tei:floatingText                                 |parent::tei:figure                                 |parent::tei:note                                )">
+          <sch:report xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" test="(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )">
         Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.
       </sch:report>
         </rule>
@@ -6973,7 +6973,7 @@ Sample values include: 1] glued; 2] pinned; 3] sewn</a:documentation>
           <sch:let name="firstY" value="xs:float( substring-after( $firstPair, ',') )"/>
           <sch:let name="lastX" value="xs:float( substring-before( $lastPair, ',') )"/>
           <sch:let name="lastY" value="xs:float( substring-after( $lastPair, ',') )"/>
-          <sch:report test="$firstX eq $lastX  and  $firstY eq $lastY">The first and
+          <sch:report test="$firstX eq $lastX and $firstY eq $lastY">The first and
           last elements of this path are the same. To specify a closed polygon, use
           the zone element rather than the path element. </sch:report>
         </sch:rule>
@@ -9325,14 +9325,14 @@ Suggested values include: 1] main (main); 2] sub (subordinate); 3] alt (alternat
       <ref name="macro.paraContent"/>
       <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-ab-abstractModel-structure-ab-in-ab-or-p-constraint-report-18">
         <rule context="tei:ab">
-          <sch:report xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" test="    (ancestor::tei:p or ancestor::tei:ab)                          and not( ancestor::tei:floatingText                                  |parent::tei:exemplum                                 |parent::tei:item                                 |parent::tei:note                                 |parent::tei:q                                 |parent::tei:quote                                 |parent::tei:remarks                                 |parent::tei:said                                 |parent::tei:sp                                 |parent::tei:stage                                 |parent::tei:cell                                 |parent::tei:figure                                )">
+          <sch:report xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" test="(ancestor::tei:p or ancestor::tei:ab) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )">
         Abstract model violation: ab may not occur inside paragraphs or other ab elements.
       </sch:report>
         </rule>
       </pattern>
       <pattern xmlns="http://purl.oclc.org/dsdl/schematron" id="test-ab-abstractModel-structure-ab-in-l-or-lg-constraint-report-19">
         <rule context="tei:ab">
-          <sch:report xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" test="    (ancestor::tei:l or ancestor::tei:lg)                         and not( ancestor::tei:floatingText                                 |parent::tei:figure                                 |parent::tei:note                                )">
+          <sch:report xmlns="http://www.tei-c.org/ns/1.0" xmlns:rng="http://relaxng.org/ns/structure/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" xmlns:xi="http://www.w3.org/2001/XInclude" test="(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )">
         Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.
       </sch:report>
         </rule>
diff --git a/Test/expected-results/test15.odd.html b/Test/expected-results/test15.odd.html
index e1ed11551..2c2eca94c 100644
--- a/Test/expected-results/test15.odd.html
+++ b/Test/expected-results/test15.odd.html
@@ -810,7 +810,7 @@ <h2>
                       <div class="specChild" itemprop="ab">
                         <span class="specChildModule" itemprop="seg">header:</span>
                         <span class="specChildElements" itemprop="seg">
-                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.abstract" title="abstract contains a summary or formal abstract prefixed to an existing source document by the encoder. [2.4.4. Abstracts]">abstract</a>
+                          <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.abstract" title="abstract Contiene un resumen o abstract formal prefijado a una fuente documental por el codificador. [2.4.4. Abstracts]">abstract</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.application" title="application proporciona información sobre la aplicación que ha actuado sobre el documento. [2.3.11. The Application Information...">application</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.availability" title="availability (availability) proporciona información sobre la disponibilidad de un texto por ejemplo cualquier restricción en cu...">availability</a>
                           <a class="link_odd_elementSpec" itemprop="ref" href="#TEI.cRefPattern" title="cRefPattern (define cómo convertir una referncia canónica en un URI) indica una expresión y un patrón de remplazamiento para tr...">cRefPattern</a>
@@ -1009,7 +1009,7 @@ <h2>
                   <span xml:lang="es" lang="es" class="label" itemprop="hi">Schematron</span>
                 </td>
                 <td class="wovenodd-col2">
-                  <div class="pre" itemprop="ab"><sch:report test=" (ancestor::tei:ab or ancestor::tei:p) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )"> Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements. </sch:report></div>
+                  <div class="pre" itemprop="ab"><sch:report test="(ancestor::tei:ab or ancestor::tei:p) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )"> Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements. </sch:report></div>
                 </td>
               </tr>
               <tr itemprop="row">
@@ -1017,7 +1017,7 @@ <h2>
                   <span xml:lang="es" lang="es" class="label" itemprop="hi">Schematron</span>
                 </td>
                 <td class="wovenodd-col2">
-                  <div class="pre" itemprop="ab"><sch:report test=" (ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )"> Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText. </sch:report></div>
+                  <div class="pre" itemprop="ab"><sch:report test="(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )"> Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText. </sch:report></div>
                 </td>
               </tr>
               <tr itemprop="row">
@@ -1724,7 +1724,7 @@ <h1>
               <span class="hi" itemprop="hi">
                 <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/es/html/ref-abstract.html">abstract</a>
               </span>: 
-              <span xml:lang="en" lang="en" itemprop="seg">contains a summary or formal abstract prefixed to an existing source document by the encoder.</span>[
+              <span xml:lang="es" lang="es" itemprop="seg">Contiene un resumen o abstract formal prefijado a una fuente documental por el codificador.</span>[
               <a class="link_ref" itemprop="ref" href="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/HD.html#HD4ABS">2.4.4. Abstracts</a>]</td>
             </tr>
             <tr itemprop="row">
diff --git a/Test/expected-results/test15.odd.rnc b/Test/expected-results/test15.odd.rnc
index 9271ffe6c..891e0c8dc 100644
--- a/Test/expected-results/test15.odd.rnc
+++ b/Test/expected-results/test15.odd.rnc
@@ -625,7 +625,7 @@ sch:pattern [
     "         "
     sch:report [
       test =
-        "( parent::tei:classRef                               | parent::tei:dataRef                               | parent::tei:elementRef                               | parent::tei:macroRef                               | parent::tei:moduleRef                               | parent::tei:schemaSpec )                               and                               $srcs[2]"
+        "( parent::tei:classRef | parent::tei:dataRef | parent::tei:elementRef | parent::tei:macroRef | parent::tei:moduleRef | parent::tei:schemaSpec ) and $srcs[2]"
       "\x{a}" ~
       "              When used on a schema description element (like\x{a}" ~
       "              "
@@ -1867,7 +1867,7 @@ p =
            "               "
            sch:report [
              test =
-               "    (ancestor::tei:ab or ancestor::tei:p)                          and not( ancestor::tei:floatingText                                 |parent::tei:exemplum                                 |parent::tei:item                                 |parent::tei:note                                 |parent::tei:q                                 |parent::tei:quote                                 |parent::tei:remarks                                 |parent::tei:said                                 |parent::tei:sp                                 |parent::tei:stage                                 |parent::tei:cell                                 |parent::tei:figure                                )"
+               "(ancestor::tei:ab or ancestor::tei:p) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )"
              "\x{a}" ~
              "        Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.\x{a}" ~
              "      "
@@ -1889,7 +1889,7 @@ p =
            "               "
            sch:report [
              test =
-               "    (ancestor::tei:l or ancestor::tei:lg)                          and not( ancestor::tei:floatingText                                 |parent::tei:figure                                 |parent::tei:note                                )"
+               "(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )"
              "\x{a}" ~
              "        Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.\x{a}" ~
              "      "
@@ -5141,7 +5141,7 @@ ab =
            "               "
            sch:report [
              test =
-               "    (ancestor::tei:p or ancestor::tei:ab)                          and not( ancestor::tei:floatingText                                  |parent::tei:exemplum                                 |parent::tei:item                                 |parent::tei:note                                 |parent::tei:q                                 |parent::tei:quote                                 |parent::tei:remarks                                 |parent::tei:said                                 |parent::tei:sp                                 |parent::tei:stage                                 |parent::tei:cell                                 |parent::tei:figure                                )"
+               "(ancestor::tei:p or ancestor::tei:ab) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )"
              "\x{a}" ~
              "        Abstract model violation: ab may not occur inside paragraphs or other ab elements.\x{a}" ~
              "      "
@@ -5163,7 +5163,7 @@ ab =
            "               "
            sch:report [
              test =
-               "    (ancestor::tei:l or ancestor::tei:lg)                         and not( ancestor::tei:floatingText                                 |parent::tei:figure                                 |parent::tei:note                                )"
+               "(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )"
              "\x{a}" ~
              "        Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.\x{a}" ~
              "      "
diff --git a/Test/expected-results/test21.odd.rnc b/Test/expected-results/test21.odd.rnc
index be4a1c17c..e84fcc79a 100644
--- a/Test/expected-results/test21.odd.rnc
+++ b/Test/expected-results/test21.odd.rnc
@@ -658,7 +658,7 @@ sch:pattern [
     "         "
     sch:report [
       test =
-        "( parent::tei:classRef                               | parent::tei:dataRef                               | parent::tei:elementRef                               | parent::tei:macroRef                               | parent::tei:moduleRef                               | parent::tei:schemaSpec )                               and                               $srcs[2]"
+        "( parent::tei:classRef | parent::tei:dataRef | parent::tei:elementRef | parent::tei:macroRef | parent::tei:moduleRef | parent::tei:schemaSpec ) and $srcs[2]"
       "\x{a}" ~
       "              When used on a schema description element (like\x{a}" ~
       "              "
@@ -2266,7 +2266,7 @@ p =
            "               "
            sch:report [
              test =
-               "    (ancestor::tei:ab or ancestor::tei:p)                          and not( ancestor::tei:floatingText                                 |parent::tei:exemplum                                 |parent::tei:item                                 |parent::tei:note                                 |parent::tei:q                                 |parent::tei:quote                                 |parent::tei:remarks                                 |parent::tei:said                                 |parent::tei:sp                                 |parent::tei:stage                                 |parent::tei:cell                                 |parent::tei:figure                                )"
+               "(ancestor::tei:ab or ancestor::tei:p) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )"
              "\x{a}" ~
              "        Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.\x{a}" ~
              "      "
@@ -2288,7 +2288,7 @@ p =
            "               "
            sch:report [
              test =
-               "    (ancestor::tei:l or ancestor::tei:lg)                          and not( ancestor::tei:floatingText                                 |parent::tei:figure                                 |parent::tei:note                                )"
+               "(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )"
              "\x{a}" ~
              "        Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.\x{a}" ~
              "      "
@@ -6333,7 +6333,7 @@ ab =
            "               "
            sch:report [
              test =
-               "    (ancestor::tei:p or ancestor::tei:ab)                          and not( ancestor::tei:floatingText                                  |parent::tei:exemplum                                 |parent::tei:item                                 |parent::tei:note                                 |parent::tei:q                                 |parent::tei:quote                                 |parent::tei:remarks                                 |parent::tei:said                                 |parent::tei:sp                                 |parent::tei:stage                                 |parent::tei:cell                                 |parent::tei:figure                                )"
+               "(ancestor::tei:p or ancestor::tei:ab) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )"
              "\x{a}" ~
              "        Abstract model violation: ab may not occur inside paragraphs or other ab elements.\x{a}" ~
              "      "
@@ -6355,7 +6355,7 @@ ab =
            "               "
            sch:report [
              test =
-               "    (ancestor::tei:l or ancestor::tei:lg)                         and not( ancestor::tei:floatingText                                 |parent::tei:figure                                 |parent::tei:note                                )"
+               "(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )"
              "\x{a}" ~
              "        Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.\x{a}" ~
              "      "
@@ -7957,7 +7957,7 @@ path =
            "\x{a}" ~
            "               "
            sch:report [
-             test = "$firstX eq $lastX  and  $firstY eq $lastY"
+             test = "$firstX eq $lastX and $firstY eq $lastY"
              "The first and\x{a}" ~
              "          last elements of this path are the same. To specify a closed polygon, use\x{a}" ~
              "          the zone element rather than the path element. "
diff --git a/Test/expected-results/test33.rnc b/Test/expected-results/test33.rnc
index 67802312c..c94b1464d 100644
--- a/Test/expected-results/test33.rnc
+++ b/Test/expected-results/test33.rnc
@@ -633,7 +633,7 @@ sch:pattern [
     "         "
     sch:report [
       test =
-        "( parent::tei:classRef                               | parent::tei:dataRef                               | parent::tei:elementRef                               | parent::tei:macroRef                               | parent::tei:moduleRef                               | parent::tei:schemaSpec )                               and                               $srcs[2]"
+        "( parent::tei:classRef | parent::tei:dataRef | parent::tei:elementRef | parent::tei:macroRef | parent::tei:moduleRef | parent::tei:schemaSpec ) and $srcs[2]"
       "\x{a}" ~
       "              When used on a schema description element (like\x{a}" ~
       "              "
@@ -1970,7 +1970,7 @@ tei_p =
            "               "
            sch:report [
              test =
-               "    (ancestor::tei:ab or ancestor::tei:p)                          and not( ancestor::tei:floatingText                                 |parent::tei:exemplum                                 |parent::tei:item                                 |parent::tei:note                                 |parent::tei:q                                 |parent::tei:quote                                 |parent::tei:remarks                                 |parent::tei:said                                 |parent::tei:sp                                 |parent::tei:stage                                 |parent::tei:cell                                 |parent::tei:figure                                )"
+               "(ancestor::tei:ab or ancestor::tei:p) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )"
              "\x{a}" ~
              "        Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.\x{a}" ~
              "      "
@@ -1992,7 +1992,7 @@ tei_p =
            "               "
            sch:report [
              test =
-               "    (ancestor::tei:l or ancestor::tei:lg)                          and not( ancestor::tei:floatingText                                 |parent::tei:figure                                 |parent::tei:note                                )"
+               "(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )"
              "\x{a}" ~
              "        Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.\x{a}" ~
              "      "
@@ -5362,7 +5362,7 @@ tei_ab =
            "               "
            sch:report [
              test =
-               "    (ancestor::tei:p or ancestor::tei:ab)                          and not( ancestor::tei:floatingText                                  |parent::tei:exemplum                                 |parent::tei:item                                 |parent::tei:note                                 |parent::tei:q                                 |parent::tei:quote                                 |parent::tei:remarks                                 |parent::tei:said                                 |parent::tei:sp                                 |parent::tei:stage                                 |parent::tei:cell                                 |parent::tei:figure                                )"
+               "(ancestor::tei:p or ancestor::tei:ab) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )"
              "\x{a}" ~
              "        Abstract model violation: ab may not occur inside paragraphs or other ab elements.\x{a}" ~
              "      "
@@ -5384,7 +5384,7 @@ tei_ab =
            "               "
            sch:report [
              test =
-               "    (ancestor::tei:l or ancestor::tei:lg)                         and not( ancestor::tei:floatingText                                 |parent::tei:figure                                 |parent::tei:note                                )"
+               "(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )"
              "\x{a}" ~
              "        Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.\x{a}" ~
              "      "
diff --git a/Test/expected-results/testdrama.compiled.xml b/Test/expected-results/testdrama.compiled.xml
index 701022bc8..1768bbd28 100644
--- a/Test/expected-results/testdrama.compiled.xml
+++ b/Test/expected-results/testdrama.compiled.xml
@@ -816,22 +816,7 @@ Elements</ref>
         <p> Pour la date, le format le plus courant est <code>yyyy-mm-dd</code>, mais on trouve aussi <code>yyyy</code>, <code>--mm</code>, <code>---dd</code>, <code>yyyy-mm</code>, ou <code>--mm-dd</code>. Pour l'heure, on utilise le format <code>hh:mm:ss</code>.</p>
         <p>Il faut noter qu'actuellement ce format ne permet pas d'utiliser la valeur <val>0000</val> pour représenter l'année précédant le début de l'ère chrétienne ; on doit utiliser la valeur <val>-0001</val>.</p>
       </remarks>
-      <remarks xml:lang="es" versionDate="2008-04-06">
-        <p>El valor del atributo <att>cuando</att> es una serie que representa una fecha o una hora, o ambas, en cualquiera de los siguientes formatos:
-	  <list><item>una fecha en los formatos estándares descritos por la <title ref="#XSD2">XML Schema Part 2: Datatypes Second Edition, p.ej. en el formato más común aaaa-mm-dd, pero también
-	  aaaa, --mm, ---dd,
-	  aaaa-mm, o --mm-dd
-                  ; una hora en el formato estándar descrito en 
-	  XML Schema Part 2: Datatypes Second
-	  Edition, es decir. hh: mm: ss
-                  ; o una fecha y una hora combinadas en los formatos estándares descritos en XML Schema Part 2: Datatypes Second
-	  Edition, es decir. aaaa-mm-ddThh: mm: ss
-                  .

-        
Obligatoriamente el valor de cuando aparecerá en un formato de fecha, tiempo, o ambos formatos combinados, de los reconocidos por W3C XML Schema Part 2: Datatypes Second Edition. Esto se dará si el componente de la fecha (eventualmente) es una fecha gregoriana o proléptica gregoriana.

-        
A la hora de esta escritura, W3C no permite el año 0000, que sería utilizado normalmente para representar el año 1 antes de nuestra era. Usando el sistema actual de W3C, el año 1 a.C. se indica con -0001, el año 2 a.C. con -0002, etc. Es la intención del grupo de trabajo del esquema de XML permitir 0000 como la representación léxica de 1 a.C. (que es un año bisiesto),
-	  -0001 se convertiria en la representación léxica de 2 a.C., -0002 de 3 a.C., etc. Así en algunos casos puede ser ventajoso utilizar en su lugar el atributo cuando-ISO
-	  para indicar los años anteriores a nuestra era.

-      
+      
El valor del atributo cuando es una serie que representa una fecha o una hora, o ambas, en cualquiera de los siguientes formatos: una fecha en los formatos estándares descritos por la XML Schema Part 2: Datatypes Second Edition, p.ej. en el formato más común aaaa-mm-dd, pero también aaaa, --mm, ---dd, aaaa-mm, o --mm-dd; una hora en el formato estándar descrito en XML Schema Part 2: Datatypes Second Edition, es decir. hh: mm: ss; o una fecha y una hora combinadas en los formatos estándares descritos en XML Schema Part 2: Datatypes Second Edition, es decir. aaaa-mm-ddThh: mm: ss. Obligatoriamente el valor de cuando aparecerá en un formato de fecha, tiempo, o ambos formatos combinados, de los reconocidos por W3C XML Schema Part 2: Datatypes Second Edition. Esto se dará si el componente de la fecha (eventualmente) es una fecha gregoriana o proléptica gregoriana. A la hora de esta escritura, W3C no permite el año 0000, que sería utilizado normalmente para representar el año 1 antes de nuestra era. Usando el sistema actual de W3C, el año 1 a.C. se indica con -0001, el año 2 a.C. con -0002, etc. Es la intención del grupo de trabajo del esquema de XML permitir 0000 como la representación léxica de 1 a.C. (que es un año bisiesto), -0001 se convertiria en la representación léxica de 2 a.C., -0002 de 3 a.C., etc. Así en algunos casos puede ser ventajoso utilizar en su lugar el atributo cuando-ISO para indicar los años anteriores a nuestra era.

       
         

           この属性の値は，グレゴリオ暦を用い、XML Schema Part 2: Datatypes Second Editionで定義されるいずれかの標準形式で正規化された日付や時刻，あるいはその組み合わせである。時間の属性としてもっともよく使われる形式は，yyyy-mm-ddだが，yyyy，--mm，---dd，yyyy-mm，--mm-ddも用いてもよい．時間については，hh:mm:ssが用いられる．この形式は，紀元前1年を表現するのに0000という値を用いることは現在のところ許容していないことには注意されたい．代わりに-0001という値を用いる必要がある．
@@ -1793,7 +1778,7 @@ the TEI header.

         
           
             
-            
+            
               When used on a schema description element (like
               ), the @source attribute
               should have only 1 value. (This one has .)
@@ -7098,14 +7083,14 @@ Elements
   
   
     
-      
+      
         Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.
       
     
   
   
     
-      
+      
         Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.
       
     
@@ -16563,6 +16548,7 @@ by the stage direction.

         
           una tabla de contenidos.
           a table of contents
+  una tabla de contenidos.
           목차
           目錄
           目次．
@@ -21788,6 +21774,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.
+  Contiene un resumen o abstract formal prefijado a una fuente documental por el codificador.
   contiene un riepilogo o abstract formale aggiunto, in testa a un dato documento di origine, da chi codifica.   
   enthält eine (formale) Zusammenfassung, die einem bestehenden Quelldokument vorangestellt wird.
   符号化する人によって既存の元文書の前に付加された要約または正式な要約を含む．
@@ -21824,6 +21811,7 @@ elements of  profileDesc unless these are documenting multiple texts.div within the front, as it
       should for a born-digital document. 

   
+  
Este elemento debe utilizarse solo en casos en los que el abstract no se encuentra disponible en la fuente original. Cualquier abstract presente en el documento fuente debe ser codificado como un div dentro del front, como corresponde en los casos de documentos de origen digital.

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

   
     2.4.4. Abstracts
@@ -23594,6 +23582,7 @@ during the evolution of the encoded representation of that text.

     it, for example: TEI version="4.4.0"
     xml:lang="it" xmlns="http://www.tei-c.org/ns/1.0".

   
+  
Este elemento/campo es requerido/obligatorio. Se acostumbra especificar el espacio del nombre/namespace TEI http://www.tei-c.org/ns/1.0 usando el atributo xmlns.

   
     
Cet élément est obligatoire.

   
@@ -24426,7 +24415,7 @@ during the evolution of the encoded representation of that text.

     
       
         livre premier
-        
+        
           La Grand'salle
           
Il y a aujourd'hui trois cent quarante-huit ans six mois et dix-neuf jours que les
           parisiens s'éveillèrent au bruit de toutes les cloches sonnant à grande volée dans la
@@ -24435,7 +24424,7 @@ during the evolution of the encoded representation of that text.

       
       
         livre deuxième
-        
+        
           De Charybde en Scylla 
           
La nuit arrive de bonne heure en janvier. Les rues étaient déjà sombres quand
           Gringoire sortit du Palais.

@@ -27824,14 +27813,14 @@ the date of the entire document, not for any subset or part of it.

   
   
     
-      
+      
         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, unless ab is a child of figure or note, or is a descendant of floatingText.
       
     
@@ -30519,6 +30508,7 @@ either a single role or a list of non-speaking roles.
     marking the components of names, and also of associating names with
     biographical information about a person. 

   
+  
Este elemento debe ser usado solo para marcar el nombre del actor tal como aparece en la fuente. El capítulo 13. Names, Dates, People, and Places comenta/discute formas de marcar los componentes de los nombres,  asi como también asociar nombre con información biográfica sobre una persona

   
     
Cet élément ne devrait être utilisé que pour encoder le nom de l'acteur tel qu'il est donné
                 dans la source. Le chapitre 13. Names, Dates, People, and Places
diff --git a/Test2/expected-results/testPure1.rng b/Test2/expected-results/testPure1.rng
index 544959407..793aaefaa 100644
--- a/Test2/expected-results/testPure1.rng
+++ b/Test2/expected-results/testPure1.rng
@@ -829,7 +829,7 @@ Suggested values include: 1] internal; 2] external; 3] conjecture
          
-         
+         
               When used on a schema description element (like
               ), the @source attribute
               should have only 1 value. (This one has .)
@@ -3240,7 +3240,7 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
                
+                           test="(ancestor::tei:ab or ancestor::tei:p) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )">
         Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.
       
             
@@ -3251,7 +3251,7 @@ Suggested values include: 1] page; 2] column; 3] line; 4] book; 5] poem; 6] cant
                
+                           test="(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )">
         Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.
       
             
@@ -6960,7 +6960,7 @@ The attributes @to and @from on  may each contain only a single value
+                           test="(ancestor::tei:p or ancestor::tei:ab) and not( ancestor::tei:floatingText |parent::tei:exemplum |parent::tei:item |parent::tei:note |parent::tei:q |parent::tei:quote |parent::tei:remarks |parent::tei:said |parent::tei:sp |parent::tei:stage |parent::tei:cell |parent::tei:figure )">
         Abstract model violation: ab may not occur inside paragraphs or other ab elements.
       
             
@@ -6972,7 +6972,7 @@ The attributes @to and @from on  may each contain only a single value
+                           test="(ancestor::tei:l or ancestor::tei:lg) and not( ancestor::tei:floatingText |parent::tei:figure |parent::tei:note )">
         Abstract model violation: Lines may not contain higher-level divisions such as p or ab, unless ab is a child of figure or note, or is a descendant of floatingText.
       
             
diff --git a/source/p5subset.xml b/source/p5subset.xml
index b37f1c4fa..795658779 100644
--- a/source/p5subset.xml
+++ b/source/p5subset.xml
@@ -7,7 +7,7 @@
       
       
         Version 4.5.0a. Last updated on
-        1st June 2022, revision aeba95253
+        16th June 2022, revision 9c0e52181
       
       
         TEI Consortium
@@ -1245,22 +1245,7 @@ of any adjacent whitespace
         
 Pour la date, le format le plus courant est yyyy-mm-dd, mais on trouve aussi yyyy, --mm, ---dd, yyyy-mm, ou --mm-dd. Pour l'heure, on utilise le format hh:mm:ss.

         
Il faut noter qu'actuellement ce format ne permet pas d'utiliser la valeur 0000 pour représenter l'année précédant le début de l'ère chrétienne ; on doit utiliser la valeur -0001.

       
-      
-        
El valor del atributo cuando es una serie que representa una fecha o una hora, o ambas, en cualquiera de los siguientes formatos:
-	  una fecha en los formatos estándares descritos por la XML Schema Part 2: Datatypes Second Edition, p.ej. en el formato más común aaaa-mm-dd, pero también
-	  aaaa, --mm, ---dd,
-	  aaaa-mm, o --mm-dd
-                  ; una hora en el formato estándar descrito en 
-	  XML Schema Part 2: Datatypes Second
-	  Edition, es decir. hh: mm: ss
-                  ; o una fecha y una hora combinadas en los formatos estándares descritos en XML Schema Part 2: Datatypes Second
-	  Edition, es decir. aaaa-mm-ddThh: mm: ss
-                  .

-        
Obligatoriamente el valor de cuando aparecerá en un formato de fecha, tiempo, o ambos formatos combinados, de los reconocidos por W3C XML Schema Part 2: Datatypes Second Edition. Esto se dará si el componente de la fecha (eventualmente) es una fecha gregoriana o proléptica gregoriana.

-        
A la hora de esta escritura, W3C no permite el año 0000, que sería utilizado normalmente para representar el año 1 antes de nuestra era. Usando el sistema actual de W3C, el año 1 a.C. se indica con -0001, el año 2 a.C. con -0002, etc. Es la intención del grupo de trabajo del esquema de XML permitir 0000 como la representación léxica de 1 a.C. (que es un año bisiesto),
-	  -0001 se convertiria en la representación léxica de 2 a.C., -0002 de 3 a.C., etc. Así en algunos casos puede ser ventajoso utilizar en su lugar el atributo cuando-ISO
-	  para indicar los años anteriores a nuestra era.

-      
+      
El valor del atributo cuando es una serie que representa una fecha o una hora, o ambas, en cualquiera de los siguientes formatos: una fecha en los formatos estándares descritos por la XML Schema Part 2: Datatypes Second Edition, p.ej. en el formato más común aaaa-mm-dd, pero también aaaa, --mm, ---dd, aaaa-mm, o --mm-dd; una hora en el formato estándar descrito en XML Schema Part 2: Datatypes Second Edition, es decir. hh: mm: ss; o una fecha y una hora combinadas en los formatos estándares descritos en XML Schema Part 2: Datatypes Second Edition, es decir. aaaa-mm-ddThh: mm: ss. Obligatoriamente el valor de cuando aparecerá en un formato de fecha, tiempo, o ambos formatos combinados, de los reconocidos por W3C XML Schema Part 2: Datatypes Second Edition. Esto se dará si el componente de la fecha (eventualmente) es una fecha gregoriana o proléptica gregoriana. A la hora de esta escritura, W3C no permite el año 0000, que sería utilizado normalmente para representar el año 1 antes de nuestra era. Usando el sistema actual de W3C, el año 1 a.C. se indica con -0001, el año 2 a.C. con -0002, etc. Es la intención del grupo de trabajo del esquema de XML permitir 0000 como la representación léxica de 1 a.C. (que es un año bisiesto), -0001 se convertiria en la representación léxica de 2 a.C., -0002 de 3 a.C., etc. Así en algunos casos puede ser ventajoso utilizar en su lugar el atributo cuando-ISO para indicar los años anteriores a nuestra era.

       
         

           この属性の値は，グレゴリオ暦を用い、XML Schema Part 2: Datatypes Second Editionで定義されるいずれかの標準形式で正規化された日付や時刻，あるいはその組み合わせである。時間の属性としてもっともよく使われる形式は，yyyy-mm-ddだが，yyyy，--mm，---dd，yyyy-mm，--mm-ddも用いてもよい．時間については，hh:mm:ssが用いられる．この形式は，紀元前1年を表現するのに0000という値を用いることは現在のところ許容していないことには注意されたい．代わりに-0001という値を用いる必要がある．
@@ -2364,7 +2349,7 @@ the TEI header.

         
           
             
-            
+            
               When used on a schema description element (like
               ), the @source attribute
               should have only 1 value. (This one has .)
@@ -13669,6 +13654,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.
+  Contiene un resumen o abstract formal prefijado a una fuente documental por el codificador.
   contiene un riepilogo o abstract formale aggiunto, in testa a un dato documento di origine, da chi codifica.   
   enthält eine (formale) Zusammenfassung, die einem bestehenden Quelldokument vorangestellt wird.
   符号化する人によって既存の元文書の前に付加された要約または正式な要約を含む．
@@ -13705,6 +13691,7 @@ elements of  profileDesc unless these are documenting multiple texts.div within the front, as it
       should for a born-digital document. 

   
+  
Este elemento debe utilizarse solo en casos en los que el abstract no se encuentra disponible en la fuente original. Cualquier abstract presente en el documento fuente debe ser codificado como un div dentro del front, como corresponde en los casos de documentos de origen digital.

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

   
     
@@ -15288,14 +15275,14 @@ supplied to printer.
   
   
     
-      
+      
         Abstract model violation: Paragraphs may not occur inside other paragraphs or ab elements.
       
     
   
   
     
-      
+      
         Abstract model violation: Lines may not contain higher-level structural elements such as div, p, or ab, unless p is a child of figure or note, or is a descendant of floatingText.
       
     
@@ -24972,6 +24959,7 @@ by the stage direction.

     it, for example: TEI version="4.4.0"
     xml:lang="it" xmlns="http://www.tei-c.org/ns/1.0".

   
+  
Este elemento/campo es requerido/obligatorio. Se acostumbra especificar el espacio del nombre/namespace TEI http://www.tei-c.org/ns/1.0 usando el atributo xmlns.

   
     
Cet élément est obligatoire.

   
@@ -25987,7 +25975,7 @@ by the stage direction.

     
       
         livre premier
-        
+        
           La Grand'salle
           
Il y a aujourd'hui trois cent quarante-huit ans six mois et dix-neuf jours que les
           parisiens s'éveillèrent au bruit de toutes les cloches sonnant à grande volée dans la
@@ -25996,7 +25984,7 @@ by the stage direction.

       
       
         livre deuxième
-        
+        
           De Charybde en Scylla 
           
La nuit arrive de bonne heure en janvier. Les rues étaient déjà sombres quand
           Gringoire sortit du Palais.

@@ -26930,6 +26918,7 @@ by the stage direction.

         
           una tabla de contenidos.
           a table of contents
+  una tabla de contenidos.
           목차
           目錄
           目次．
@@ -31739,7 +31728,7 @@ enjambement is not of particular interest.

   
   
     
-      
+      
         故人西辭黃鶴 樓，
         煙花三月下揚州；
         孤帆遠影碧山盡，
@@ -33031,6 +33020,7 @@ either a single role or a list of non-speaking roles.
     marking the components of names, and also of associating names with
     biographical information about a person. 

   
+  
Este elemento debe ser usado solo para marcar el nombre del actor tal como aparece en la fuente. El capítulo  comenta/discute formas de marcar los componentes de los nombres,  asi como también asociar nombre con información biográfica sobre una persona

   
     
Cet élément ne devrait être utilisé que pour encoder le nom de l'acteur tel qu'il est donné
                 dans la source. Le chapitre 
@@ -35215,7 +35205,7 @@ very loudly.

           동형이의어
           homographe.
           omografo
-          un homógrafo con una entrada separada
+          homógrafo 
           同形異義語
           groups information relating to one homograph within an entry.
           표제 항목 내에 하나의 동형이의어와 관련된 정보를 모아 놓는다.
@@ -35232,10 +35222,7 @@ very loudly.

           교차 참조
           référence croisée
           riferimento incrociato
-          una breve entrada cuya única función es apuntar
-            a otra entrada principal (p.ej. para formas de un verbo irregular o para otras variantes
-            ortográficas: was señala a be, o
-              esthete a aesthete).
+          referencia  cruzada
           相互参照
           a reduced entry whose only function is to point to another main
             entry (e.g. for forms of an irregular verb or for variant spellings:
@@ -35246,10 +35233,7 @@ very loudly.

               aesthete를 지시하는 esthete
                
           縮減的辭條，其唯一作用為指向另一個主要辭條 (例如不規則動辭形式或不同拼法的字)
-          una entrada reducida cuya única función es la de
-            señalar otra entrada principal (p.ej. para las formas de un verbo irregular o para los
-            deletreos variables: era señala a es, o
-              esthete a esteta).
+          una breve entrada cuya única función es apuntar a otra entrada principal (p.ej. para formas de un verbo irregular o para otras variantes ortográficas: was señala a be, o esthete a aesthete).
           相互参照．主項目への参照．例えば，不規則変化動詞の場合には，
               wasからbeを参照
               したり，異なる綴りの場合には，estheteか らaestheteを参照する．
@@ -35278,7 +35262,7 @@ very loudly.

           생략형
           abréviation.
           abbreviazione
-          una entrada para una abreviatura
+          abreviatura
           省略
           an entry for an abbreviation.
           생략형에 대한 표제 항목
@@ -45354,7 +45338,7 @@ element.
     
       
         
-        
+        
       
     
     
This example defines a non-rectangular zone: see the illustration
@@ -45444,7 +45428,7 @@ element.
         
         
         
-        The first and
+        The first and
           last elements of this path are the same. To specify a closed polygon, use
           the zone element rather than the path element. 
       
@@ -45628,6 +45612,7 @@ en-tête et un texte, constitue un document TEI.
     marked; the beginning by the addSpan element itself, the
     end by the spanTo attribute.

   
+  
Tanto el inicio como el final del material que se agrego debe ser marcado; el inicio con el mismo elemento addSpan  y el final con el atributo spanTo.

   
     
Le début et la fin de la partie de texte ajoutée doivent être marqués ; le début, par l'élément
                     addSpan lui-même, la fin, par l'attribut spanTo.

@@ -48233,7 +48218,7 @@ or external to it.
       
         
           
-            
+            
               The @location value "external" is inconsistent with the
               parallel-segmentation method of apparatus markup.
           
@@ -49749,10 +49734,12 @@ different witnesses.
 	
 	
 	  in world
+  en el mundo
 	  物語世界
 	  age of a fictional character at the time the story
 	  takes place, rather than at the time the story is
 	  told
+  Edad de un personaje ficcional en el tiempo en el que la historia sucede (no en el tiempo en el cual es contada).
 	  物語を語る時点ではなく，物語の中の時点における架空の人物の年齢．
 	
 	
@@ -49777,6 +49764,7 @@ different witnesses.
         
This attribute may be used to complement a more detailed discussion of a person's age in
           the content of the element

       
+  
Este atributo debería ser usado para complementar un debate más detallado sobre la edad de la persona en el contenido del elemento

       
         
Cet attribut peut être utilisé pour compléter les détails sur l'âge d'une personne donnés
           dans l'élément.

@@ -55944,6 +55932,7 @@ language interaction is doing other than speaking, if anything.
 activities during a spoken text, the event element should
 be used.

   
+  
Para una descripción más detallada de las acciones de los partiipantes durante los parlamentos, debe utilizarse el elemento  event

   
     
Pour une description plus fine de toute activité survenant lors d'une communication
                 orale transcrite, utilisez l'élément event. 

@@ -56193,14 +56182,14 @@ Information with a Text
   
   
     
-      
+      
         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, unless ab is a child of figure or note, or is a descendant of floatingText.
       
     
@@ -61625,7 +61614,7 @@ instead of the adj attribute.

   
   
     
-      
+      
         
         
           
@@ -64886,7 +64875,7 @@ used for recording how parts of the example was rendered.
     
       
         
-        
+        
         
         
         
@@ -65019,7 +65008,7 @@ Child elements of  are only allowed when an external module is being load
       
         
           
-            The prefix attribute
+            The prefix attribute
 	    of  should not match that of any other
 	    element (it would defeat the purpose)
           
@@ -66236,7 +66225,7 @@ portion of an ODD document.
   
   
     
-      
+      
         In the context of tagset documentation, each ptr or ref element inside a listRef must have a target attribute with only 1 pointer as its value.
       
     
@@ -66762,7 +66751,7 @@ déclaration de même nom dans la définition courante.
       deprecated.
     
     
-      
+      
         Use of <altIdent> as a child of <> is
         deprecated, and will no longer be valid after 2022-07-14.
       
@@ -66870,7 +66859,7 @@ déclaration de même nom dans la définition courante.
     
       
         
-        
+        
           There are 2 (or more) 'model' elements in this ''
           that have no predicate, but are targeted to the same output
           ("")
@@ -66885,7 +66874,7 @@ déclaration de même nom dans la définition courante.
       
         
         
-        
+        
           There are 2 (or more) 'model' elements in this
           '' that have
           the same predicate, and are targeted to the same output
@@ -67223,7 +67212,7 @@ déclaration de même nom dans la définition courante.
     
       
         
-        
+        
           
         
         
@@ -67791,7 +67780,7 @@ déclaration de même nom dans la définition courante.
     
       
       
-      
+      
     
   
   
@@ -67925,12 +67914,12 @@ déclaration de même nom dans la définition courante.
          maxOccurs is 1, when maxOccurs is not specified
          minOccurs must always be less than or equal to 1. -->
     
-      
+      
         
-        
-        @maxOccurs should be greater than or equal to @minOccurs
+        
+        @maxOccurs should be greater than or equal to @minOccurs
       
-      
+      
         When @maxOccurs is not specified, @minOccurs must be 0 or 1
       
     
@@ -68137,7 +68126,7 @@ déclaration de même nom dans la définition courante.
     Relationship between scheme attribute and contents: Schematron 1.x
     
       
-      Rules
+      Rules
         in the Schematron 1.* language must be inside a constraintSpec
         with a value other than 'schematron' or 'isoschematron' on the
         scheme attribute
@@ -68147,7 +68136,7 @@ déclaration de même nom dans la définition courante.
     Relationship between scheme attribute and contents: ISO Schematron
     
       
-      Rules
+      Rules
         in the ISO Schematron language must be inside a constraintSpec
         with the value 'schematron' on the scheme attribute
     
@@ -68163,7 +68152,7 @@ déclaration de même nom dans la définition courante.
   
   
     
-      
+      
         
         
         The @ident of 'constraintSpec' should be unique; this one () is the same as that of a previous 'constraintSpec'.
@@ -68439,8 +68428,8 @@ déclaration de même nom dans la définition courante.
   
   
     
-      
-        In the  defining
+      
+        In the  defining
          the default value of the
         @ attribute is not among the closed list of possible
         values
@@ -68449,8 +68438,8 @@ déclaration de même nom dans la définition courante.
   
   
     
-      
-        In the  defining
+      
+        In the  defining
          the default value of the
         @ attribute is not among the closed list of possible
         values
@@ -69551,7 +69540,7 @@ an attribute may take, additional to the information carried by the
   
     
       
-        
+        
         Specification : the value of the module attribute ("") 
 should correspond to an existing module, via a moduleSpec or
       moduleRef
@@ -69620,10 +69609,10 @@ should correspond to an existing module, via a moduleSpec or
         
           
             
-            
-            
-              
-              
+            
+            
+              
+              
                 
               
           

From bdb0b46ad01421f18475f516db3ad842e41f24d0 Mon Sep 17 00:00:00 2001
From: Syd Bauman 
Date: Fri, 1 Jul 2022 10:04:01 -0400
Subject: [PATCH 20/23] Update expected result to reflect new, improved actual
 result.

---
 Test/expected-results/mdtest2.md | 74 +++++++++++++++++++++-----------
 1 file changed, 48 insertions(+), 26 deletions(-)

diff --git a/Test/expected-results/mdtest2.md b/Test/expected-results/mdtest2.md
index 1a38f5aef..e7941b523 100644
--- a/Test/expected-results/mdtest2.md
+++ b/Test/expected-results/mdtest2.md
@@ -9,7 +9,7 @@ I have endeavoured in this Ghostly little book, to raise the Ghost of an Idea, w
 Their faithful Friend and Servant, C.D. December, 1843.
 # Contents.
 Stave I
-* Marley's ghost 1
+* Marley's ghost [1](#S1)
 Stave II
 * The first of the three spirits 
 Stave III 
@@ -18,23 +18,33 @@ Stave IV
 * The last of the spirits 
 Stave V
 * The end of it 
- 
+
 *(Bits of) A CHRISTMAS CAROL, and other things
 # Simple rendition tests
 
 Who-e debel you? — he at last said — you no speak-e, damme, I kill-e. And so saying, the lighted tomahawk began flourishing about me in the dark.
 
 Who-e debel you? — he at last said — you no speak-e, damme, I kill-e. And so saying, the lighted tomahawk began flourishing about me in the dark.
-EffectExamplehiThis is hi rend="special" tagemphThis is emph taghiThis is hi tagtypewriterThis is typewriter effectboldThis is bold effectnormalweightThis is normalweight effectsmallcapsThis is smallcaps effectallcapsThis is allcaps effectstrikethroughThis is strikethrough effectdoublestrikethroughThis is doublestrikethrough effectcolor(red)This is color(red) effectunderlineThis is underline effectwavyunderlineThis is wavyunderline effectdoubleunderlineThis is doubleunderline effectsubscriptThis is subscript effectsuperscriptThis is superscript effectbold italic red, done separatelyrend test 1bold italic smallcapsrend test 1 Cairns 2003: 11. My work is Muellner 1996.
+EffectExamplehiThis is hi rend="special" tagemphThis is emph taghiThis is hi tagtypewriterThis is typewriter effectboldThis is **bold** effectnormalweightThis is normalweight effectsmallcapsThis is smallcaps effectallcapsThis is allcaps effectstrikethroughThis is strikethrough effectdoublestrikethroughThis is doublestrikethrough effectcolor(red)This is color(red) effectunderlineThis is underline effectwavyunderlineThis is wavyunderline effectdoubleunderlineThis is doubleunderline effectsubscriptThis is subscript effectsuperscriptThis is superscript effectbold italic red, done separately**rend test 1**bold italic smallcapsrend test 1 
+\[Cairns 2003: 11. My work is Muellner 1996.\]
+
 # Quotations
 
-A paragraph with a footnote containing a block-level objectWe start with a quotation:This is the way the world endsThis is the way the world endsThis is the way the world endsNot with a bang but a whimper. which is from TS Eliot's Hollow men
+A paragraph with a footnote containing a block-level object
+\[We start with a quotation:
+This is the way the world ends  
+This is the way the world ends  
+This is the way the world ends  
+Not with a bang but a whimper.  
+
+ which is from TS Eliot's Hollow men\]
+
 
 Consider quotations: This is a quote which is run on within the text and will have quote marks of some kind around it.
 
 Another quotation: This is a block quote set off as such from the rest of the text
 
-Here, by contrast is an inline quotation. Another strange thing about quotes is this: You can put line breaksto determine where the line breaksInside a block!
+Here, by contrast is an “inline quotation”. Another strange thing about quotes is this: You can put line breaksto determine where the line breaksInside a block!
 
 # Use of xml:lang
 
@@ -64,11 +74,19 @@ I am changed: I'll go sell all my land.
 
 # Footnotes and endnotes
 
-## 1 Zur Entstehung der Philosophischen UntersuchungenZu Textauszeichnungen und Siglen siehe die Legende.
+## 1 Zur Entstehung der Philosophischen Untersuchungen
+\[Zu Textauszeichnungen und Siglen siehe die Legende.\]
+
 
-Iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismodIt is time to begin the beguine. Iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod
+Iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod
+\[It is time to begin the beguine.\]
+ Iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod
 
-Iriure dolor in hendrerit in vulputateNot Vulture velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blanditNot Blandings praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod
+Iriure dolor in hendrerit in vulputate
+\[Not Vulture\]
+ velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit
+\[Not Blandings\]
+ praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod
 
 # Assorted elements and links
 
@@ -76,24 +94,24 @@ Fit the first The emph element is used for linguistic emphasis. highlighting (so
 
 Now for some links! We will start by cross-referring to a later section.
 
-Here is a simple ptr to it: . Here is a simple ref, a reference to it.
+Here is a simple ptr to it: . Here is a simple ref, a [reference to it](#P1).
 
-An external link as ref and as ptr: .
+An [external link](http://www.bbc.co.uk) as ref and as ptr: .
 
 # Tables
 
 Tables may have cells that span multiple columns and rows.
-ImageDescriptionCamera directionSVG, JPEG, GIF or PNG formatAll pictures were taken on Jun 27, 2007 ![graphic](nature1.jpg "graphic")Mountain flowers. north![graphic](nature2.jpg "graphic")Sunset over a secondary ridge.north-east![graphic](nature3.jpg "graphic")Glacier lake at 2100m altitude.eastSpans HorizontallyHeader 3Spans HorizontallySpans VerticallyabcdeSpans bothfggijSpans Horizontallyklmno
+ImageDescriptionCamera directionSVG, JPEG, GIF or PNG formatAll pictures were taken on Jun 27, 2007 ![graphic](nature1.jpg "graphic")Mountain flowers. north![graphic](nature2.jpg "graphic")Sunset over a secondary ridge.north-east![graphic](nature3.jpg "graphic")Glacier lake at 2100m altitude.eastSpans **Horizontally**Header 3Spans **Horizontally**Spans **Vertically**abcdeSpans **both**fggijSpans **Horizontally**klmno
 # Lists
 
-Various sorts of list are legal within paragraphs, and you can reference items in lists... 
-1. Dogs
+Various sorts of list are legal within paragraphs, and you can reference [items in lists](#birds)... 
+1.Dogs
 
-1. Zebras
+1.Zebras
 
-1. Birds
+1.Birds
 
-1. Cats
+1.Cats
 
 100
 * first item 
@@ -276,7 +294,11 @@ It's not my business, Scrooge returned. It's enough for a man to understand his
 
 Seeing clearly that it would be useless to pursue their point, the gentlemen withdrew. Scrooge resumed his labours with an improved opinion of himself, and in a more facetious temper than was usual with him. 
 
-Foggier yet, and colder! Piercing, searching, biting cold. If the good Saint Dunstan had but nipped the Evil Spirit's nose with a touch of such weather as that, test of a note instead of using his familiar weapons, then indeed he would have roared to lusty purpose. The owner of one scant young nose, gnawed and mumbled by the hungry cold as bones are gnawed by dogs, stooped down at Scrooge's keyhole to regale him with a Christmas carol: but at the first sound of God bless you, merry gentleman! May nothing you dismay!  Scrooge seized the ruler with such energy of action that the singer fled in terror, leaving the keyhole to the fog and even more congenial frost.
+Foggier yet, and colder! Piercing, searching, biting cold. If the good Saint Dunstan had but nipped the Evil Spirit's nose with a touch of such weather as that, 
+\[test of a note\]
+ instead of using his familiar weapons, then indeed he would have roared to lusty purpose. The owner of one scant young nose, gnawed and mumbled by the hungry cold as bones are gnawed by dogs, stooped down at Scrooge's keyhole to regale him with a Christmas carol: but at the first sound of “God bless you, merry gentleman!   
+May nothing you dismay!   
+” Scrooge seized the ruler with such energy of action that the singer fled in terror, leaving the keyhole to the fog and even more congenial frost.
 
 # Linking
 
@@ -286,24 +308,24 @@ Foggier yet, and colder! Piercing, searching, biting cold. If the good Saint Dun
 
 
 
-Fred
+[Fred](psn:fred)
 
-Jones 76
+[Jones 76](bibl:Jones76)
 
 # Testing preservation of ID
 
 Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet. With references to 
-* Quotation
+* [Quotation](#thisQuotation)
 
-* Citation
+* [Citation](#thisCitation)
 
-* Paragraph
+* [Paragraph](#thisParagraph)
 
-* Reference
+* [Reference](#thisReference)
 
-* Anchor
+* [Anchor](#movingAnchor)
 
-* Title
+* [Title](#thisTitle)
 
 
 I wonder what are the xml-ids preserved in a transformation to XHTML, in particular in the case of quotations. So, let’s try :
@@ -324,6 +346,6 @@ an egXML in a list:
 
 # divs with no heads
 
-Ampersands: Fit the first& Fit the first& more Fit the first& more Fit the first&& Fit the first" Fit the first @ http://www.example.com/?foo=bar&bar=foo.
+Ampersands: Fit the first& Fit the first& more Fit the first& more Fit the first&& Fit the first" Fit the first @ [http://www.example.com/?foo=bar&bar=foo](http://www.example.com/?foo=bar&bar=foo).
 Ampersands: Fit the first& Fit the first& more Fit the first& more Fit the first&& Fit the first" (as opposed to ") Fit the first @ http://www.example.com/?foo=bar&bar=foo.
 Fit the second

From d48729256e63e33e489186cf23898b20ab575a53 Mon Sep 17 00:00:00 2001
From: Syd Bauman 
Date: Fri, 1 Jul 2022 10:15:04 -0400
Subject: [PATCH 21/23] Update Test2/ expected result to reflect new, improved
 actual output.

---
 Test2/expected-results/generalP5.md | 74 +++++++++++++++++++----------
 1 file changed, 48 insertions(+), 26 deletions(-)

diff --git a/Test2/expected-results/generalP5.md b/Test2/expected-results/generalP5.md
index bedd84992..753c378d3 100644
--- a/Test2/expected-results/generalP5.md
+++ b/Test2/expected-results/generalP5.md
@@ -9,7 +9,7 @@ I have endeavoured in this Ghostly little book, to raise the Ghost of an Idea, w
 Their faithful Friend and Servant, C.D. December, 1843.
 # Contents.
 Stave I
-* Marley's ghost 1
+* Marley's ghost [1](#S1)
 Stave II
 * The first of the three spirits 
 Stave III 
@@ -18,23 +18,33 @@ Stave IV
 * The last of the spirits 
 Stave V
 * The end of it 
- 
+
 *(Bits of) A CHRISTMAS CAROL, and other things
 # Simple rendition tests
 
 Who-e debel you? — he at last said — you no speak-e, damme, I kill-e. And so saying, the lighted tomahawk began flourishing about me in the dark.
 
 Who-e debel you? — he at last said — you no speak-e, damme, I kill-e. And so saying, the lighted tomahawk began flourishing about me in the dark.
-EffectExamplehiThis is hi rend="special" tagemphThis is emph taghiThis is hi tagtypewriterThis is typewriter effectboldThis is bold effectnormalweightThis is normalweight effectsmallcapsThis is smallcaps effectallcapsThis is allcaps effectstrikethroughThis is strikethrough effectdoublestrikethroughThis is doublestrikethrough effectcolor(red)This is color(red) effectunderlineThis is underline effectwavyunderlineThis is wavyunderline effectdoubleunderlineThis is doubleunderline effectsubscriptThis is subscript effectsuperscriptThis is superscript effectbold italic red, done separatelyrend test 1bold italic smallcapsrend test 1 Cairns 2003: 11. My work is Muellner 1996.
+EffectExamplehiThis is hi rend="special" tagemphThis is emph taghiThis is hi tagtypewriterThis is typewriter effectboldThis is **bold** effectnormalweightThis is normalweight effectsmallcapsThis is smallcaps effectallcapsThis is allcaps effectstrikethroughThis is strikethrough effectdoublestrikethroughThis is doublestrikethrough effectcolor(red)This is color(red) effectunderlineThis is underline effectwavyunderlineThis is wavyunderline effectdoubleunderlineThis is doubleunderline effectsubscriptThis is subscript effectsuperscriptThis is superscript effectbold italic red, done separately**rend test 1**bold italic smallcapsrend test 1 
+\[Cairns 2003: 11. My work is Muellner 1996.\]
+
 # Quotations
 
-A paragraph with a footnote containing a block-level objectWe start with a quotation:This is the way the world endsThis is the way the world endsThis is the way the world endsNot with a bang but a whimper. which is from TS Eliot's Hollow men
+A paragraph with a footnote containing a block-level object
+\[We start with a quotation:
+This is the way the world ends  
+This is the way the world ends  
+This is the way the world ends  
+Not with a bang but a whimper.  
+
+ which is from TS Eliot's Hollow men\]
+
 
 Consider quotations: This is a quote which is run on within the text and will have quote marks of some kind around it.
 
 Another quotation: This is a block quote set off as such from the rest of the text
 
-Here, by contrast is an inline quotation. Another strange thing about quotes is this: You can put line breaksto determine where the line breaksInside a block!
+Here, by contrast is an “inline quotation”. Another strange thing about quotes is this: You can put line breaksto determine where the line breaksInside a block!
 
 # Use of xml:lang
 
@@ -64,11 +74,19 @@ I am changed: I'll go sell all my land.
 
 # Footnotes and endnotes
 
-## 1 Zur Entstehung der Philosophischen UntersuchungenZu Textauszeichnungen und Siglen siehe die Legende.
+## 1 Zur Entstehung der Philosophischen Untersuchungen
+\[Zu Textauszeichnungen und Siglen siehe die Legende.\]
+
 
-Iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismodIt is time to begin the beguine. Iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod
+Iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod
+\[It is time to begin the beguine.\]
+ Iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod
 
-Iriure dolor in hendrerit in vulputateNot Vulture velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blanditNot Blandings praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod
+Iriure dolor in hendrerit in vulputate
+\[Not Vulture\]
+ velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit
+\[Not Blandings\]
+ praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod
 
 # Assorted elements and links
 
@@ -76,24 +94,24 @@ Fit the first The emph element is used for linguistic emphasis. highlighting (so
 
 Now for some links! We will start by cross-referring to a later section.
 
-Here is a simple ptr to it: . Here is a simple ref, a reference to it.
+Here is a simple ptr to it: . Here is a simple ref, a [reference to it](#P1).
 
-An external link as ref and as ptr: .
+An [external link](http://www.bbc.co.uk) as ref and as ptr: .
 
 # Tables
 
 Tables may have cells that span multiple columns and rows.
-ImageDescriptionCamera directionSVG, JPEG, GIF or PNG formatAll pictures were taken on Jun 27, 2007 ![graphic](./../Images/nature1.jpg "graphic")Mountain flowers. north![graphic](./../Images/nature2.jpg "graphic")Sunset over a secondary ridge.north-east![graphic](./../Images/nature3.jpg "graphic")Glacier lake at 2100m altitude.eastSpans HorizontallyHeader 3Spans HorizontallySpans VerticallyabcdeSpans bothfggijSpans Horizontallyklmno
+ImageDescriptionCamera directionSVG, JPEG, GIF or PNG formatAll pictures were taken on Jun 27, 2007 ![graphic](./../Images/nature1.jpg "graphic")Mountain flowers. north![graphic](./../Images/nature2.jpg "graphic")Sunset over a secondary ridge.north-east![graphic](./../Images/nature3.jpg "graphic")Glacier lake at 2100m altitude.eastSpans **Horizontally**Header 3Spans **Horizontally**Spans **Vertically**abcdeSpans **both**fggijSpans **Horizontally**klmno
 # Lists
 
-Various sorts of list are legal within paragraphs, and you can reference items in lists... 
-1. Dogs
+Various sorts of list are legal within paragraphs, and you can reference [items in lists](#birds)... 
+1.Dogs
 
-1. Zebras
+1.Zebras
 
-1. Birds
+1.Birds
 
-1. Cats
+1.Cats
 
 100
 * first item 
@@ -276,7 +294,11 @@ It's not my business, Scrooge returned. It's enough for a man to understand his
 
 Seeing clearly that it would be useless to pursue their point, the gentlemen withdrew. Scrooge resumed his labours with an improved opinion of himself, and in a more facetious temper than was usual with him. 
 
-Foggier yet, and colder! Piercing, searching, biting cold. If the good Saint Dunstan had but nipped the Evil Spirit's nose with a touch of such weather as that, test of a note instead of using his familiar weapons, then indeed he would have roared to lusty purpose. The owner of one scant young nose, gnawed and mumbled by the hungry cold as bones are gnawed by dogs, stooped down at Scrooge's keyhole to regale him with a Christmas carol: but at the first sound of God bless you, merry gentleman! May nothing you dismay!  Scrooge seized the ruler with such energy of action that the singer fled in terror, leaving the keyhole to the fog and even more congenial frost.
+Foggier yet, and colder! Piercing, searching, biting cold. If the good Saint Dunstan had but nipped the Evil Spirit's nose with a touch of such weather as that, 
+\[test of a note\]
+ instead of using his familiar weapons, then indeed he would have roared to lusty purpose. The owner of one scant young nose, gnawed and mumbled by the hungry cold as bones are gnawed by dogs, stooped down at Scrooge's keyhole to regale him with a Christmas carol: but at the first sound of “God bless you, merry gentleman!   
+May nothing you dismay!   
+” Scrooge seized the ruler with such energy of action that the singer fled in terror, leaving the keyhole to the fog and even more congenial frost.
 
 # Linking
 
@@ -286,24 +308,24 @@ Foggier yet, and colder! Piercing, searching, biting cold. If the good Saint Dun
 
 
 
-Fred
+[Fred](psn:fred)
 
-Jones 76
+[Jones 76](bibl:Jones76)
 
 # Testing preservation of ID
 
 Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet. With references to 
-* Quotation
+* [Quotation](#thisQuotation)
 
-* Citation
+* [Citation](#thisCitation)
 
-* Paragraph
+* [Paragraph](#thisParagraph)
 
-* Reference
+* [Reference](#thisReference)
 
-* Anchor
+* [Anchor](#movingAnchor)
 
-* Title
+* [Title](#thisTitle)
 
 
 I wonder what are the xml-ids preserved in a transformation to XHTML, in particular in the case of quotations. So, let’s try :
@@ -324,6 +346,6 @@ an egXML in a list:
 
 # divs with no heads
 
-Ampersands: Fit the first& Fit the first& more Fit the first& more Fit the first&& Fit the first" Fit the first @ http://www.example.com/?foo=bar&bar=foo.
+Ampersands: Fit the first& Fit the first& more Fit the first& more Fit the first&& Fit the first" Fit the first @ [http://www.example.com/?foo=bar&bar=foo](http://www.example.com/?foo=bar&bar=foo).
 Ampersands: Fit the first& Fit the first& more Fit the first& more Fit the first&& Fit the first" (as opposed to ") Fit the first @ http://www.example.com/?foo=bar&bar=foo.
 Fit the second

From 3f06265c3c023bbc4893568b7961081eda2f7f8c Mon Sep 17 00:00:00 2001
From: Syd Bauman 
Date: Fri, 1 Jul 2022 12:28:25 -0400
Subject: [PATCH 22/23] Fix #560 by adding -bBw to RNC diff lines.

---
 Test/Makefile | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/Test/Makefile b/Test/Makefile
index ef7c6b818..c3f12689d 100644
--- a/Test/Makefile
+++ b/Test/Makefile
@@ -581,15 +581,15 @@ test-oddity: actual css
 	perl -p -i -e 's/generated from ODD source .*//' $(AR)/test21.odd.rnc
 	perl -i -pe 'BEGIN{undef $$/;} s/# ?Schema[^#]+#[^#]+#[^#]+#[^#]+#\n//smg' $(AR)/test21.odd.rnc
 	if [ $(DIFFNOW) -eq 1 ]; \
-		then diff  $(AR)/test21.odd.rnc $(ER)/test21.odd.rnc; \
-		else echo "==deferring: \` diff  $(AR)/test21.odd.rnc $(ER)/test21.odd.rnc \`"; fi
+		then diff -bBw $(AR)/test21.odd.rnc $(ER)/test21.odd.rnc; \
+		else echo "==deferring: \` diff -bBw $(AR)/test21.odd.rnc $(ER)/test21.odd.rnc \`"; fi
 
 	$(BINDIR)/teitornc  $(FLAGS) test15.odd $(AR)/test15.odd.rnc
 	perl -p -i -e 's/generated from ODD source .*//' $(AR)/test15.odd.rnc
 	perl -i -pe 'BEGIN{undef $$/;} s/# ?Schema[^#]+#[^#]+#[^#]+#[^#]+#\n//smg' $(AR)/test15.odd.rnc
 	if [ $(DIFFNOW) -eq 1 ]; \
-		then diff  $(AR)/test15.odd.rnc $(ER)/test15.odd.rnc; \
-		else echo "==deferring: \` diff  $(AR)/test15.odd.rnc $(ER)/test15.odd.rnc \`"; fi
+		then diff -bBw $(AR)/test15.odd.rnc $(ER)/test15.odd.rnc; \
+		else echo "==deferring: \` diff -bBw $(AR)/test15.odd.rnc $(ER)/test15.odd.rnc \`"; fi
 
 	$(BINDIR)/teitohtml5 $(FLAGS) --summaryDoc --lang=es --profile=tei --odd test15.odd $(AR)/test15.odd.html
 	tidy -config config_tidy.txt $(AR)/test15.odd.html | perl cleanup.pl> test.temp ; mv test.temp $(AR)/test15.odd.html
@@ -628,8 +628,8 @@ test-oddity: actual css
 	$(JING) -c $(AR)/test30.rnc test36.xml
 	xmllint --noout --dtdvalid $(AR)/test30.dtd test36.xml
 	if [ $(DIFFNOW) -eq 1 ]; \
-		then diff  $(AR)/test30.rnc $(ER)/test30.rnc; \
-		else echo "==deferring: \` diff  $(AR)/test30.rnc $(ER)/test30.rnc \`"; fi
+		then diff -bBw $(AR)/test30.rnc $(ER)/test30.rnc; \
+		else echo "==deferring: -bBw \` diff  $(AR)/test30.rnc $(ER)/test30.rnc \`"; fi
 	if [ $(DIFFNOW) -eq 1 ]; \
 		then diff  $(AR)/test30.dtd $(ER)/test30.dtd; \
 		else echo "==deferring: \` diff  $(AR)/test30.dtd $(ER)/test30.dtd \`"; fi
@@ -660,8 +660,8 @@ test-oddity: actual css
 	perl -p -i -e 's/generated from ODD source .*//' $(AR)/test-pure.rnc
 	perl -i -pe 'BEGIN{undef $$/;} s/# ?Schema[^#]+#[^#]+#[^#]+#[^#]+#\n//smg' $(AR)/test-pure.rnc
 	if [ $(DIFFNOW) -eq 1 ]; \
-		then diff  $(AR)/test-pure.rnc $(ER)/test-pure.rnc; \
-		else echo "==deferring: \` diff  $(AR)/test-pure.rnc $(ER)/test-pure.rnc \`"; fi
+		then diff -bBw $(AR)/test-pure.rnc $(ER)/test-pure.rnc; \
+		else echo "==deferring: \` diff -bBw $(AR)/test-pure.rnc $(ER)/test-pure.rnc \`"; fi
 	if [ $(DIFFNOW) -eq 1 ]; \
 		then diff  $(AR)/test-pure.dtd $(ER)/test-pure.dtd; \
 		else echo "==deferring: \` diff  $(AR)/test-pure.dtd $(ER)/test-pure.dtd \`"; fi
@@ -681,8 +681,8 @@ test-oddity: actual css
 	perl -p -i -e 's/generated from ODD source .*//' $(AR)/test-pure2.rnc
 	perl -i -pe 'BEGIN{undef $$/;} s/# ?Schema[^#]+#[^#]+#[^#]+#[^#]+#\n//smg' $(AR)/test-pure2.rnc
 	if [ $(DIFFNOW) -eq 1 ]; \
-		then diff  $(AR)/test-pure2.rnc $(ER)/test-pure2.rnc; \
-		else echo "==deferring: \` diff  $(AR)/test-pure2.rnc $(ER)/test-pure2.rnc \`"; fi
+		then diff -bBw $(AR)/test-pure2.rnc $(ER)/test-pure2.rnc; \
+		else echo "==deferring: \` diff -bBw $(AR)/test-pure2.rnc $(ER)/test-pure2.rnc \`"; fi
 	if [ $(DIFFNOW) -eq 1 ]; \
 		then diff  $(AR)/test-pure2.dtd $(ER)/test-pure2.dtd; \
 		else echo "==deferring: \` diff  $(AR)/test-pure2.dtd $(ER)/test-pure2.dtd \`"; fi
@@ -718,8 +718,8 @@ test-namespaces: actual
 	perl -p -i -e 's/generated from ODD source .*//' $(AR)/test33.rnc
 	perl -i -pe 'BEGIN{undef $$/;} s/# ?Schema[^#]+#[^#]+#[^#]+#[^#]+#\n//smg' $(AR)/test33.rnc
 	if [ $(DIFFNOW) -eq 1 ]; \
-		then diff  $(AR)/test33.rnc $(ER)/test33.rnc; \
-		else echo "==deferring: \` diff  $(AR)/test33.rnc $(ER)/test33.rnc \`"; fi
+		then diff -bBw $(AR)/test33.rnc $(ER)/test33.rnc; \
+		else echo "==deferring: \` diff -bBw $(AR)/test33.rnc $(ER)/test33.rnc \`"; fi
 	$(SAXON) test33.odd ../odds/odd2json.xsl > $(AR)/test33.json
 	perl -p -i -e 's/"date" : "\d+-\d+\-\d+T\d+:\d+:\d+Z",//' $(AR)/test33.json
 	if [ $(DIFFNOW) -eq 1 ]; \
@@ -730,8 +730,8 @@ test-namespaces: actual
 	perl -p -i -e 's/generated from ODD source .*//' $(AR)/test34.rnc
 	perl -i -pe 'BEGIN{undef $$/;} s/# ?Schema[^#]+#[^#]+#[^#]+#[^#]+#\n//smg' $(AR)/test34.rnc
 	if [ $(DIFFNOW) -eq 1 ]; \
-		then diff  $(AR)/test34.rnc $(ER)/test34.rnc; \
-		else echo "==deferring: \` diff  $(AR)/test34.rnc $(ER)/test34.rnc \`"; fi
+		then diff -bBw $(AR)/test34.rnc $(ER)/test34.rnc; \
+		else echo "==deferring: \` diff -bBw $(AR)/test34.rnc $(ER)/test34.rnc \`"; fi
 	$(SAXON) test34.odd ../odds/odd2json.xsl > $(AR)/test34.json
 	perl -p -i -e 's/"date" : "\d+-\d+\-\d+T\d+:\d+:\d+Z",//' $(AR)/test34.json
 	if [ $(DIFFNOW) -eq 1 ]; \
@@ -753,8 +753,8 @@ test-namespaces: actual
 	perl -p -i -e 's/generated from ODD source .*//' $(AR)/test35.rnc
 	perl -i -pe 'BEGIN{undef $$/;} s/# ?Schema[^#]+#[^#]+#[^#]+#[^#]+#\n//smg' $(AR)/test35.rnc
 	if [ $(DIFFNOW) -eq 1 ]; \
-		then diff  $(AR)/test35.rnc $(ER)/test35.rnc; \
-		else echo "==deferring: \` diff  $(AR)/test35.rnc $(ER)/test35.rnc \`"; fi
+		then diff -bBw $(AR)/test35.rnc $(ER)/test35.rnc; \
+		else echo "==deferring: \` diff -bBw $(AR)/test35.rnc $(ER)/test35.rnc \`"; fi
 
 test-scripts:
 	for i in $(SCRIPTS); do $(BINDIR)/$$i $(FLAGS) maria.xml $$i.result && rm $$i.result; done

From ab4ba72996f6fb43c5f60f29911639586f3d433f Mon Sep 17 00:00:00 2001
From: Joey Takeda 
Date: Sat, 16 Jul 2022 17:40:03 -0700
Subject: [PATCH 23/23] Addressing `@preserveOrder` for #241 (#507)

* Work on #241

* Copy over the context attributes (except (min|max)Occurs) in odd2odd-simplifyODD in order to retain attributes (like preserveOrder) declared on the source element

* Adding tests for preserveOrder (#241)

* In inputFiles/testPure1.odd: Constrain choice such that it must contain one of:
** abbr and expan
** expan and abbr
** corr and sic
** orig and reg

* Adding tests to both validInstance and invalidInstances for testPure1
* Updating the RNG and the RNG output files

* Fixes as requested by @sydb in PR #507

* Fixing prose (https://github.com/TEIC/Stylesheets/pull/507#discussion_r883669059)
* Test nodes, not names (https://github.com/TEIC/Stylesheets/pull/507#discussion_r883808314)
---
 Test2/expected-results/testPure1.rng          | 32 +++++++--------
 .../testPure1InvalidInstanceRngMessages.txt   |  2 +
 .../testPure1InvalidInstance.xml              |  5 +++
 Test2/inputFiles/testPure1.odd                | 39 +++++++++++++++++++
 .../validInstances/testPure1ValidInstance.xml | 11 ++++++
 odds/odd2odd.xsl                              |  6 +++
 6 files changed, 77 insertions(+), 18 deletions(-)

diff --git a/Test2/expected-results/testPure1.rng b/Test2/expected-results/testPure1.rng
index 793aaefaa..8bad2fbc6 100644
--- a/Test2/expected-results/testPure1.rng
+++ b/Test2/expected-results/testPure1.rng
@@ -2777,18 +2777,6 @@ Suggested values include: 1] volume (volume); 2] issue; 3] page (page); 4] line;
          
       
    
-   
-      
-         
-         
-         
-         
-         
-         
-         
-         
-      
-   
    
       
          
@@ -3616,12 +3604,20 @@ Suggested values include: 1] deprecationInfo (deprecation information)
       
          (choice) groups a number of alternative encodings for the same point in a text. [3.5. Simple Editorial Changes]
-         
-            
-               
-               
-            
-         
+         
+            
+               
+               
+            
+            
+               
+               
+            
+            
+               
+               
+            
+         
          
          
       
diff --git a/Test2/expected-results/testPure1InvalidInstanceRngMessages.txt b/Test2/expected-results/testPure1InvalidInstanceRngMessages.txt
index e69ec1ff9..87a994220 100644
--- a/Test2/expected-results/testPure1InvalidInstanceRngMessages.txt
+++ b/Test2/expected-results/testPure1InvalidInstanceRngMessages.txt
@@ -17,3 +17,5 @@
 /invalidInstances/testPure1InvalidInstance.xml:142:46: error: element "div1" not allowed anywhere; expected the element end-tag or element "alt", "altGrp", "anchor", "argument", "byline", "cb", "closer", "dateline", "div", "divGen", "docAuthor", "docDate", "ellipsis", "epigraph", "gap", "gb", "index", "interp", "interpGrp", "lb", "link", "linkGrp", "meeting", "milestone", "note", "noteGrp", "pb", "postscript", "salute", "signed", "span", "spanGrp", "timeline" or "trailer"
 /invalidInstances/testPure1InvalidInstance.xml:143:45: error: element "div1" not allowed anywhere; expected the element end-tag or element "alt", "altGrp", "anchor", "argument", "byline", "cb", "closer", "dateline", "div", "divGen", "docAuthor", "docDate", "ellipsis", "epigraph", "gap", "gb", "index", "interp", "interpGrp", "lb", "link", "linkGrp", "meeting", "milestone", "note", "noteGrp", "pb", "postscript", "salute", "signed", "span", "spanGrp", "timeline" or "trailer"
 /invalidInstances/testPure1InvalidInstance.xml:148:73: error: character content of element "email" invalid; must be equal to "amourdecosmos@gmail.com" or "thevenerablebede@gmail.com"
+/invalidInstances/testPure1InvalidInstance.xml:154:30: error: element "reg" not allowed yet; expected element "abbr", "corr", "expan" or "orig"
+/invalidInstances/testPure1InvalidInstance.xml:154:46: error: element "orig" not allowed here; expected the element end-tag
diff --git a/Test2/inputFiles/invalidInstances/testPure1InvalidInstance.xml b/Test2/inputFiles/invalidInstances/testPure1InvalidInstance.xml
index 163957ff5..156df7377 100644
--- a/Test2/inputFiles/invalidInstances/testPure1InvalidInstance.xml
+++ b/Test2/inputFiles/invalidInstances/testPure1InvalidInstance.xml
@@ -149,6 +149,11 @@
         should be invalid.

       

       
+      

+        Testing preserveOrder on sequence
+        
This testTest should be invalid, as the orig ought to appear before the reg.

+      

+      
     
   
 
diff --git a/Test2/inputFiles/testPure1.odd b/Test2/inputFiles/testPure1.odd
index caa30fef0..e80d5ca43 100644
--- a/Test2/inputFiles/testPure1.odd
+++ b/Test2/inputFiles/testPure1.odd
@@ -202,6 +202,45 @@
 	                 
 	              
 	           
+            
+            
+            
+            
+               
+                  
+                     
+                        
+                        
+                     
+                     
+                        
+                        
+                     
+                     
+                        
+                        
+                     
+                  
+               
+               
+                  
Our choice element is allowed to contain one of the following combinations:
+                  
+                     abbr and expan
+                     expan and abbr
+                     corr and sic
+                     orig and reg
+                  
+                  

+               
+            
 
          
       
diff --git a/Test2/inputFiles/validInstances/testPure1ValidInstance.xml b/Test2/inputFiles/validInstances/testPure1ValidInstance.xml
index 46a4a13df..88bb2c197 100644
--- a/Test2/inputFiles/validInstances/testPure1ValidInstance.xml
+++ b/Test2/inputFiles/validInstances/testPure1ValidInstance.xml
@@ -100,6 +100,17 @@
         
The email address for thevenerablebede@gmail.com
         should be valid.

       

+      
+      
+      

+        Testing preserveOrder on sequence
+        
This is a test that abbr and expan can go in any order in the test
+          ODDOne Document Does it All for the 
+          Text Encoding InitiativeTEI.

+        
However, choice can only contain a corr and sic or a orig and reg in
+          that especialspecial
+          orderoder.

+      

     
   
 
diff --git a/odds/odd2odd.xsl b/odds/odd2odd.xsl
index c483db72d..f75eacf8d 100644
--- a/odds/odd2odd.xsl
+++ b/odds/odd2odd.xsl
@@ -1388,6 +1388,7 @@ of this software, even if advised of the possibility of such damage.
     
     
     
+    
     
+            
+            
+            
+