diff --git a/P5/Source/Guidelines/en/DI-PrintDictionaries.xml b/P5/Source/Guidelines/en/DI-PrintDictionaries.xml index 3f48249f14..bbe83b611f 100644 --- a/P5/Source/Guidelines/en/DI-PrintDictionaries.xml +++ b/P5/Source/Guidelines/en/DI-PrintDictionaries.xml @@ -1982,8 +1982,7 @@ derivatives or inflected forms of the entry word, or for compound words, phrases collocations, and idioms containing the entry word.

Related entries can be complex, and may in fact include any of the information to be found in a regular entry. Therefore, the re element is defined to contain -the same elements as an entry element, with the exception that it may not -contain any nested re elements.

+the same elements as an entry element.

Examples: bevvy (ˈbɛvɪ) informal n, pl -vies 1 a drink, esp an diff --git a/P5/Source/Guidelines/en/ND-NamesDates.xml b/P5/Source/Guidelines/en/ND-NamesDates.xml index 78a70942f7..d268a75dfc 100644 --- a/P5/Source/Guidelines/en/ND-NamesDates.xml +++ b/P5/Source/Guidelines/en/ND-NamesDates.xml @@ -2907,7 +2907,7 @@ Journal rédigé par Camille Desmoulins, - + diff --git a/P5/Source/Specs/att.ascribed.xml b/P5/Source/Specs/att.ascribed.xml index 884e199474..086fc17c7b 100644 --- a/P5/Source/Specs/att.ascribed.xml +++ b/P5/Source/Specs/att.ascribed.xml @@ -34,7 +34,7 @@ $Id$

In the following example from Hamlet, speeches (sp) in the body of the play - are linked to castItem elements in the castList using the who + are linked to role elements in the castList using the who attribute.

diff --git a/P5/Source/Specs/att.deprecated.xml b/P5/Source/Specs/att.deprecated.xml index 554ed67dfc..d81975fcc9 100644 --- a/P5/Source/Specs/att.deprecated.xml +++ b/P5/Source/Specs/att.deprecated.xml @@ -34,7 +34,7 @@ $Id$ - + diff --git a/P5/Source/Specs/revisionDesc.xml b/P5/Source/Specs/revisionDesc.xml index 5673804d6d..bf60b57000 100644 --- a/P5/Source/Specs/revisionDesc.xml +++ b/P5/Source/Specs/revisionDesc.xml @@ -30,11 +30,9 @@ $Id$ - - - - - + + + diff --git a/P5/Test/test-newodd.xml b/P5/Test/test-newodd.xml index 98e0f031e1..1f6e062f39 100644 --- a/P5/Test/test-newodd.xml +++ b/P5/Test/test-newodd.xml @@ -1,17 +1,16 @@ - + - testfile for new ODD + testfile for new ODD -

Unpublished as yet

+

Unpublished as yet

-

Made up by Lou

+

Made up by Lou

@@ -20,347 +19,286 @@ - -

Our first schema is a very simple one. It contains three elements - stuff, bit, and bob. As the names - suggest, this is not a TEI schema, and it does not use either the TEI - name space or the TEI class system.

- - - - - - Root element for a very simple schema - - - - - - - - - - - - Empty pointing element in a very simple schema - - - - - - supplies the URI of the thing pointed at - - - - - - - - - - Textual element in a very simple schema - - - - - - - - +

Our first schema is a very simple one. It contains three elements stuff, + bit, and bob. As the names suggest, this is not a TEI schema, and it + does not use either the TEI namespace or the TEI class system.

+ + + + + Root element for a very simple schema + + + + + + + + + + + + Empty pointing element in a very simple + schema + + + + + + supplies the URI of the thing pointed + at + + + + + + + + + Textual element in a very simple + schema + + + + + + + + + - - -

The schema is defined by a schemaSpec containing three - explicit elementSpec elements, conforming to the definition - provided for these elements in the TEI Guidelines. Note that the - content models all make reference to the RELAXNG namespace, but are - otherwise free standing. In particular, they make no use of TEI - element or attribute classes.

- -

Now suppose that we realise that our bit is much the same - as the existing TEI p, our bob is much the same as - the existing TEI ptr, and our stuff is much the same - as the TEI div. Can we rewrite the above ODD to use just a - few TEI elements? -

- - - - - + +

The schema is defined by a schemaSpec containing three explicit + elementSpec elements, conforming to the definition provided for these elements in + the TEI Guidelines. Note that the content models all make reference to the RELAXNG + namespace, but are otherwise free standing. In particular, they make no use of TEI element + or attribute classes.

+ +

Now suppose that we realise that our bit is much the same as the existing TEI + p, our bob is much the same as the existing TEI ptr, and our + stuff is much the same as the TEI div. Can we rewrite the above ODD to + use just a few TEI elements?

+ + + + + - - -

Note the use of the source attribute to indicate the - default source for any elements referenced by our schema - specification. The elementRef element saves us the trouble of - having to define our TEI elements; its effect is to copy into the - schema the whole of the TEI standard element, including its namespace - and class memberships.

