diff --git a/P5/Exemplars/isofs.odd b/P5/Exemplars/isofs.odd index cd2947cbb1..812a7104b7 100644 --- a/P5/Exemplars/isofs.odd +++ b/P5/Exemplars/isofs.odd @@ -38,7 +38,7 @@ - + diff --git a/P5/Exemplars/tei_enrich.odd b/P5/Exemplars/tei_enrich.odd index ef8361356e..8d7121647c 100644 --- a/P5/Exemplars/tei_enrich.odd +++ b/P5/Exemplars/tei_enrich.odd @@ -3451,7 +3451,7 @@ which should be supported by a more detailed description using the - + diff --git a/P5/Exemplars/tei_jtei.odd b/P5/Exemplars/tei_jtei.odd index 490e2dae88..8b6cc05f9b 100644 --- a/P5/Exemplars/tei_jtei.odd +++ b/P5/Exemplars/tei_jtei.odd @@ -1905,7 +1905,7 @@ - + @@ -1922,7 +1922,7 @@ - + @@ -1959,7 +1959,7 @@ - + @@ -2154,7 +2154,7 @@ - + @@ -2174,7 +2174,7 @@ - + - + @@ -2196,7 +2196,7 @@ - + - + @@ -2258,7 +2258,7 @@ - + - + - + - + @@ -2311,7 +2311,7 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2893,7 +2893,7 @@ contains the complete text of the article. Must include a front containing an abstract, a body containing the main text, and a back containing the bibliography and any appendices. - + - + - + - + - + - + @@ -3059,7 +3059,7 @@ - + @@ -3076,7 +3076,7 @@ - + - + - + - + - + - + @@ -3149,7 +3149,7 @@ - + - + - + - + - + - + - + - + @@ -3257,7 +3257,7 @@ - + @@ -3273,7 +3273,7 @@ - + @@ -3288,7 +3288,7 @@ - + @@ -3304,7 +3304,7 @@ - + - + - + @@ -3341,7 +3341,7 @@ - + @@ -3352,7 +3352,7 @@ - + @@ -3363,7 +3363,7 @@ - + - + @@ -3390,7 +3390,7 @@ - + @@ -3399,7 +3399,7 @@ - + @@ -3418,7 +3418,7 @@ - + diff --git a/P5/Exemplars/tei_simplePrint.odd b/P5/Exemplars/tei_simplePrint.odd index 3fcf287a9c..3b5cb3997e 100644 --- a/P5/Exemplars/tei_simplePrint.odd +++ b/P5/Exemplars/tei_simplePrint.odd @@ -3481,7 +3481,7 @@ live without God in the world, and only mind earthly things. - +

- - - - - - - - - - - -
Cast Lists diff --git a/P5/Source/Guidelines/en/DS-DefaultTextStructure.xml b/P5/Source/Guidelines/en/DS-DefaultTextStructure.xml index 5943c4bed5..727a2d6729 100644 --- a/P5/Source/Guidelines/en/DS-DefaultTextStructure.xml +++ b/P5/Source/Guidelines/en/DS-DefaultTextStructure.xml @@ -164,8 +164,6 @@ or simply quoted within it. This is useful in such common literary contexts as the play within a play or the narrative interrupted by other (often deeply nested) multiple narratives. - - @@ -251,8 +249,6 @@ composed of two chapters, might be represented as follows:

- -
@@ -311,8 +307,6 @@ composed of two chapters, might be represented as follows: - - @@ -893,8 +887,6 @@ module these may appear at any point; there is no requirement that elements from the same module be kept together.

- - @@ -1685,8 +1677,6 @@ provided in chapter .

- - @@ -1795,8 +1785,6 @@ monsters, Reader, with thy quill.

