diff --git a/P5/Source/Guidelines/en/ST-Infrastructure.xml b/P5/Source/Guidelines/en/ST-Infrastructure.xml
index f0c449890a..f745f121a9 100644
--- a/P5/Source/Guidelines/en/ST-Infrastructure.xml
+++ b/P5/Source/Guidelines/en/ST-Infrastructure.xml
@@ -74,123 +74,123 @@ with others.-->
section below.
The following table lists the modules defined by the current release of these Guidelines:
-
-
-
- Module name |
- Where defined |
- Formal public identifier |
-
-
- tei |
- |
- TEI Infrastructure |
-
-
- header |
- |
- Common Metadata |
-
-
- core |
- |
- Common Core |
-
-
- textstructure |
- |
- Default Text Structure |
-
-
- gaiji |
- |
- Character and Glyph Documentation |
-
-
- verse |
- |
- Verse |
-
-
- drama |
- |
- Performance Texts |
-
-
- spoken |
- |
- Transcribed Speech |
-
-
- cmc |
- |
- TEI-CMC |
-
-
- dictionaries |
- |
- Dictionaries |
-
-
- msdescription |
- |
- Manuscript Description |
-
-
- transcr |
- |
- Transcription of Primary Sources |
-
-
- textcrit |
- |
- Text Criticism |
-
-
- namesdates |
- |
- Names, dates, persons and places |
-
-
- figures |
- |
- Tables, Formulæ, Notated Music, Figures |
-
-
- corpus |
- |
- Metadata for Language Corpora |
-
-
- linking |
- |
- Linking, Segmentation, and Alignment |
-
-
- analysis |
- |
- Analysis and Interpretation |
-
-
- iso-fs |
- |
- Feature Structures |
-
-
- nets |
- |
- Graphs, networks, and trees |
-
-
- certainty |
- |
- Certainty and Uncertainty |
-
-
- tagdocs |
- |
- Documentation Elements |
-
+
+
+
+ Module name |
+ Where defined |
+ Formal public identifier |
+
+
+ tei |
+ |
+ TEI Infrastructure |
+
+
+ header |
+ |
+ Common Metadata |
+
+
+ core |
+ |
+ Common Core |
+
+
+ textstructure |
+ |
+ Default Text Structure |
+
+
+ gaiji |
+ |
+ Character and Glyph Documentation |
+
+
+ verse |
+ |
+ Verse |
+
+
+ drama |
+ |
+ Performance Texts |
+
+
+ spoken |
+ |
+ Transcribed Speech |
+
+
+ cmc |
+ |
+ TEI-CMC |
+
+
+ dictionaries |
+ |
+ Dictionaries |
+
+
+ msdescription |
+ |
+ Manuscript Description |
+
+
+ transcr |
+ |
+ Transcription of Primary Sources |
+
+
+ textcrit |
+ |
+ Text Criticism |
+
+
+ namesdates |
+ |
+ Names, dates, persons and places |
+
+
+ figures |
+ |
+ Tables, Formulæ, Notated Music, Figures |
+
+
+ corpus |
+ |
+ Metadata for Language Corpora |
+
+
+ linking |
+ |
+ Linking, Segmentation, and Alignment |
+
+
+ analysis |
+ |
+ Analysis and Interpretation |
+
+
+ iso-fs |
+ |
+ Feature Structures |
+
+
+ nets |
+ |
+ Graphs, networks, and trees |
+
+
+ certainty |
+ |
+ Certainty and Uncertainty |
+
+
+ tagdocs |
+ |
+ Documentation Elements |
+
For each module listed above, the corresponding chapter gives a full description of the
@@ -555,11 +555,11 @@ Georgie, and Dim, ... </p>
@@ -586,10 +586,10 @@ Georgie, and Dim, ... </p>
document, rather than to control how it should be formatted.
In the TEI scheme, it is possible to supply information about the appearance of
elements within a source document in the following distinct ways:
- - One or more properties may be specified as the
- default for a set of elements (based on an external
- scheme, by default CSS), using rendition elements
- and their selector attributes;
+ - One or more properties may be specified as the
+ default for a set of elements (based on an external
+ scheme, by default CSS), using rendition elements
+ and their selector attributes;
- One or more properties may be specified for individual element occurrences,
using the rend attribute with any convenient set of one or more
sequence-indeterminate tokens;
@@ -622,15 +622,15 @@ Georgie, and Dim, ... </p>
by pointing to a bibliographic citation for a quotation to indicate the source from which it derives. The target of the
pointer may be an entry in a bibliographic list of some kind, or a pointer to a digital version of the source itself.
- As with other TEI pointers, the value of this attribute
- is expressed as any form of URI, for example an absolute
- URL, a relative URL, or a private scheme URI that is
- expanded to a relative or absolute URL as documented in a
- prefixDef. In the following typical example a
- relative bare name URL value is used
- to point to a bibl elsewhere in the bibliography
- of the document which contains a bibliographic source for
- the quotation itself:
+
As with other TEI pointers, the value of this attribute
+ is expressed as any form of URI, for example an absolute
+ URL, a relative URL, or a private scheme URI that is
+ expanded to a relative or absolute URL as documented in a
+ prefixDef. In the following typical example a
+ relative bare name URL value is used
+ to point to a bibl elsewhere in the bibliography
+ of the document which contains a bibliographic source for
+ the quotation itself:
@@ -862,70 +862,85 @@ one, or vice versa, should be done with care.
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
@@ -1149,11 +1164,11 @@ one, or vice versa, should be done with care.
-
+
-
+
@@ -1322,7 +1337,7 @@ entities in the XML DTD fragments.-->
-
+
Attributes of type teidata.word, such as age on
diff --git a/P5/Test/expected-results/detest_xml_schematron.log b/P5/Test/expected-results/detest_xml_schematron.log
index 7a5532c45d..482eddf011 100644
--- a/P5/Test/expected-results/detest_xml_schematron.log
+++ b/P5/Test/expected-results/detest_xml_schematron.log
@@ -1,12 +1,12 @@
The @generatedBy attribute is for use within a <post> element. (ancestor-or-self::tei:post)
The @generatedBy attribute is for use within a <post> element. (ancestor-or-self::tei:post)
-The abbr element should not be categorized in detail with @subtype unless also categorized in general with @type (@type)
-The div element should not be categorized in detail with @subtype unless also categorized in general with @type (@type)
The element indicated by @spanTo (#ds2) must follow the current element delSpan
(id(substring(@spanTo,2)) and following::*[@xml:id=substring(current()/@spanTo,2)])
The element indicated by @spanTo (notMeaningful) must follow the current element delSpan
(id(substring(@spanTo,2)) and following::*[@xml:id=substring(current()/@spanTo,2)])
@schemeVersion can only be used if @scheme is specified. (@scheme and not(@scheme = 'free'))
+The abbr element should not be categorized in detail with @subtype unless also categorized in general with @type (@type)
+The div element should not be categorized in detail with @subtype unless also categorized in general with @type (@type)
@calendar indicates one or more systems or calendars to which the date represented by the content of this element belongs, but this date element has no textual content. (string-length( normalize-space(.) ) gt 0)
The content of a "gloss" list should include a sequence of one or more pairs of a label element followed by an item element (tei:label)
An lg element must contain at least one child l, lg, or gap element. (count(descendant::tei:lg|descendant::tei:l|descendant::tei:gap) > 0)