- -

Suppose, however, that having got accustomed to our stuff - element, we wish to keep it, but to define its contents to use TEI - elements. We can make a simple schema combining our new element within - the TEI existing framework.

- - - - - Root element for a very simple schema - - - - - - - - - - - - + +

Note the use of the source attribute to indicate the default source for any + elements referenced by our schema specification. The elementRef element saves us + the trouble of having to define our TEI elements; its effect is to copy into the schema the + whole of the TEI standard element, including its namespace and class memberships.

+ +

Suppose, however, that having got accustomed to our stuff element, we wish to keep + it, but to define its contents to use TEI elements. We can make a simple schema combining + our new element within the TEI existing framework.

+ + + + Root element for a very simple schema + + + + + + + + + + + + - - -

Here we did not explicitly state that the elements we want are to be taken from the current TEI P5 version, since that is the default behaviour. Note however that our non-TEI element must specify that it is in the null - name space (or specify a name space of its own).

- -

In the real world it is fairly unusual for schemas to have only a - handful of elements. Partly for this reason, the TEI scheme is defined - as a set of modules, each of which defines a - number of elements. These modules are a convenient way of including - several elements at once: - - - - - - - - - - Each moduleRef here could be replaced by an - elementRef for all the elements stored in that - particular module. The name of the module in which it is to be stored - forms part of the declaration of an element in the TEI source. Element - names are unique across all modules; module names are unique across a - given source scheme. -

- -

It is sometimes convenient to say that one wishes to use all the - elements from a given module, except for a small - number. The attribute exclude may be used for this purpose: + +

Here we did not explicitly state that the elements we want are to be taken from the current + TEI P5 version, since that is the default behaviour. Note however that our non-TEI element + must specify that it is in the null name space (or specify a name space of its own).

+ +

In the real world it is fairly unusual for schemas to have only a handful of elements. + Partly for this reason, the TEI scheme is defined as a set of modules, + each of which defines a number of elements. These modules are a convenient way of including + several elements at once: + + + + + + Each moduleRef here could be replaced by an elementRef for all + the elements stored in that particular module. The name of the module in which it is to be + stored forms part of the declaration of an element in the TEI source. Element names are + unique across all modules; module names are unique across a given source scheme.

+ +

It is sometimes convenient to say that one wishes to use all the elements from a given + module, except for a small number. The attribute exclude may be used + for this purpose:

+ + + + + + +

Another way of achieving the same goal would be to add a new declaration for each element + to be deleted from the schema, as follows.

+ + + + + + + + + + + + +

This is a special case of the general mechanism for modifying elements discussed below. An + ODD processor first gathers all the declarations for elements found within a schema + specification, whether by explicit reference or by reference to a module. In the above + example, it will therefore find two declarations for each of mentioned, + quote, and said -- one from the module core, and one from + the schema specification itself. In a second phase of processing, the ODD processor combines + such multiple declarations according to specified rules, for example that if any declaration + specifies mode="delete" the effect is to remove all declarations for that + element.

+ +

An attribute include is also available on moduleRef for the convenience + of those wishing to specify explicitly the elements required from a given module. The same + effect could be achieved by means of an elementRef for each required element, of + course: this redundancy is provided for convenience.

+ +

Note that when a schema is defined by inclusion rather than exclusion of elements it is + important to ensure that any elements required by the content model of another + element are actually present. In the current TEI Guidelines, content models are as far as + possible defined in terms of element classes rather than explicit elements, which mitigates + this problem. Nevertheless, there remain some obligatory elements, for example in the TEI + Header, all of which must therefore be explicitly requested.

+ +

In summary, supposing element x to be provided by module Y, the following combinations are + meaningful: + + + + + + + + + + + + + + +

- - - - + +

The elementSpec element is used to add a new non-TEI element to a schema. If that + schema uses the TEI architecture as its base, then the schema will include all the + declarations necessary to make use of the TEI class system. In the following example, we + declare a new element diachrony in our own namespace and add it to the existing TEI + dictionary schema:

+ + + + + + + contains the description of the historical + information attached to a dictionary entry, and organized as a hierarchy of possibly + dated and referenced senses. + + + + + + + + + + + + + + + + + + - -

Another way of achieving the same goal would be to add a new - declaration for each element to be deleted from the schema, as - follows.

- + +

For purposes of TEI conformance, it is required that any new non-TEI element explicitly + indicate that it is not part of the TEI name space, using the ns attribute. To + avoid possible name collisions during schema generation, it is strongly recommended that + such elements also specify a unique prefix, using the prefix attribute.

+ +

In the following example, we add two non-TEI elements, admin and hi, both + taken from the TBX name space. The admin element is added to the TEI + model.hiLike class. Note that it is the non-TEI hi element which + is referenced in its content model, and therefore a prefix must be used to distinguish the + two.

