diff --git a/P5/Source/Guidelines/en/BIB-Bibliography.xml b/P5/Source/Guidelines/en/BIB-Bibliography.xml index b1276811d7..6e1c2f4b97 100644 --- a/P5/Source/Guidelines/en/BIB-Bibliography.xml +++ b/P5/Source/Guidelines/en/BIB-Bibliography.xml @@ -851,6 +851,15 @@ 《梁山伯與祝英台》 電影《梁山伯與祝英台》，舊版。 〈歷代漢文大藏經概述〉，李圓淨，原載《南行》第六期（南行學社編印）。 + + Libelt, Karol. + Wykłady Humboldta na uniwersytecie Berlińskim: notaty prelekcyj tych po uczniu Jego Karolu Libelcie, + Deutsches Textarchiv, + 2024-04-02. + urn:nbn:de:kobv:b4-30960-7, + + + Lillo, George. The London Merchant (1731), epilogue. 林覺民，《與妻訣別書》。 @@ -1440,13 +1449,10 @@ Press, 141-151. - No source, made up for these Guidelines. - Example is copied from the source of these - Guidelines. + Example is copied from the source of these Guidelines. Undetermined. -
@@ -6462,4 +6468,4 @@ with TEI P3. -->
- \ No newline at end of file + diff --git a/P5/Source/Guidelines/en/CMC-ComputerMediatedCommunication.xml b/P5/Source/Guidelines/en/CMC-ComputerMediatedCommunication.xml index 0c6c731815..2e2695e3ac 100644 --- a/P5/Source/Guidelines/en/CMC-ComputerMediatedCommunication.xml +++ b/P5/Source/Guidelines/en/CMC-ComputerMediatedCommunication.xml @@ -951,7 +951,7 @@ See the file COPYING.txt for details. icon-based emoji.