- - diff --git a/P5/Source/Guidelines/en/FS-FeatureStructures.xml b/P5/Source/Guidelines/en/FS-FeatureStructures.xml index e3a5ae0dea..01e9e70355 100644 --- a/P5/Source/Guidelines/en/FS-FeatureStructures.xml +++ b/P5/Source/Guidelines/en/FS-FeatureStructures.xml @@ -1329,65 +1329,10 @@ is a legal XML name; for example, they cannot include whitespace or begin with digits. Multiple base types are separated with spaces, e.g. fsDecl type="Sub" baseTypes="Super1 Super2".

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1638,93 +1583,12 @@ the class model.featureVal includes all possible single feature values, including feature structures, alternations (vAlt) and complex collections (vColl).

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Feature Structure Constraints

Ensuring the validity of feature structures may require much more @@ -1807,67 +1671,10 @@ Note that cond and bicond use the empty tags and consequent. These are primarily for the sake of enhancing human readability.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
A Complete Example

To summarize this chapter, the complete FSD for the example that has diff --git a/P5/Source/Guidelines/en/GD-GraphsNetworksTrees.xml b/P5/Source/Guidelines/en/GD-GraphsNetworksTrees.xml index 83eea59648..eddf6facde 100644 --- a/P5/Source/Guidelines/en/GD-GraphsNetworksTrees.xml +++ b/P5/Source/Guidelines/en/GD-GraphsNetworksTrees.xml @@ -273,54 +273,9 @@ elements, as in the following example.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Transition Networks

For encoding transition networks and other kinds of directed graphs @@ -873,70 +828,10 @@ VB to PT crosses the arc from VP to PN.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Another Tree Notation @@ -1262,79 +1157,10 @@ first stage that are not copies of them.

syntactic, semantic, and phonological subderivations) is to be articulated, the grouping element listForest may be used.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/P5/Source/Guidelines/en/HD-Header.xml b/P5/Source/Guidelines/en/HD-Header.xml index c07ec9db04..5fa66dc927 100644 --- a/P5/Source/Guidelines/en/HD-Header.xml +++ b/P5/Source/Guidelines/en/HD-Header.xml @@ -1430,7 +1430,6 @@ with the number of such elements present in the associated -

diff --git a/P5/Source/Guidelines/en/TS-TranscriptionsofSpeech.xml b/P5/Source/Guidelines/en/TS-TranscriptionsofSpeech.xml index a3cad3cba4..719c2704d3 100644 --- a/P5/Source/Guidelines/en/TS-TranscriptionsofSpeech.xml +++ b/P5/Source/Guidelines/en/TS-TranscriptionsofSpeech.xml @@ -345,7 +345,6 @@ and version may be used to refer to such conventions in a machine tra -
@@ -771,119 +770,13 @@ text header (see section ) or as part of a TEI customization

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/P5/Source/Guidelines/en/WD-NonStandardCharacters.xml b/P5/Source/Guidelines/en/WD-NonStandardCharacters.xml index dc63a52a21..c6c7c38b0e 100644 --- a/P5/Source/Guidelines/en/WD-NonStandardCharacters.xml +++ b/P5/Source/Guidelines/en/WD-NonStandardCharacters.xml @@ -1317,7 +1317,6 @@ The selection and combination of modules to form a TEI schema is described in -
\ No newline at end of file diff --git a/P5/Source/Guidelines/fr/HD-Header.xml b/P5/Source/Guidelines/fr/HD-Header.xml index 42da92a9d1..2dbb539589 100644 --- a/P5/Source/Guidelines/fr/HD-Header.xml +++ b/P5/Source/Guidelines/fr/HD-Header.xml @@ -557,7 +557,6 @@ L’élément extent a comme définition formelle : -