- - - - - - - - + source="http://www.tei-c.org/release/xml/tei/odd/Source/Guidelines/en/guidelines-en.xml" + start="TEI" ident="testSchema-6"> + + + + + Contains information of an administrative + nature for the node (parent element) in question, such as the source of information, or + the project or client for which it applies. + + + + + + + + + + Highlights a segment of text and optionally + points to another element. + + + + - -

This is a special case of the general mechanism for modifying - elements discussed below. An ODD processor first gathers all the - declarations for elements found within a schema specification, whether - by explicit reference or by reference to a module. In the above - example, it will therefore find two declarations for each of - mentioned, quote, and said -- one from the - module core, and one from the schema specification - itself. In a second phase of processing, the ODD processor combines - such multiple declarations according to specified rules, for example - that if any declaration specifies mode="delete" the - effect is to remove all declarations for that element.

- -

An attribute include is also available on - moduleRef for the convenience of those wishing to specify - explicitly the elements required from a given - module. The same effect could be achieved by means of an - elementRef for each required element, of course: this - redundancy is provided for convenience. -

- -

Note that when a schema is defined by inclusion rather than - exclusion of elements it is important to ensure that any elements - required by the content model of another element are actually - present. In the current TEI Guidelines, content models are as far as - possible defined in terms of element classes rather than explicit - elements, which mitigates this problem. Nevertheless, there remain - some obligatory elements, for example in the TEI Header, all of which - must therefore be explicitly requested.

- -

In summary, supposing element x to be provided by module Y, the - following combinations are meaningful: - - - - - - - - - - - - - - - - - -

- - - -

The elementSpec element is used to add a new non-TEI - element to a schema. If that schema uses the TEI architecture as its - base, then the schema will include all the declarations necessary to - make use of the TEI class system. In the following example, we - declare a new element diachrony in our own namespace and add - it to the existing TEI dictionary schema: - -

- - - - - - - contains the description of the historical - information attached to a dictionary entry, and organized - as a hierarchy of possibly dated and referenced - senses. - - - - - - - - - - - - - - - - - - - - -

For purposes of TEI conformance, it is required - that any new non-TEI element explicitly indicate that it is not part - of the TEI name space, using the ns attribute. To avoid - possible name collisions during schema generation, it is strongly - recommended that such elements also specify a unique prefix, using - the prefix attribute.

- -

In the following example, we add two non-TEI elements, - admin and hi, both taken from the TBX name - space. The admin element is added to the TEI - model.hiLike class. Note that it is the non-TEI - hi element which is referenced in its content model, and - therefore a prefix must be used to distinguish the two. - -

- - - - - - Contains information of an administrative nature for the node (parent element) - in question, such as the source of information, or the project or client for - which it applies. - - - - - - - - - - Highlights a segment of text and optionally points to another element. - - - - + + + + + + + + + Its not clear a what a p is, but its not a + TEI p + + + + + + + + + + + + + + + + + - - - - - - - - Its not clear a what a p is, but its not a TEI p - - - - - - - - - - - - - - - - - - - - - + + @@ -369,20 +307,19 @@ - - - - - - - + + + + + + + + + - + - - - diff --git a/P5/Test/testdocbook1.odd b/P5/Test/testdocbook1.odd index 8f6d6a5846..762e2561fe 100644 --- a/P5/Test/testdocbook1.odd +++ b/P5/Test/testdocbook1.odd @@ -25,12 +25,14 @@ - - - - - - + + + + + + + + diff --git a/P5/Test/testdocbook2.odd b/P5/Test/testdocbook2.odd index d642ab695c..f9fcfaf2dc 100644 --- a/P5/Test/testdocbook2.odd +++ b/P5/Test/testdocbook2.odd @@ -24,12 +24,14 @@ - - - - - - + + + + + + + + diff --git a/P5/Test/testdocbook3.odd b/P5/Test/testdocbook3.odd index 3d2b8d4571..d4b14b2f60 100644 --- a/P5/Test/testdocbook3.odd +++ b/P5/Test/testdocbook3.odd @@ -24,12 +24,14 @@ - - - - - - + + + + + + + + diff --git a/P5/Test/testdocbook4.odd b/P5/Test/testdocbook4.odd index 769fd31e4f..eb05c74eea 100644 --- a/P5/Test/testdocbook4.odd +++ b/P5/Test/testdocbook4.odd @@ -50,12 +50,14 @@ - - - - - - + + + + + + + + diff --git a/P5/Test/testdocbook5.odd b/P5/Test/testdocbook5.odd index e397e9d8e3..2857696996 100644 --- a/P5/Test/testdocbook5.odd +++ b/P5/Test/testdocbook5.odd @@ -25,15 +25,17 @@ - - - - - - - - - + + + + + + + + + + + diff --git a/P5/Test/testnym.odd b/P5/Test/testnym.odd index 4a6f2edb72..410c353dfe 100644 --- a/P5/Test/testnym.odd +++ b/P5/Test/testnym.odd @@ -179,15 +179,17 @@ proposal described here.

- - - - - - - - - + + + + + + + + + + +