Alternatively, e.g. when w is not regularly used to encode tokens in the TEI document, c may be used to mark an emoji. For example, the source post Da kostet - ein Haarschnitt 50 € 😱 (from the corpus , in + ein Haarschnitt 50 € 😱 (from the corpus , in English A haircut there costs 50 € 😱) might be encoded as follows: Da kostet ein Haarschnitt 50 € 😱 diff --git a/P5/Source/Guidelines/en/ST-Infrastructure.xml b/P5/Source/Guidelines/en/ST-Infrastructure.xml index acec12b70d..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,68 +862,85 @@ one, or vice versa, should be done with care.

- + + + + - - - - - - - - - - + + + - - - - - - - - + + - - - + + + - - - - - - - - - + + + - - - + + + + + + + + + + + + + + - - + + + @@ -1147,11 +1164,11 @@ one, or vice versa, should be done with care.

- + - + @@ -1320,7 +1337,7 @@ entities in the XML DTD fragments.-->

- +

Attributes of type teidata.word, such as age on diff --git a/P5/Source/Guidelines/en/TD-DocumentationElements.xml b/P5/Source/Guidelines/en/TD-DocumentationElements.xml index 456a133475..a859176adb 100644 --- a/P5/Source/Guidelines/en/TD-DocumentationElements.xml +++ b/P5/Source/Guidelines/en/TD-DocumentationElements.xml @@ -134,7 +134,8 @@ an XML Document Type Declaration.

Element and Attribute Descriptions -

Within the body of a document using this module, the … the brief prose descriptions these provide for elements and attributes. +

Within the body of a document using this module, the following elements may be used to reference parts of the specification elements +discussed in section , in particular the brief prose descriptions these provide for elements and attributes. @@ -812,12 +813,12 @@ to mark any technical term, thus: - One of the attributes @name, @ref, or @key must be supplied + @@ -825,6 +826,7 @@ to mark any technical term, thus: + @@ -835,18 +837,50 @@ to mark any technical term, thus:

Note that the tei: prefix needs to be bound to the TEI - namespace using the Schematron language ns element, but typically this only - needs to be done once. The following two examples are written - presuming that the namespace binding for tei: has occured - elsewhere. The first example models the constraint that a TEI - div must contain either no subdivisions or at least two - of them: - + namespace using the Schematron language ns element. This can be done using the + constraintDecl element, which may appear in either the + encodingDesc or schemaSpec element. A + constraintDecl contains declarations specific to all + the constraintSpec elements in the current TEI document + whose scheme matches that of the + constraintDecl. + + + + + + + + + In this example the Schematron query language binding is set (to + xslt3) for use by a Schematron processor, two + namespace prefixes are bound to namespace URIs for later use within + constraint elements, and the + $uses_old_encoding variable is set (to either + true() or false()) so that Schematron + assertions elsewhere in the TEI document can easily test whether + the edition number of the document being checked is 3 or more. (Presumably + in this project there are minor encoding differences between the older + and newer editions which do not merit an entirely different + schema, but do merit the occasional different constraint.)

+

The following two examples are written presuming that the + constraintDecl above is in force, that is that the + Schematron processor will use an xslt3 binding, that + tei: is bound to the TEI namespace, that xi: is + bound to the XInclude namespace, and that the the variable + $uses_old_encoding is defined as a boolean. The + first example models the constraint that a TEI div must + contain either no subdivisions or at least two of them, with the + added complication that larger subdivisions are provided as + separate sectNN.xml files read in + using XInclude: + - if it contains any subdivisions, a - division must contain at least two of them + if it contains any + subdivisions, a division must contain at least two of them @@ -865,8 +899,11 @@ to mark any technical term, thus: - - a main title must be supplied + + a main title must be supplied + + + a main title must be supplied @@ -879,7 +916,6 @@ to mark any technical term, thus: - You should provide information in a figure from @@ -894,7 +930,6 @@ to mark any technical term, thus: - A <table> should have a caption, using a <head> element @@ -1809,6 +1844,7 @@ xmlns="http://www.tei-c.org/ns/Examples"> + diff --git a/P5/Source/Specs/att.handFeatures.xml b/P5/Source/Specs/att.handFeatures.xml index bb6c286ced..fc6d6a51e9 100644 --- a/P5/Source/Specs/att.handFeatures.xml +++ b/P5/Source/Specs/att.handFeatures.xml @@ -2,14 +2,15 @@ - provides attributes describing aspects of the hand in which a - manuscript is written. + provides attributes describing aspects of the hand in which a manuscript is written. 원고가 쓰여진 필적의 측면을 기술하는 속성을 제공한다. proporciona atributos que describen los aspectos de la mano que ha escrito un manuscrito. 手書き資料の筆致に関する情報を表す情報を示す。 - fournit des attributs décrivant les caractéristiques -de la main par laquelle un manuscrit est écrit. + fournit des attributs décrivant les caractéristiques de la main par laquelle un manuscrit est écrit. indica degli attributi che descrivono aspetti delle mano utilizzata per la scrittura del manoscritto + + + gives a name or other identifier for the scribe @@ -66,50 +67,11 @@ writing medium, e.g. pencil. describe la tinta o el tipo de tinta, p.ej. marrón, u otros instrumentos de escritura, p.ej. lápiz. - - specifies how widely this hand is used in the manuscript. - 이 필적이 원고에서 사용된 범위를 명시한다. - 当該筆致が、当該手書き資料中で、どの程度出現しているかを示す。 - spécifie la fréquence d'apparition de cette -main dans le manuscrit. - specifica in quale misura è utilizzata la mano in questione nel manoscritto - especifica en qué medida es utilizada la mano en el manuscrito. - - - - only this hand is used throughout the manuscript - 이 필적만이 원고 전체에 사용되었다. - 当該筆致だけで全てが書かれている。 - il n'y a que cette main dans le -manuscrit. - unica mano utilizzata nel manoscritto - al interno del manuscrito se utiliza sólo esta mano. - - - this hand is used through most of the manuscript - 이 필적이 원고 대부분에서 사용되었다. - 当該筆致で、殆どが書かれている。 - cette main est utilisée dans la -majeure partie du manuscrit. - mano utilizzata nella maggior parte del manoscritto - esta es la mano que se utiliza en la mayor parte del manuscrito. - - - this hand is used occasionally in the manuscript - 이 필적이 원고에서 가끔 사용되었다. - 当該筆致で、所々が書かれている。 - cette main est utilisée -occasionnellement dans le manuscrit. - mano utilizzata solo di rado nel manoscritto - esta mano se usa sólo ocasionalmente en el manuscrito. - - - -

Usually either script or scriptRef, -and similarly, either scribe or -scribeRef, will be supplied.

+

Usually either script or scriptRef, and + similarly, either scribe or scribeRef, will + be supplied.

通常は script または scriptRef そして同様に、 scribe あるいは scribeRef が用いられるだろう。

diff --git a/P5/Source/Specs/att.patternReplacement.xml b/P5/Source/Specs/att.patternReplacement.xml index 1f3d2acd9e..c6bbe969b1 100644 --- a/P5/Source/Specs/att.patternReplacement.xml +++ b/P5/Source/Specs/att.patternReplacement.xml @@ -91,7 +91,7 @@

- 文字列$1, $2などは、属性matchPatternにある正規表現に該当するグループに(開き括弧を左から右の順番で数えて)対応するものである。処理ソフトウェアは、当該正規表現に対応するグループに置換することが期待されている。

+ 文字列$1、$2などは、属性matchPatternにある正規表現に該当するグループに(開き括弧を左から右の順番で数えて)対応するものである。処理ソフトウェアは、当該正規表現に対応するグループに置換することが期待されている。

ドル記号に続く数値が(後方参照として用いられるのではなく)置換パターンとして必要な場合には、そのドル記号は%24と書かれなければならない。

diff --git a/P5/Source/Specs/att.placement.xml b/P5/Source/Specs/att.placement.xml index 150de792e4..b646fef54c 100644 --- a/P5/Source/Specs/att.placement.xml +++ b/P5/Source/Specs/att.placement.xml @@ -42,7 +42,7 @@ in the margin (left, right, or both) dans la marge (gauche, droite ou les deux en même temps) - 余白（左left, 右right, 左右both） + 余白（左left、右right、左右both） on the opposite, i.e. facing, page diff --git a/P5/Source/Specs/att.scope.xml b/P5/Source/Specs/att.scope.xml new file mode 100644 index 0000000000..eb86af9115 --- /dev/null +++ b/P5/Source/Specs/att.scope.xml @@ -0,0 +1,42 @@ + + + + + provides attributes to describe, in general terms, the scope of an element’s application. + + + indicates the scope of application of the element + + + + only this particular feature is used throughout the document + + + this feature is used through most of the document + + + this feature is used occasionally through the document + + + + + + + + An invented language the children call Wikwah. + + + + + + + +

Written in insular phase II half-uncial with + interlinear Old English gloss in an Anglo-Saxon + pointed minuscule.

+ + + + + + diff --git a/P5/Source/Specs/certainty.xml b/P5/Source/Specs/certainty.xml index c6bbb0494a..d4af7598af 100644 --- a/P5/Source/Specs/certainty.xml +++ b/P5/Source/Specs/certainty.xml @@ -241,7 +241,7 @@ ambiguity-free system for indicating certainty.

当該属性値として考えられるものは、他のcertainty要素の識別子またはそのリストである。従って、このcertainty要素を繋げて確率ネットワークを作ることができる。この確率ネットワークは、最終的には条件の付かない(given属性がない) certainty要素を起点として作られるだろう。この要素のネットワークの意味は、以下のように解釈することができる。あるcertainty要素を前提条件として参照している場合、 この要素が表す不確実さは前提条件側ではなく、当該要素に由来するものである。例えば、上の例では、最初のcertainty要素は、新しい筆写者がmsmである確信度を示している。2番目のものは、新しい筆写者がmsmである場合に、 Essexが人名である確信度を示している。この2番目のcertainty要素にあるのは、msmが新しい筆写者である確信度が0.6であるということではなく、msmは新しい筆写者であるとしていることに注意して欲しい。このように確率ネットワークを作ることが推奨される。

-

果敢な人は、他の要素や散文的記述を参照し、要素alt, join, noteなどの素性構造向け連結子を使い、 複雑な確率ネットワークを作ろうとするかもしれない。しかし、当該のcertainty要素が、確信度を明瞭に示す包括的な解決策であるとは、現時点では考えていない。 +

果敢な人は、他の要素や散文的記述を参照し、要素alt、join、noteなどの素性構造向け連結子を使い、 複雑な確率ネットワークを作ろうとするかもしれない。しかし、当該のcertainty要素が、確信度を明瞭に示す包括的な解決策であるとは、現時点では考えていない。

diff --git a/P5/Source/Specs/constraintDecl.xml b/P5/Source/Specs/constraintDecl.xml new file mode 100644 index 0000000000..62e2e9b6a6 --- /dev/null +++ b/P5/Source/Specs/constraintDecl.xml @@ -0,0 +1,96 @@ + + + + + constraint declaration + contains declarations pertaining to formal constraints expressed elsewhere in constraintSpec elements + + + + + + + + + + + + + + + + + + + + + + Each <constraintDecl> element should have a @scheme attribute that is distinct from that of all the other <constraintDecl>s. + + + + + + + supplies the name of the language to which the declarations herein apply + + + + ISO Schematron + + + +

The declarations contained in a particular + constraintDecl (including queryBinding, if + present) apply to the constraintSpec elements whose + scheme matches the scheme of the + constraintDecl.

+ + + + query language binding + specifies the query + language binding for rule-based schema expressions in + constraintSpec elements that have a matching + scheme attribute + + + + + + + + + + + + + + + + +

The suggested values above are the values reserved by the + Schematron specification. Only exslt, + stx, xslt, xslt2, + xslt3, xpath2, and xpath3 are + defined by the specification. Most processors only support one + or more of xslt, xslt2, and + xslt3.

+ + + + + + + + + + + + + + diff --git a/P5/Source/Specs/constraintSpec.xml b/P5/Source/Specs/constraintSpec.xml index b936185206..1495d3fa27 100644 --- a/P5/Source/Specs/constraintSpec.xml +++ b/P5/Source/Specs/constraintSpec.xml @@ -63,7 +63,7 @@ - + The use of ISO Schematron sch:assert and sch:report elements without a parent sch:rule diff --git a/P5/Source/Specs/dateline.xml b/P5/Source/Specs/dateline.xml index a175ace081..14a73025c3 100644 --- a/P5/Source/Specs/dateline.xml +++ b/P5/Source/Specs/dateline.xml @@ -25,6 +25,7 @@ + diff --git a/P5/Source/Specs/encodingDesc.xml b/P5/Source/Specs/encodingDesc.xml index d923228ce4..0ad4e460ca 100644 --- a/P5/Source/Specs/encodingDesc.xml +++ b/P5/Source/Specs/encodingDesc.xml @@ -15,7 +15,7 @@ source or sources from which it was derived. 전자 텍스트와 그것의 원전 텍스트 혹은 텍스트들 사이의 관련성을 기록한다. 記錄電子文件和其ㄧ個或多個文件來源之間的關係。 電子テキストとその元資料との関係を示す。 - dokumentiert das Verhältnis zwischen dem elektronischen Text und seiner Quelle oder den Quellen, von denen er sich ableitet. + dokumentiert das Verhältnis zwischen dem elektronischen Text und seiner Quelle oder den Quellen, von denen er sich ableitet. documenta la relación entre un texto electrónico y la fuente o fuentes de las que este deriva. documenta la relazione fra un documento elettronico e la o le fonti da cui è derivato. @@ -23,21 +23,17 @@ source or sources from which it was derived. - - - - - - - - + + + +

Basic encoding, capturing lexical information only. All -hyphenation, punctuation, and variant spellings normalized. No -formatting or layout information preserved.

+ hyphenation, punctuation, and variant spellings normalized. No + formatting or layout information preserved.

 @@ -45,14 +41,12 @@ formatting or layout information preserved.

-

Corpus de - textes sélectionnés pour la formation MISAT, Frejus, - juillet 2010. -

+

Corpus de textes sélectionnés pour la formation MISAT, + Frejus, juillet 2010.

 -

Corpus - d'échantillons de 2000 mots pris au début de chaque texte.

+

Corpus d'échantillons de 2000 mots pris au début de + chaque texte.

 diff --git a/P5/Source/Specs/handNote.xml b/P5/Source/Specs/handNote.xml index bc693f05c0..4fd997dac1 100644 --- a/P5/Source/Specs/handNote.xml +++ b/P5/Source/Specs/handNote.xml @@ -12,12 +12,9 @@ 원고 내에서 구분되는 특별한 문체 또는 기법을 기술한다. 描述在手稿中可明顯辨識出的特殊風格或書寫手法。 手書き資料中にある特定のスタイルまたは筆致を示す。 - décrit un style d'écriture ou une main qui sont - reconnus dans un manuscrit. - describe un determinado estilo o una determinada mano - al interno de un manuscrito. - descrive un determinato stile o una determinata mano - all'interno di un manoscritto + décrit un style d'écriture ou une main qui sont reconnus dans un manuscrit. + describe un determinado estilo o una determinada mano al interno de un manuscrito. + descrive un determinato stile o una determinata mano all'interno di un manoscritto @@ -26,20 +23,34 @@ - - -

Written in insular - phase II half-uncial with interlinear Old English gloss in an Anglo-Saxon pointed - minuscule.

- + + + + Handwriting of the copyist Karol Libelt, brown ink, in German cursive script. + A note, pencil, unknown author. + Writer of the title page Józef Łepkowski, pencil. + Note on the title page, pencil, by Józef Korzeniowski. + + + + + + + Hand des Nachschreibers Karol Libelt, braune Tinte, vorwiegend in Kurrentschrift. + Eine Anmerkung, Bleistift, unbekannter Verfasser. + Schreiber des Titelblattes Józef Łepkowski, Bleistift. + Anmerkung auf dem Titelblatt, Bleistift, von Józef Korzeniowski. + - Premier scribe : inconnu - - Premier rubricateur : inconnu - + + Premier scribe : inconnu + + + Premier rubricateur : inconnu + diff --git a/P5/Source/Specs/language.xml b/P5/Source/Specs/language.xml index 6835731d24..c9408915cd 100644 --- a/P5/Source/Specs/language.xml +++ b/P5/Source/Specs/language.xml @@ -6,18 +6,17 @@ langue Sprache characterizes a single language or sublanguage used within a text. - caractérise une langue ou une variété de langue utilisée - dans un texte. + caractérise une langue ou une variété de langue utilisée dans un texte. 텍스트 내에서 사용되는 언어 또는 특수 언어의 특징을 기술한다. 個別敘述文本中使用的語言或次要語言。 テキスト中にあるひとつの言語または特殊言語を示す。 - beschreibt eine einzelne Sprache oder eine Subsprache, die innerhalb eines Textes verwendet wird. + beschreibt eine einzelne Sprache oder eine Subsprache, die innerhalb eines Textes verwendet wird. caracteriza una lengua o jerga empleada en un texto. - indica una lingua o un linguaggio secondario utilizzato - all'interno di un testo. + indica una lingua o un linguaggio secondario utilizzato all'interno di un testo. - + + diff --git a/P5/Source/Specs/lb.xml b/P5/Source/Specs/lb.xml index 1800fff873..4d51431ea6 100644 --- a/P5/Source/Specs/lb.xml +++ b/P5/Source/Specs/lb.xml @@ -9,7 +9,7 @@ inicio de línea inizio di riga Zeilenanfang - marks the beginning of a new (typographic) line in some edition or version of a text. + marks the beginning of a topographic line in some edition or version of a text. 텍스트의 편집 또는 버전에서 새로운 (인쇄상의) 행 시작을 표지한다. 標記某版本文本裡 (在印刷上) 的新起行。 ある版における新しい(印刷上の)行の始まりを示す。 @@ -32,8 +32,7 @@ -

This example shows typographical line breaks within metrical lines, where they occur at different - places in different editions:

+

This example shows the encoding of the beginning of each new topographic line within a metrical line, indicating where it occurs in both the 1667 and 1674 editions:

Of Mans First Disobedience, and the Fruit Of that Forbidden Tree, whose mortal tast @@ -58,9 +57,9 @@ -

This example encodes typographical line breaks as a means of +

This example shows the encoding of the beginning of a new topographical line as a means of preserving the visual appearance of a title page. The break -attribute is used to show that the line break does not (as elsewhere) + attribute is used to show that the beginning of the new line does not (as elsewhere) mark the start of a new word.

With Additions, ne-ver before Printed. @@ -89,15 +88,15 @@ soi-xante & dixhuytiesme livre. starts. The n attribute, if used, indicates the number or other value associated with the text between this point and the next lb element, typically the sequence number of the line within the page, or other appropriate unit. This element is intended to be - used for marking actual line breaks on a manuscript or printed page, at the point where they - occur; it should not be used to tag structural units such as lines of verse (for which the + used for marking the beginning of each new topographic line on a manuscript or printed page, at the point where it + occurs; it should not be used to tag structural units such as lines of verse (for which the l element is available) except in circumstances where structural units cannot otherwise be marked.

The type attribute may be used to characterize the - line break in any respect. The more specialized attributes + line beginning in any respect. The more specialized attributes break, ed, or edRef should be preferred when the - intent is to indicate whether or not the line - break is word-breaking, or to note the source from which it + intent is to indicate whether or not the beginning of the new topographic line + is word-breaking, or to note the source from which it derives.

diff --git a/P5/Source/Specs/line.xml b/P5/Source/Specs/line.xml index d762b6b08e..8f4ab3efaa 100644 --- a/P5/Source/Specs/line.xml +++ b/P5/Source/Specs/line.xml @@ -21,6 +21,7 @@ +

This example shows topographical lines as a means of preserving the visual appearance of a poem:

@@ -53,7 +54,7 @@ said

This element should be used only to mark up writing which is topographically organized as a series of lines, horizontal or vertical. It should not be used to mark lines of verse (for which use -l) nor to mark linebreaks within text which has been encoded +l) nor to mark line beginnings within text which has been encoded using structural elements such as p (for which use lb).

 diff --git a/P5/Source/Specs/post.xml b/P5/Source/Specs/post.xml index dae4fc0c32..49818bcc53 100644 --- a/P5/Source/Specs/post.xml +++ b/P5/Source/Specs/post.xml @@ -223,7 +223,7 @@ See the file COPYING.txt for details. timelines, as individual comments following a status update on Facebook pages, as posts in forum threads, as contributions on Wikipedia talk pages or in the comments section of a weblog. [Element adopted from the DeRiK schema. - Aspects of the model adopted from the CoMeRe Schema]. The + Aspects of the model adopted from the CoMeRe Schema]. The post element is a member of the model class model.common (via model.CMC). This allows for using (and combining) occurrences of post, u, incident, and kinesicin one and the same div in order to diff --git a/P5/Source/Specs/ptr.xml b/P5/Source/Specs/ptr.xml index 933b98f230..d554ace4ec 100644 --- a/P5/Source/Specs/ptr.xml +++ b/P5/Source/Specs/ptr.xml @@ -41,6 +41,18 @@ + +