diff --git a/P5/Source/Specs/TEI.xml b/P5/Source/Specs/TEI.xml index 45a88c4fc1..526e564184 100644 --- a/P5/Source/Specs/TEI.xml +++ b/P5/Source/Specs/TEI.xml @@ -42,19 +42,19 @@ - + - + - + diff --git a/P5/Source/Specs/ab.xml b/P5/Source/Specs/ab.xml index ddda2db92d..d901081103 100644 --- a/P5/Source/Specs/ab.xml +++ b/P5/Source/Specs/ab.xml @@ -28,7 +28,7 @@ - + diff --git a/P5/Source/Specs/addSpan.xml b/P5/Source/Specs/addSpan.xml index 5a4bd7897f..6389d6f1c5 100644 --- a/P5/Source/Specs/addSpan.xml +++ b/P5/Source/Specs/addSpan.xml @@ -27,7 +27,7 @@ - + The @spanTo attribute of is required. diff --git a/P5/Source/Specs/alternate.xml b/P5/Source/Specs/alternate.xml index 0ffe441c00..3ea1baf232 100644 --- a/P5/Source/Specs/alternate.xml +++ b/P5/Source/Specs/alternate.xml @@ -15,7 +15,7 @@ - + The alternate element must have at least two child elements diff --git a/P5/Source/Specs/att.calendarSystem.xml b/P5/Source/Specs/att.calendarSystem.xml index c44e03f99e..369a93a713 100644 --- a/P5/Source/Specs/att.calendarSystem.xml +++ b/P5/Source/Specs/att.calendarSystem.xml @@ -20,7 +20,7 @@ - + @calendar indicates one or more diff --git a/P5/Source/Specs/att.cmc.xml b/P5/Source/Specs/att.cmc.xml index 10ff35ea3e..6b6dae377f 100644 --- a/P5/Source/Specs/att.cmc.xml +++ b/P5/Source/Specs/att.cmc.xml @@ -11,7 +11,7 @@ - + The @generatedBy attribute is for use within a <post> element. diff --git a/P5/Source/Specs/att.datable.w3c.xml b/P5/Source/Specs/att.datable.w3c.xml index 17b946f541..1cf699364b 100644 --- a/P5/Source/Specs/att.datable.w3c.xml +++ b/P5/Source/Specs/att.datable.w3c.xml @@ -13,21 +13,21 @@ d'événements datés ou susceptibles de l'être. indica degli attributi per la normalizzazione di elementi che contengono eventi databili utilizzando i tipi di dati del W3C proporciona atributos para la normalización de elementos que contienen eventos datables. - + The @when attribute cannot be used with any other att.datable.w3c attributes. - + The @from and @notBefore attributes cannot be used together. - + The @to and @notAfter attributes cannot be used together. diff --git a/P5/Source/Specs/att.datcat.xml b/P5/Source/Specs/att.datcat.xml index 51a097e69c..7e91485bec 100644 --- a/P5/Source/Specs/att.datcat.xml +++ b/P5/Source/Specs/att.datcat.xml @@ -52,7 +52,7 @@

The datcat attribute relates the feature name (i.e., the key) to the data category part of speech, while the attribute valueDatcat relates the feature value to the data category common noun. Both these data categories should be defined in an external and preferably open reference taxonomy or ontology.