The target and cRef attributes are mutually exclusive.

+ + +

Les attributs target et cRef sont exclusifs l'un de l'autre.

+ + +

属性targetとcRefは、排他的に使用される。

+ + +

Die target und cRef-Attribute schließen sich gegenseitig aus.

+ diff --git a/P5/Source/Specs/ref.xml b/P5/Source/Specs/ref.xml index 296d4f14d5..a7c4b12f41 100644 --- a/P5/Source/Specs/ref.xml +++ b/P5/Source/Specs/ref.xml @@ -34,7 +34,7 @@ - Only one of the attributes @target' and @cRef' may be supplied on + Only one of the attributes @target and @cRef may be supplied on . diff --git a/P5/Source/Specs/schemaSpec.xml b/P5/Source/Specs/schemaSpec.xml index 374e6b5a36..ed87124fb7 100644 --- a/P5/Source/Specs/schemaSpec.xml +++ b/P5/Source/Specs/schemaSpec.xml @@ -11,8 +11,7 @@ TEI 구조 스키마 및 문서를 생성한다. 建立一個符合TEI標準的模型以及該模型文件。 TEI準拠のスキーマや文書を示す。 - génère un schéma conforme à la TEI et la - documentation qui l'accompagne. + génère un schéma conforme à la TEI et la documentation qui l'accompagne. genera un esquema TEI-conforme y la documentación relativa. genera uno schema TEI-conforme e la relativa documentazione @@ -31,39 +30,32 @@ + - + - specifies entry points to the schema, i.e. which patterns - may be used as the root of documents conforming to - it. + specifies entry points to the schema, i.e. which patterns may be used as the root of documents conforming to it. 스키마에서 표제 항목 지점을 명시한다. 즉, 어떤 요소가 해당 문서의 뿌리로 사용되는 것이 허용되었는지를 명시한다. 指出該模型的初步條件，例如在符合該模型標準的文件中，那些元素可做為文件的根元素。 当該スキーマの開始点を示す。すなわち、TEI準拠文書の根要素となる 要素を示す。 - précise les points d'accès au schéma, - i.e. quels sont les éléments permis comme racine des documents XML qui se - conforment à ce schéma. + précise les points d'accès au schéma, i.e. quels sont les éléments permis comme racine des documents XML qui se conforment à ce schéma. especifica los puntos de acceso al esquema, es decir, qué elementos son los permitidos para ser usados como raíz de los documentos conforme al esquema mismo. specifica i punti di accesso allo schema, cioè quali elementi sono consentiti come radice dei documenti conformi allo schema stesso TEI - specifies a default prefix which will be prepended to all - patterns relating to TEI elements, unless otherwise stated. + specifies a default prefix which will be prepended to all patterns relating to TEI elements, unless otherwise stated. TEI 요소와 관련된 모든 유형에 첨가될 접두사를 명시한다. 이는 TEI로서 동일 이름의 요소를 갖는 외부 스키마가 혼용되는 것을 허용한다. 指明一個附加在所有和TEI元素相關的模式中的前綴。這使得外部模型可以和TEI結合，這些外部模型具有和TEI元素名稱相同的元素。 - TEI要素の全パタンに対応する接頭辞を示す。これにより、TEIと同じ名 - 前を持つ外部スキーマを混在させることができる。 - précise un préfixe qui sera ajouté à tous - les modèles de définition des éléments de la TEI. Cela autorise l'introduction - des schémas externes ayant des éléments de même nom que ceux de la TEI + TEI要素の全パタンに対応する接頭辞を示す。これにより、TEIと同じ名 前を持つ外部スキーマを混在させることができる。 + précise un préfixe qui sera ajouté à tous les modèles de définition des éléments de la TEI. Cela autorise l'introduction des schémas externes ayant des éléments de même nom que ceux de la TEI especifica un prefijo que será antepuesto a todos los patrones relativos a los elementos TEI. indica un prefisso che sarà anteposto a tutti i pattern relativi a elementi TEI; questo consente @@ -76,13 +68,10 @@

Les deux-points, bien qu'ils soient permis à l'intérieur de - la valeur, provoqueront la génération d'un schéma invalide. -

+ la valeur, provoqueront la génération d'un schéma invalide.

 -

- コロンは、値としては認められるが、スキーマ中では使用できない。 -

+

コロンは、値としては認められるが、スキーマ中では使用できない。

 @@ -91,16 +80,12 @@ lengua meta langue cible lingua di arrivo - specifies which language to use when creating - the objects in a schema if names for elements or attributes are available in more - than one language. + specifies which language to use when creating the objects in a schema if names for elements or attributes are available in more than one language. 요소 또는 속성의 이름을 만들기 위해 여러 언어에서 사용가능한 경우, 스키마에서 대상을 만들 때 사용하는 언어를 명시한다. 若元素或屬性名稱所使用的語言有一種以上，說明建立文件模型時要使用那一種語言。 要素や属性の名前が複数言語である場合には、スキーマ中の対象を作成 する際に使用される言語を特定する。 - lorsque des noms pour un élément ou pour - un attribut sont disponibles en plusieurs langues, précise quelle langue - utiliser lors de la création d'objets dans un schéma . + lorsque des noms pour un élément ou pour un attribut sont disponibles en plusieurs langues, précise quelle langue utiliser lors de la création d'objets dans un schéma . indica la lengua que se utiliza para la creación de objetos en el esquema en el caso en que los nombres de elementos o atributos esten disponibles en otras lenguas. indica la lingua da utilizzare per la creazione di oggetti nello schema nel caso in cui i nomi di elementi o attributi siano disponibili in più lingue @@ -111,35 +96,40 @@ lengua de la documentación langue de documentation lingua della documentazione - specifies which - languages to use when creating documentation if the description - for an element, attribute, class or macro is available in more - than one language. + specifies which languages to use when creating documentation if the description for an element, attribute, class or macro is available in more than one language. 요소, 속성, 부류 또는 매크로에 대한 기술이 여러 언어에서 사용 가능한 경우, 문서를 만들 때 사용하는 언어를 명시한다. 若元素、屬性、元素集或巨集指令描述所使用的語言有一種以上，說明建立文件時要使用那一種語言。 - 要素、属性、クラス、マクロの解説が複数言語で可能な場合、解説の言 - 語を特定する。 - lorsque la description pour un élément, - un attribut, une classe ou une macro est disponible en plusieurs langues, - précise quelle langue utiliser lors de la création de la documentation. + 要素、属性、クラス、マクロの解説が複数言語で可能な場合、解説の言 語を特定する。 + lorsque la description pour un élément, un attribut, une classe ou une macro est disponible en plusieurs langues, précise quelle langue utiliser lors de la création de la documentation. 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. 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 - + + +