- xmlns="http://www.tei-c.org/ns/Examples" xml:id="DATCAT-egXML-xk"> + xmlns="http://www.tei-c.org/ns/Examples" xml:id="DATCAT-egXML-xk"> diff --git a/P5/Source/Specs/att.deprecated.xml b/P5/Source/Specs/att.deprecated.xml index 2e39248858..7e425ca424 100644 --- a/P5/Source/Specs/att.deprecated.xml +++ b/P5/Source/Specs/att.deprecated.xml @@ -20,7 +20,7 @@ --> - + @@ -33,7 +33,7 @@ - + diff --git a/P5/Source/Specs/att.gaijiProp.xml b/P5/Source/Specs/att.gaijiProp.xml index bf86288af0..55491d09f2 100644 --- a/P5/Source/Specs/att.gaijiProp.xml +++ b/P5/Source/Specs/att.gaijiProp.xml @@ -1,7 +1,7 @@ - + provides attributes for defining the properties of non-standard characters or glyphs. liefert Attribute zur Definition der Eigenschaften von nicht standardisierten Zeichen und Glyphen. fornisce attributi per definire le proprietà di caratteri o glifi non standard diff --git a/P5/Source/Specs/att.global.source.xml b/P5/Source/Specs/att.global.source.xml index 1f63d6b9e3..c89e1562e3 100644 --- a/P5/Source/Specs/att.global.source.xml +++ b/P5/Source/Specs/att.global.source.xml @@ -13,7 +13,7 @@ - + diff --git a/P5/Source/Specs/att.identified.xml b/P5/Source/Specs/att.identified.xml index 23b42159da..a4972a8cba 100644 --- a/P5/Source/Specs/att.identified.xml +++ b/P5/Source/Specs/att.identified.xml @@ -12,7 +12,7 @@ - + diff --git a/P5/Source/Specs/att.lexicographic.normalized.xml b/P5/Source/Specs/att.lexicographic.normalized.xml index f8f01fac81..7d5ae072ed 100644 --- a/P5/Source/Specs/att.lexicographic.normalized.xml +++ b/P5/Source/Specs/att.lexicographic.normalized.xml @@ -69,12 +69,12 @@ - Theyll + Theyll - Frewde + Frewde
diff --git a/P5/Source/Specs/att.measurement.xml b/P5/Source/Specs/att.measurement.xml index ee92f3ff4a..84c41bb650 100644 --- a/P5/Source/Specs/att.measurement.xml +++ b/P5/Source/Specs/att.measurement.xml @@ -10,7 +10,7 @@ régularisée ou normalisée. proporciona atributos que representen una medición regularizada o normalizada. assegna degli attributi che rappresentano una misurazione regolarizzata o normalizzata - + The @unit attribute may be unnecessary when @unitRef is present. diff --git a/P5/Source/Specs/att.pointing.xml b/P5/Source/Specs/att.pointing.xml index 27f8df9e88..9441d87f4a 100644 --- a/P5/Source/Specs/att.pointing.xml +++ b/P5/Source/Specs/att.pointing.xml @@ -16,7 +16,7 @@ according to BCP 47. BCP 47に従って生成された言語タグを使用することで、targetの参照先にあるコンテンツの言語を特定する。 - + @targetLang should only be used on if @target is specified. diff --git a/P5/Source/Specs/att.repeatable.xml b/P5/Source/Specs/att.repeatable.xml index e62313fd75..9e6ad7f918 100644 --- a/P5/Source/Specs/att.repeatable.xml +++ b/P5/Source/Specs/att.repeatable.xml @@ -8,7 +8,7 @@ - + - provides attributes to specify the name of a formal definition - language used to provide formatting or rendition information. + provides attributes to specify the name of a formal definition language used to provide formatting or rendition information. identifies the language used to describe the rendition. 모양을 기술하는 언어를 식별한다. - identifica el lenguaje usado para describir la - interpretación. + identifica el lenguaje usado para describir la interpretación. 当該描出を解説する言語を特定する。 identifie la langue employée pour décrire le rendu. - identifica la lingua utilizzata per descrivere la - resa + identifica la lingua utilizzata per descrivere la resa @@ -27,11 +24,9 @@ Extensible Stylesheet Language Formatting Objects 확장가능 스타일시트 언어 - Objetos extensibles del formato del lenguaje de - Stylesheet + Objetos extensibles del formato del lenguaje de Stylesheet XSL-FO - langage XSL (Extensible Stylesheet )Formatting - Objects + langage XSL (Extensible Stylesheet )Formatting Objects linguaggio XSL-FO @@ -45,24 +40,20 @@ A user-defined rendition description language 사용자 정의 해석 기술 언어 - Un idioma descriptivo de interpretación definido - por el usario. + Un idioma descriptivo de interpretación definido por el usario. 利用者が決めた、描出記述言語。 - langue de description de l'interprétation définie - par l'utilisateur - linguaggio di descrizione della resa definito - dall'utente + langue de description de l'interprétation définie par l'utilisateur + linguaggio di descrizione della resa definito dall'utente -

-If no value for the @scheme attribute is provided, then the default assumption should be that CSS is in use.

+

If no value for the @scheme attribute is provided, then the default assumption should be that CSS is in use.

supplies a version number for the style language provided in scheme. - + @@ -72,8 +63,9 @@ If no value for the @scheme attribute is provided, then the default assumption s -

If schemeVersion is used, then scheme should also appear, with a value - other than free.

+

If schemeVersion is used, then scheme + should also appear, with a value other than + free.

diff --git a/P5/Source/Specs/att.typed.xml b/P5/Source/Specs/att.typed.xml index 525843af27..4864d1bd0c 100644 --- a/P5/Source/Specs/att.typed.xml +++ b/P5/Source/Specs/att.typed.xml @@ -10,7 +10,7 @@ utilisés pour classer ou interclasser des éléments de n'importe quelle façon. proporciona atributos genéricos utilizables para cualquier clasificación o subclasificación de elementos. assegna degli attributi generici utilizzabili per qualsiasi classificazione e sottoclassificazione di elementi - + The element should not be categorized in detail with @subtype unless also categorized in general with @type diff --git a/P5/Source/Specs/attDef.xml b/P5/Source/Specs/attDef.xml index 4eebe04dca..ecc2a0cba6 100644 --- a/P5/Source/Specs/attDef.xml +++ b/P5/Source/Specs/attDef.xml @@ -37,7 +37,7 @@ - + @@ -55,7 +55,7 @@ - + Since the @ attribute is required, it will always be specified. Thus the default value (of "") will never be used. Either change the definition of the attribute so it is not required ("rec" or "opt"), or remove the defaultVal element. @@ -68,7 +68,7 @@ - + - + You may not nest one s element within another: use seg instead diff --git a/P5/Source/Specs/secFol.xml b/P5/Source/Specs/secFol.xml index 85836cd288..be2b97d014 100644 --- a/P5/Source/Specs/secFol.xml +++ b/P5/Source/Specs/secFol.xml @@ -22,7 +22,7 @@ - + - + unicode property - provides a Unicode property for a character (or - glyph). + provides a Unicode property for a character (or glyph). @@ -17,8 +14,7 @@ - specifies the normalized name of a Unicode - property. + specifies the normalized name of a Unicode property. @@ -246,8 +242,7 @@ - specifies the value of a named Unicode - property. + specifies the value of a named Unicode property. diff --git a/P5/Source/Specs/usg.xml b/P5/Source/Specs/usg.xml index 6c57941ed8..fcbed3838a 100644 --- a/P5/Source/Specs/usg.xml +++ b/P5/Source/Specs/usg.xml @@ -133,7 +133,7 @@ grammatical 문법적 - emploi grammatical + emploi grammatical grammaticale uso gramatical grammatical usage diff --git a/P5/Source/Specs/vMerge.xml b/P5/Source/Specs/vMerge.xml index b6373a5f57..dccbc2a3b7 100644 --- a/P5/Source/Specs/vMerge.xml +++ b/P5/Source/Specs/vMerge.xml @@ -7,7 +7,7 @@ 合併的值集合 collection fusionnée de valeurs conjunto fusionado de valores - una raccolta unificata di valori + una raccolta unificata di valori represents a feature value which is the result of merging together the feature values contained by its children, using the organization specified by the org attribute. diff --git a/P5/Source/Specs/valList.xml b/P5/Source/Specs/valList.xml index 9a4c855d43..8a9579686f 100644 --- a/P5/Source/Specs/valList.xml +++ b/P5/Source/Specs/valList.xml @@ -56,7 +56,7 @@ semi-open 반개방 - semi-ouvert + semi-ouvert semiaperto todos los valores indicados deben ser soportados pero son consentidos otros valores para los que son necesarios sistemas de diff --git a/P5/Source/Specs/variantEncoding.xml b/P5/Source/Specs/variantEncoding.xml index 4e1ccaf677..b3472b86e5 100644 --- a/P5/Source/Specs/variantEncoding.xml +++ b/P5/Source/Specs/variantEncoding.xml @@ -92,7 +92,7 @@ or external to it. indica si el aparato aparece al interno o al externo del texto. indica se l'apparato compare all'interno del testo, o esternamente. - + diff --git a/P5/Test/antruntest.xml b/P5/Test/antruntest.xml index 0891f0493c..951e0c5d71 100644 --- a/P5/Test/antruntest.xml +++ b/P5/Test/antruntest.xml @@ -176,7 +176,7 @@ Validate ${oddFile} as ODD ... ... against RelaxNG (../p5odds.rng) with jing ... - ... against Schematron (../p5odds.message.isosch.xsl) with Saaxon via trax + ... against Schematron (../p5odds.message.isosch.xsl) with Saxon via trax + + Added xml:lang to every constraintSpec + Add the add_missing_scheme and replace_missing_scheme tests for @@ -82,7 +85,7 @@ - + @@ -91,11 +94,12 @@ - + - multi-valued rend is not supported + multi-valued rend is not supported + @@ -169,7 +173,7 @@ - + @@ -456,21 +460,21 @@ - + This constraintSpec is invalid because it is missing scheme in add mode. This rule never fires. - + This constraintSpec is invalid because it is missing scheme in replace mode. This rule never fires. - + This constraintSpec is invalid because it has an sch:report that does not have a context (i.e., does not have a sch:rule @@ -488,7 +492,7 @@ * content-language = whether ../* are Schematron 1.x ("schematron") or ISO Schematron elements * expected-result = OK, deprecated, or error --> - + @@ -497,7 +501,7 @@ - + @@ -509,7 +513,7 @@ - + diff --git a/P5/Test/expected-results/detest_odd_schematron.log b/P5/Test/expected-results/detest_odd_schematron.log index ac4d1aa71b..04d7e85313 100644 --- a/P5/Test/expected-results/detest_odd_schematron.log +++ b/P5/Test/expected-results/detest_odd_schematron.log @@ -3,7 +3,7 @@ Buildfile: /TEI/P5/Test/antruntest.xml validateodd: [echo] Validate detest.odd as ODD ... [echo] ... against RelaxNG (../p5odds.rng) with jing ... - [echo] ... against Schematron (../p5odds.message.isosch.xsl) with Saaxon via trax + [echo] ... against Schematron (../p5odds.message.isosch.xsl) with Saxon via trax [xslt] Processing /TEI/P5/Test/detest.odd to /dev/null [xslt] Loading stylesheet /TEI/P5/p5odds.message.isosch.xsl [xslt] Error: both the versionDate and xml:lang attributes on "remarks" are required when it is a child of "elementSpec". (@xml:lang and @versionDate) @@ -21,8 +21,10 @@ validateodd: [xslt] Rules in the ISO Schematron language must be inside a constraintSpec with the value 'schematron' on the scheme attribute (tei:constraint/sch:* and not( @scheme eq 'schematron')) [xslt] Rules in the ISO Schematron language must be inside a constraintSpec with the value 'schematron' on the scheme attribute (tei:constraint/sch:* and not( @scheme eq 'schematron')) [xslt] The use of an <sch:assert> or <sch:report> that does not have a context (i.e., does not have an ancestor <sch:rule> with a @context attribute) in an ISO Schematron constraint specification is deprecated, and will become invalid after 2025-03-15. (( $assertsHaveContext, $reportsHaveContext ) = false() / warning) - [xslt] The @scheme attribute of <constraintSpec> is required when the @mode is not specified. (@scheme) - [xslt] The @scheme attribute of <constraintSpec> is required when the @mode is "replace". (@scheme) + [xslt] The @scheme attribute of <constraintSpec> is required when the @mode is not specified (here on "add_missing_scheme") (@scheme) + [xslt] The @scheme attribute of <constraintSpec> is required when the @mode is "replace" (here on "replace_missing_scheme") (@scheme) + [xslt] The @scheme attribute of <constraintSpec> is required when the @mode is not specified (here on "add_missing_scheme") (@scheme) + [xslt] The @scheme attribute of <constraintSpec> is required when the @mode is "replace" (here on "replace_missing_scheme") (@scheme) [xslt] Since the @default-is-in-list-req attribute is required, it will always be specified. Thus the default value (of "ONE") will never be used. Either change the definition of the attribute so it is not required ("rec" or "opt"), or remove the defaultVal element. (tei:defaultVal) [xslt] Since the @default-NOT-in-list-req attribute is required, it will always be specified. Thus the default value (of "ONE") will never be used. Either change the definition of the attribute so it is not required ("rec" or "opt"), or remove the defaultVal element. (tei:defaultVal) [xslt] In the elementSpec defining blort2 the default value of the @default-NOT-in-list-opt attribute is not among the closed list of possible values (string(tei:defaultVal) = tei:valList/tei:valItem/@ident) diff --git a/P5/Test/testjustfs.odd b/P5/Test/testjustfs.odd index 1812687455..6c4095e2ed 100644 --- a/P5/Test/testjustfs.odd +++ b/P5/Test/testjustfs.odd @@ -1,40 +1,40 @@ - - - - TEI with Just Feature Structures - Sebastian Rahtz - - -