Although multiple languages may be specified, the current TEI ODD processor is only capable of handling one.

 - default namespace - exclusions + default namespace exclusions provides a list of namespaces and/or prefixed element names to be excluded by default from anyName in RELAX NG schemas. http://www.tei-c.org/ns/1.0 teix:egXML -

Specifies defaults for the except attribute of anyElement. RELAX NG validation (unless DTD Compatibility Mode is turned off) requires that any elements which may take an xml:id be excluded from the content of anyName name classes. For normal TEI purposes, this includes anything in the TEI namespace and the egXML element. The defaultExceptions attribute sets the global defaults for these exclusions. Element prefixes must be declared using a namespace declaration on the parent or an ancestor element.

+

Specifies defaults for the except attribute of + anyElement. RELAX NG validation (unless DTD + Compatibility Mode is turned off) requires that any elements + which may take an xml:id be excluded from the + content of anyName name classes. For normal TEI + purposes, this includes anything in the TEI namespace and the + egXML element. The defaultExceptions + attribute sets the global defaults for these + exclusions. Element prefixes must be declared using a + namespace declaration on the parent or an ancestor + element.

 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) diff --git a/P5/Utilities/TEI-to-tei_customization.xslt b/P5/Utilities/TEI-to-tei_customization.xslt index 7b4eabbc7f..21816280fc 100644 --- a/P5/Utilities/TEI-to-tei_customization.xslt +++ b/P5/Utilities/TEI-to-tei_customization.xslt @@ -1,5 +1,5 @@ - - - + + + + + + @@ -103,7 +107,9 @@ - + + + @@ -113,4 +119,10 @@ + + + + + + diff --git a/P5/p5valid.nvdl b/P5/p5valid.nvdl index 3a256cdfd1..1090af9277 100644 --- a/P5/p5valid.nvdl +++ b/P5/p5valid.nvdl @@ -36,7 +36,13 @@ - + + + + @@ -106,4 +112,10 @@ + + + + + + diff --git a/README.md b/README.md index d0a8d2f973..b69206dbbe 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,5 @@ The [TEI](https://www.tei-c.org) is an international and interdisciplinary stand This repository contains the sources for building the [TEI P5 Guidelines](https://www.tei-c.org/release/doc/tei-p5-doc/en/html/index.html) and [schemas](https://www.tei-c.org/guidelines/customization/). If you want to work on the Guidelines, you should look in the [P5 directory](https://github.com/TEIC/TEI/tree/dev/P5). -Some notes on working with Git and on this GitHub repository may be found in the following documents: +Some notes on working with Git and on this GitHub repository may be found in the following document: * [Git README](https://github.com/TEIC/TEI/blob/master/Documents/Git-README.md) -* [Using the TEI GitHub Repository](https://www.tei-c.org/guidelines/p5/using-the-tei-github-repository/)