-
- -

authored from scratch

-
-
-
- - - - - - - - - - - - - - - - - - - - + xmlns:rng="http://relaxng.org/ns/structure/1.0" n="testjustfs"> + + + + TEI with Just Feature Structures + Sebastian Rahtz + + +

+
+ +

authored from scratch

+
+
+
+ + + + + + + + + + + + + + + + + + + +
diff --git a/P5/Utilities/TEI-to-tei_customization.xslt b/P5/Utilities/TEI-to-tei_customization.xslt index 1ab97678df..7b4eabbc7f 100644 --- a/P5/Utilities/TEI-to-tei_customization.xslt +++ b/P5/Utilities/TEI-to-tei_customization.xslt @@ -436,7 +436,7 @@ - + @@ -723,7 +723,7 @@ allow tables, figures, and formulæ - + The specification element <> has both a @@ -759,7 +759,7 @@ - + required modules @@ -783,7 +783,7 @@ - + A *Spec element should either be within schemaSpec, or be in a specGrp referred to by a specGrpRef wihin schemaSpec. @@ -800,7 +800,7 @@ - + TEI permits schemaSpec as a repeatable child of a variety of elements (including front, body, back, @@ -861,7 +861,7 @@
- + This is not strictly necessary. The TEI patterns have a default prefix (the value of ident of schemaSpec), so if only one external module is imported, it does not need a prefix — there will not be any collisions @@ -876,7 +876,7 @@
- + @@ -886,7 +886,7 @@ - + @@ -915,7 +915,7 @@ - + @@ -1215,7 +1215,7 @@ - + @@ -1227,7 +1227,7 @@ - + - + Removing <TEI> from your @@ -1256,21 +1256,21 @@ - + When adding a new element (whether replacing an old one or not), a content model must be specified; but this <elementSpec> does not have a <content> child. - + When used to delete an element from your schema, the <elementSpec> should be empty - + When used to add an element, <elementSpec> (or its ancestor <schemaSpec>) should have an @ns attribute. @@ -1530,7 +1530,7 @@ - + @@ -1550,7 +1550,7 @@ - + Constrains the source attribute of various tagset documentation elements to those values recommended by TEI diff --git a/P5/p5odds.odd b/P5/p5odds.odd index 18143ed8a1..22243b4c55 100644 --- a/P5/p5odds.odd +++ b/P5/p5odds.odd @@ -44,6 +44,12 @@ + + + + + + Per ticket