diff --git a/P5/Source/Specs/model.physDescPart.xml b/P5/Source/Defunct/model.physDescPart.xml similarity index 100% rename from P5/Source/Specs/model.physDescPart.xml rename to P5/Source/Defunct/model.physDescPart.xml diff --git a/P5/Source/Specs/model.textDescPart.xml b/P5/Source/Defunct/model.textDescPart.xml similarity index 100% rename from P5/Source/Specs/model.textDescPart.xml rename to P5/Source/Defunct/model.textDescPart.xml diff --git a/P5/Source/Guidelines/en/CC-LanguageCorpora.xml b/P5/Source/Guidelines/en/CC-LanguageCorpora.xml index 6b8be10742..cc6c5c7371 100644 --- a/P5/Source/Guidelines/en/CC-LanguageCorpora.xml +++ b/P5/Source/Guidelines/en/CC-LanguageCorpora.xml @@ -329,10 +329,19 @@ categorize texts, which is fully described in section , and organized as a set of values and optional prose descriptions for the following eight situational parameters, each represented by one of the following eight elements: -

-

These elements constitute a model class called model.textDescPart; new parameters may be defined + + + + + + + + + +

+

By default, a text description will contain each of the above elements, supplied in the order specified. Except for the @@ -964,4 +973,4 @@ elements, or silently omitted, as appropriate.

described in .

- \ No newline at end of file + diff --git a/P5/Source/Guidelines/en/HD-Header.xml b/P5/Source/Guidelines/en/HD-Header.xml index 2600ad7e26..953c82f07d 100644 --- a/P5/Source/Guidelines/en/HD-Header.xml +++ b/P5/Source/Guidelines/en/HD-Header.xml @@ -260,7 +260,6 @@ interchange.

-

@@ -2946,4 +2945,4 @@ for subject headings nor require the use of subject headings. 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/en/MS-ManuscriptDescription.xml b/P5/Source/Guidelines/en/MS-ManuscriptDescription.xml index f5d5015ba3..918b2b144d 100644 --- a/P5/Source/Guidelines/en/MS-ManuscriptDescription.xml +++ b/P5/Source/Guidelines/en/MS-ManuscriptDescription.xml @@ -1453,9 +1453,8 @@ with usage of the more specialized elements, as such an approach complicates processing, and may lead to inconsistency within a single manuscript description. A single physDesc element will normally contain either a series of model.pLike elements, or a sequence of -specialized elements from the model.physDescPart -class. There are however circumstances in which this is not feasible, for -example: +particular specialized elements. There are however circumstances in which +this is not feasible, for example: the description already exists in a prose form where some of the specialized topics are treated together in paragraphs of prose, but others are treated distinctly; @@ -2567,4 +2566,4 @@ description, and other related information: - \ No newline at end of file + diff --git a/P5/Source/Guidelines/en/ST-Infrastructure.xml b/P5/Source/Guidelines/en/ST-Infrastructure.xml index f745f121a9..f99795f5ba 100644 --- a/P5/Source/Guidelines/en/ST-Infrastructure.xml +++ b/P5/Source/Guidelines/en/ST-Infrastructure.xml @@ -886,7 +886,6 @@ one, or vice versa, should be done with care.

- @@ -912,6 +911,7 @@ one, or vice versa, should be done with care.

+ @@ -1149,9 +1149,7 @@ one, or vice versa, should be done with care.

- - diff --git a/P5/Source/Specs/accMat.xml b/P5/Source/Specs/accMat.xml index 2291828a71..06054a596c 100644 --- a/P5/Source/Specs/accMat.xml +++ b/P5/Source/Specs/accMat.xml @@ -10,22 +10,16 @@ materiale allegato 添付資料 Begleitmaterial - contains details of any significant additional -material which may be closely associated with the manuscript or object being -described, such as non-contemporaneous documents or fragments bound in -with it at some earlier historical period. + contains details of any significant additional material which may be closely associated with the manuscript or object being described, such as non-contemporaneous documents or fragments bound in with it at some earlier historical period. 기술하고 있는 원고와 밀접히 관련된 중요한 부가적 자료를 세밀하게 기술한다. 예를 들어, 어떤 이전 시기에 원고와 함께 제본된 비동시대의 문서 또는 문서 일부. 包含可能與該手稿關係密切的重要附加資料之細節，例如非同時期的文件或是在早期與手稿裝訂一起的片段。 当該手書き資料と密接に関連していると考えられる重要な追加資料、例えば、時代を異にする文書、歴史的に早い時期に手書き資料と合わされた断片などの詳細を示す。 - donne des détails sur tout matériel d'accompagnement - étroitement associé au manuscrit, tel que documents non contemporains ou fragments reliés avec - le manuscrit à une époque antérieure. + donne des détails sur tout matériel d'accompagnement étroitement associé au manuscrit, tel que documents non contemporains ou fragments reliés avec le manuscrit à une époque antérieure. contiene eventuales detalles que conciernen a materiales añadidos estrechamente relacionados con el manuscrito examinado, p.ej. documentos no actuales o fragmentos cosidos junto al manuscrito en un período histórico precedente al actual. contiene eventuali dettagli riguardanti maeriale aggiuntivo strettamente collegato al manoscritto in esame, per esempio documenti non attali o frammenti rilegati insieme al manoscritto in un periodo storico precedente a quello attuale - diff --git a/P5/Source/Specs/additions.xml b/P5/Source/Specs/additions.xml index 199241c9c1..0d34d70754 100644 --- a/P5/Source/Specs/additions.xml +++ b/P5/Source/Specs/additions.xml @@ -4,18 +4,15 @@ additions ajouts - contains a description of any significant additions found -within a manuscript or other object, such as marginalia or other annotations. + contains a description of any significant additions found within a manuscript or other object, such as marginalia or other annotations. 방주 또는 기타 주석과 같이 원고 내의 중요한 부가정보의 기술을 포함한다. 包含手稿中任何重要增添文字的描述，例如旁註或其他註釋。 当該手書き資料中にある、重要な付加物を示す。例えば、欄外の書き込みや注釈など。 - contient la description des ajouts significatifs - trouvés dans un manuscrit, tels que gloses marginales ou autres annotations. + contient la description des ajouts significatifs trouvés dans un manuscrit, tels que gloses marginales ou autres annotations. contiene una descripción de cualquier adición significativa encontrada al interno de un manuscrito como notas al márgen u otras anotaciones. contiene un descrizione di qualsiasi aggiunta significativa trovata all'interno di un manoscritto come note a margine o altre annotazioni - diff --git a/P5/Source/Specs/altIdentifier.xml b/P5/Source/Specs/altIdentifier.xml index 5b3c25714c..1a896e6d29 100644 --- a/P5/Source/Specs/altIdentifier.xml +++ b/P5/Source/Specs/altIdentifier.xml @@ -12,10 +12,8 @@ contains an alternative or former structured identifier used for a manuscript or other object, such as a former catalogue number. 이전의 카탈로그의 번호와 같이 원고에 사용된 대체 또는 이전에 구조화된 확인소를 포함한다. 包含手稿中的一個替換或先前使用的識別符碼，例如先前的分類碼。 - 当該手書き資料を示す、代わりとなるIDまたは昔のIDを示す。例えば、昔の - カタログ番号など。 - contient un autre ou un ancien identifiant pour un - manuscrit, par exemple un numéro anciennement utilisé dans un catalogue. + 当該手書き資料を示す、代わりとなるIDまたは昔のIDを示す。例えば、昔の カタログ番号など。 + contient un autre ou un ancien identifiant pour un manuscrit, par exemple un numéro anciennement utilisé dans un catalogue. contiene un identificador estructurado, alternativo o precedente, utilizado para un manuscrito, p.ej. un número antiguo de catalogación. contiene un identificatore strutturato alternativo o precedente utilizzato per un manoscritto, per esempio un precedente numero di catalogazione @@ -25,7 +23,15 @@ - + + + + + + + + + diff --git a/P5/Source/Specs/att.organizable.xml b/P5/Source/Specs/att.organizable.xml new file mode 100644 index 0000000000..89a5db9f0d --- /dev/null +++ b/P5/Source/Specs/att.organizable.xml @@ -0,0 +1,28 @@ + + + + + provides attributes for declaring the intended organization of the constructs being specified. + + + organization + 조직 + organización + conditions d'utilisation + organizzazione + indicates whether one or all of the constructs being specified or referenced are available + + group + + + grouped + any of the attributes defined in this list may be specified. + + + alternated + only one of the attributes defined in this list may be specified. + + + + + diff --git a/P5/Source/Specs/attList.xml b/P5/Source/Specs/attList.xml index e09d8d404b..f02013978b 100644 --- a/P5/Source/Specs/attList.xml +++ b/P5/Source/Specs/attList.xml @@ -13,7 +13,8 @@ contiene la documentazione relativa agli attributi associati all'elemento in questione sotto forma di una serie di elementi attDef - + + @@ -21,44 +22,6 @@ - - - organization - 조직 - organización - conditions d'utilisation - organizzazione - specifies whether only one (choice) or all (group) of the attributes in the list are available. - 목록의 모든 속성이 이용가능하거나(org="group") 그 중 하나만 이용가능한지를 명시한다. - 標明是否列表中的全部屬性皆可使用 (org="group") 、或是僅可使用其中一個 (org="choice")。 - リスト中の属性が全て使用できるか(org="group")、またはその1つだけ が使用できるか(org="choice")を示す。 - précise si les attributs dans la liste sont tous disponibles (org="group") ou seulement l'un d'entre eux (org="choice"). - indica si solo uno (choice) o todos (group) los atributos de la lista están disponibles. - indica se gli attributi contenuti nella lista sono tutti disponibili (group) o se ne è disponibile solo uno (choice) - - group - - - grouped - 그룹화된 - 集合使用 - agrupado - 全て。 - tous les attributs de la liste sont disponibles. - raggruppati - - - alternated - 교체가능한 - 擇一使用 - alternado - ひとつを選択。 - un seul des attributs de la liste est disponible. - alternati - - - - diff --git a/P5/Source/Specs/bindingDesc.xml b/P5/Source/Specs/bindingDesc.xml index c2357ae10e..a3c0cf87db 100644 --- a/P5/Source/Specs/bindingDesc.xml +++ b/P5/Source/Specs/bindingDesc.xml @@ -9,38 +9,24 @@ description de la reliure descrizione della rilegatura 装訂の記述 - describes the present and former bindings of a manuscript or other object, either -as a series of paragraphs or as a series of distinct binding elements, -one for each binding of the manuscript. + describes the present and former bindings of a manuscript or other object, either as a series of paragraphs or as a series of distinct binding elements, one for each binding of the manuscript. 원고의 각 제본에 대해 일련의 문단 또는 일련의 binding 요소로 원고의 현재 그리고 이전 제본 상태에 대해 기술한다. 描述手稿現在與之前的裝訂，可以是連續性的文字段落、或是一連串專用的binding元素，每個手稿裝訂使用一個元素。 - - 手書き資料の現行または以前の装訂に関する情報を示す。一連の段落または - 一連の要素bindingで示される。各単位が当該手書き資料の各装訂 - に対応する。 - - décrit les reliures actuelles et anciennes d'un - manuscrit, soit en une série de paragraphes p, soit sous la forme d'une série - d'éléments binding, un pour chaque reliure. + 手書き資料の現行または以前の装訂に関する情報を示す。一連の段落または 一連の要素bindingで示される。各単位が当該手書き資料の各装訂 に対応する。 + décrit les reliures actuelles et anciennes d'un manuscrit, soit en une série de paragraphes p, soit sous la forme d'une série d'éléments binding, un pour chaque reliure. describe la encuadernación actual y precedente de un manuscrito en forma de una serie de párrafos o de una serie de diversos elementos binding (encuadernación), uno para cada encuadernación del manuscrito. - descrive la legatura attuale e precedente di un manoscritto sotto forma di una serie di paragrafi o di una serie di diversi elementi binding, -uno per ogni legatura del manoscritto + descrive la legatura attuale e precedente di un manoscritto sotto forma di una serie di paragrafi o di una serie di diversi elementi binding, uno per ogni legatura del manoscritto - - - - - - - - - - - + + + + + + diff --git a/P5/Source/Specs/channel.xml b/P5/Source/Specs/channel.xml index 6022961d2e..55785e2fa2 100644 --- a/P5/Source/Specs/channel.xml +++ b/P5/Source/Specs/channel.xml @@ -9,22 +9,15 @@ canal principal canale primaio 元の媒体 - describes the medium or channel by which a text is delivered or -experienced. For a written text, this might be print, manuscript, email, etc.; -for a spoken one, radio, telephone, face-to-face, etc. + describes the medium or channel by which a text is delivered or experienced. For a written text, this might be print, manuscript, email, etc.; for a spoken one, radio, telephone, face-to-face, etc. 텍스트가 전달되거나 경험되어지는 매체나 경로를 기술한다. 문어 텍스트의 경우는 인쇄본, 원고, 전자메일 등일 수 있고, 구어 텍스트의 경우는 라디오, 전화, 대면 대화 등이 해당될 수 있다. 描述文本傳達的媒介或途徑。書面文本的途徑可能是印製、手稿、寫本、電子郵件等；口說文本則有廣播、電話、面對面交談等。 - テキストが収録・伝搬されている媒体を示す。例えば、書かれてあるテキス - トであれば、印刷本、原稿、eメールなどで、発話されたテキストであれば、 - ラジオ、電話、直接会話など。 - décrit le médium ou le canal par le biais duquel un - texte est délivré ou reçu. Pour un texte écrit, cela peut être un imprimé, un manuscrit, un - courriel, etc. ; pour un texte parlé, la radio, le téléphone, un face à face, etc. + テキストが収録・伝搬されている媒体を示す。例えば、書かれてあるテキス トであれば、印刷本、原稿、eメールなどで、発話されたテキストであれば、 ラジオ、電話、直接会話など。 + décrit le médium ou le canal par le biais duquel un texte est délivré ou reçu. Pour un texte écrit, cela peut être un imprimé, un manuscrit, un courriel, etc. ; pour un texte parlé, la radio, le téléphone, un face à face, etc. describe el medio o el canal en el que un texto se produce; en el caso de ser un texto escrito podría ser a través de un texto impreso, manuscrito, electrónico, etc.; en el caso de un texto hablado, podría ser a través de la radio, el teléfono, cara a cara, etc. descrive il mezzo o canale attraverso cui un testo è trasmesso o vissuto. Per un testo scritto potrebbe essere stampa, manoscritto, email, ecc.; per un testo parlato potrebbe essere radio, telefono, faccia a faccia, ecc. - diff --git a/P5/Source/Specs/classRef.xml b/P5/Source/Specs/classRef.xml index 796ea69ec1..ae775e9472 100644 --- a/P5/Source/Specs/classRef.xml +++ b/P5/Source/Specs/classRef.xml @@ -6,19 +6,193 @@ スキーマに含まれる属性クラスあるいはモデルクラスの仕様を指し示す。 + + + + + + A reference to a + model class can only specify details of the organization, + optionality, or repeatability of the class members when it is + part of a content model (i.e., is a descendant of + <content>, which this <classRef> is not. + + + - the identifier used for the required class within the - source indicated. + the identifier used for the required class within the source indicated. 指示されたソースの中の要求されたクラスに対して使用される識別子。 - + + + supplies a list of class members which are to be included in the schema being defined. + 定義されているスキーマに含まれるクラスメンバーのリスト。 + + + + supplies a list of class members which are to be excluded from the schema being defined. + 定義されているスキーマから除外するクラスメンバーのリスト。 + + + + + class members occur + indicates the optionality and repeatability of each member of the class at the point of reference + + + + one + + + one + each class member occurs without repetition or optionality + + + + one or more + each class member occurs as repeatable, but not optional + + + + zero or one + each class member occurs as optional, but not repeatable + + + + zero or more + each class member occurs as optional and repeatable + + + + + + + + + + + + + + + + + +

Given a class with members χ, + ψ, and ω, then a reference to + the class within a content model is understood as being a + reference to χ|ψ|ω (or + χ & ψ & ω, depending + on the value of org) when the value of + cardinality is one (the default); to + χ?|ψ?|ω? when its value is zeroOrOne; + to χ+|ψ+|ω+ when its value is + oneOrMore; and to χ*|ψ*|ω* when its + value is zeroOrMore.

+

For me information on the use and meaning of alternation + (|) and interleaving (&) see + .

+ +

Note that in the common case of classRef org="choice" + minOccurs="0" maxOccurs="unbounded" the value of + cardinality is essentially irrelevant. (It changes + the pattern that is used to validate elements, but not which + sets of elements would be considered valid vs. invalid.)

+ + + + indicates whether one or all of the members of the referenced class are available + choice + + + The members of + the referred class are available at this point in the content + model in alternation with one another. + + + The members of + the referred class are available at this point in the content + model interleaved with one another. + + + +

Given a class with members α, + β, and γ, then a reference to + the class within a content model is understood as being a + reference to α|β|γ when org is + choice (the default); and to + α & β & γ + when it has the value + group.

+

For more information on the use and meaning of alternation + (|) and interleaving (&) see + .

+ +

Note that the cardinality of each member of the class is + separately asserted by the cardinality attribute, + and the cardinality of the class reference as a whole is + separately asserted by the minOccur and + maxOccurs attributes.

+ + + + + Since classes are meant to be an unordered data structure, the + expand attribute will no longer be supported. The + org and cardinality attributes replace + the functionality of expand other than construction + of a sequence, and also permit class members to be + interleaved. + + indicates how references to this class within a content model should be interpreted. 内容モデル内でこのクラスへの参照がどのように解釈されるべきなのかを示す。 @@ -51,36 +225,24 @@ - -

If the members of the class are a, - b and c, then a reference to the - class within a content model is understood as being a - reference to a|b|c when expand is - omitted or has the value alternation; to - a,b,c when it has the value sequence; - to (a?,b?,c?) when it has the value - sequenceOptional; to (a*,b*,c*) when - it has the value sequenceOptionalRepeatable; or to - (a+,b+,c+) when it has the value - sequenceRepeatable.

+ +

If the members of the class are a, + b, and c, then a reference to the + class within a content model is understood as being a + reference to a|b|c when expand is + omitted or has the value alternation; to + a,b,c when it has the value sequence; + to (a?,b?,c?) when it has the value + sequenceOptional; to (a*,b*,c*) when + it has the value sequenceOptionalRepeatable; or to + (a+,b+,c+) when it has the value + sequenceRepeatable.

クラスのメンバーが a、bそしてcであるとして、 expandの値がalternationならば、内容モデル内の該当クラスへの参照は，a|b|cへの参照として理解される。 また、expandの値がsequenceならば、a,b,cへの，sequenceOptionalならば(a?,b?,c?)への、 sequenceOptionalRepeatableならば(a*,b*,c*)への、そしてsequenceRepeatableならば(a+,b+,c+)への参照としてそれぞれ理解される。

 - - - supplies a list of class members which are to be included in the schema being defined. - 定義されているスキーマに含まれるクラスメンバーのリスト。 - - - - supplies a list of class members which are to be excluded from the schema being defined. - 定義されているスキーマから除外するクラスメンバーのリスト。 - - - diff --git a/P5/Source/Specs/classSpec.xml b/P5/Source/Specs/classSpec.xml index 28b2299bd7..c40daf3575 100644 --- a/P5/Source/Specs/classSpec.xml +++ b/P5/Source/Specs/classSpec.xml @@ -87,7 +87,11 @@ that is a group of - + + + Since classes are meant to be an unordered data structure, the generate attribute will no longer be supported. + Some content model operations may be handled at instantiation with classRef, with the exclusion of imposing a sequence. + indicates which alternation and sequence instantiations of a model class may be referenced. By default, all variations are permitted. diff --git a/P5/Source/Specs/constitution.xml b/P5/Source/Specs/constitution.xml index 3a81df7a00..7db068e9b9 100644 --- a/P5/Source/Specs/constitution.xml +++ b/P5/Source/Specs/constitution.xml @@ -4,9 +4,7 @@ constitution composition - describes the internal composition of a text or text sample, -for example -as fragmentary, complete, etc. + describes the internal composition of a text or text sample, for example as fragmentary, complete, etc. 예를 들어 미완, 완성 등의 텍스트 또는 텍스트 샘플의 내부적 구성을 기술한다. 描述文本或文本樣本的內部結構，例如零碎的或完整的結構。 テキストの内部構造を示す。例えば、部分的、完全など。 @@ -16,7 +14,6 @@ as fragmentary, complete, etc. - diff --git a/P5/Source/Specs/decoDesc.xml b/P5/Source/Specs/decoDesc.xml index 15adfd37c4..a2cbf28983 100644 --- a/P5/Source/Specs/decoDesc.xml +++ b/P5/Source/Specs/decoDesc.xml @@ -13,27 +13,18 @@ 일련의 문단 또는 주제별로 조직된 일련의 decoNote 요소로 원고의 장식 기술을 포함한다. 包含手稿的裝飾描述，可以是連續性的文字段落、或是一連串依主題排列的裝飾附註元素。 当該手書き資料の装飾を、一連の散文段落、または、トピックごとにまとめた、一連のdecoNote要素で示す。 - contient la description de la décoration du - manuscrit, soit en une série de paragraphes p, soit sous la forme d'une série - d'éléments thématiques decoNote. + contient la description de la décoration du manuscrit, soit en une série de paragraphes p, soit sous la forme d'une série d'éléments thématiques decoNote. contiene una descripción de la decoración de un manuscrito en forma de secuencia de párrafos o de secuencia de elementos decoNote organizados por el argumento. contiene una descrizione della decorazione di un manoscritto in forma di sequenza di paragrafi oppure di sequenza di elementi decoNote organizzati per argomento - - - - - + + - - - - - - + + diff --git a/P5/Source/Specs/derivation.xml b/P5/Source/Specs/derivation.xml index e332d1c97b..ef49877cd5 100644 --- a/P5/Source/Specs/derivation.xml +++ b/P5/Source/Specs/derivation.xml @@ -8,14 +8,12 @@ 텍스트의 원본성에 대한 특성과 범위를 기술한다. 描述文本的特性與原創性的程度。 当該テキストの真性度を示す。 - décrit la nature et le degré d'originalité de ce - texte. + décrit la nature et le degré d'originalité de ce texte. describe la naturaleza y la originalidad de este texto. descrive la natura ed il grado di originalità del testo. - @@ -87,7 +85,7 @@ texte. 該文本無明確來源，但和其他文本有共同的衍生來歷 el texto no tiene ninguna fuente obvia, pero es uno de los derivados de algún antepasado común 当該テキストは、元資料が不明であるが、何かしらを元にたテキス - トである。 + トである。 le texte n'a pas de source évidente mais est l'un des nombreux textes dérivés d'un ancêtre commun. il testo è privo di una specifica fonte, ma è uno dei testi derivati da una fonte comune diff --git a/P5/Source/Specs/domain.xml b/P5/Source/Specs/domain.xml index 31c90592af..dd347cc3a9 100644 --- a/P5/Source/Specs/domain.xml +++ b/P5/Source/Specs/domain.xml @@ -8,22 +8,16 @@ domaine d'usage campo de uso ambito di uso - describes the most important social context in which the text was -realized or for which it is intended, for example private vs. public, -education, religion, etc. + describes the most important social context in which the text was realized or for which it is intended, for example private vs. public, education, religion, etc. 텍스트가 실현되거나 사용되는 가장 중요한 사회적 맥락을 기술한다. 예를 들어 공적 대 사적, 교육, 종교 등. 描述該文本最重要的應用領域或是社會用途所在，例如私人與公共、教育、宗教等。 - 当該テキストの出現に関する最も重要な社会的状況を示す。例えば、私的、 - 公的、教育上、宗教上など。 - décrit le contexte social principal dans lequel le - texte a été réalisé ou pour lequel il est conçu, par exemple : sphère privée ou publique, - contexte éducatif, religieux, etc. + 当該テキストの出現に関する最も重要な社会的状況を示す。例えば、私的、 公的、教育上、宗教上など。 + décrit le contexte social principal dans lequel le texte a été réalisé ou pour lequel il est conçu, par exemple : sphère privée ou publique, contexte éducatif, religieux, etc. describle el contexto social más importante en el que el texto fue realizado o para el que se destina, p.ej. privado o público, educacional, religioso, etc. descrive il più importantecontesto sociale nel quale il testo è stato realizzato, ad esempio privato o pubblico, scolastico, religioso, ecc. - diff --git a/P5/Source/Specs/elementRef.xml b/P5/Source/Specs/elementRef.xml index 4aeca817a0..c6033bd3f4 100644 --- a/P5/Source/Specs/elementRef.xml +++ b/P5/Source/Specs/elementRef.xml @@ -5,6 +5,7 @@ points to the specification for some element which is to be included in a schema. + diff --git a/P5/Source/Specs/factuality.xml b/P5/Source/Specs/factuality.xml index 18904f8f87..1ef84220bc 100644 --- a/P5/Source/Specs/factuality.xml +++ b/P5/Source/Specs/factuality.xml @@ -4,20 +4,16 @@ factuality degré de réalité - describes the extent to which the text may be regarded as -imaginative or non-imaginative, that is, as describing a fictional -or a non-fictional world. + describes the extent to which the text may be regarded as imaginative or non-imaginative, that is, as describing a fictional or a non-fictional world. 텍스트가 상상적 또는 비상상적, 즉, 허구적 또는 사실적 세계를 기술하는 것으로 간주될 수 있는 범위를 기술한다. 描述該文本內容可能被認定為想像的程度、所描繪的為虛構或真實的世界。 当該テキストの現実度を示す。例えば、フィクション、ノンフィクションなど。 - décrit le degré de fiction ou de réalité caractérisant un texte, - c'est-à-dire s'il décrit un monde imaginaire ou réel. + décrit le degré de fiction ou de réalité caractérisant un texte, c'est-à-dire s'il décrit un monde imaginaire ou réel. indica la posibilidad de ver un texto como ficcional o no, es decir atendiendo a si describle un mundo ficticio o no. quantifica quanto il testo possa essere considerato di invenzione o meno, in quanto descrive un mondo immaginato o meno. - diff --git a/P5/Source/Specs/handDesc.xml b/P5/Source/Specs/handDesc.xml index e1ced01ecb..195fd05284 100644 --- a/P5/Source/Specs/handDesc.xml +++ b/P5/Source/Specs/handDesc.xml @@ -12,26 +12,18 @@ 원고에 사용된 모든 종류의 기법 기술을 포함한다. 手稿中使用的所有不同書寫種類的描述。 手書き資料にある異なる書記全てについての解説を示す。 - contient la description des différents types - d'écriture utilisés dans un manuscrit. + contient la description des différents types d'écriture utilisés dans un manuscrit. contiene una descripción de todos los diferentes tipos de escritura usados en un manuscrito. contiene una descrizione dei diversi tipi di scrittura usati in un manoscritto - - - - + - - - - - - + + diff --git a/P5/Source/Specs/interaction.xml b/P5/Source/Specs/interaction.xml index af5851b003..5ba321dff7 100644 --- a/P5/Source/Specs/interaction.xml +++ b/P5/Source/Specs/interaction.xml @@ -4,22 +4,16 @@ interaction interaction - describes the extent, cardinality and nature of any interaction -among those producing and experiencing the text, for example in the -form of response or interjection, commentary, etc. + describes the extent, cardinality and nature of any interaction among those producing and experiencing the text, for example in the form of response or interjection, commentary, etc. 예를 들어 대답 또는 감탄, 논평 등의 형식으로 텍스트를 생산하고 경험하는 대상들 사이의 상호작용의 범위, 기준, 그리고 특성을 기술한다. 描述文本創作者與體驗者之間互動關係的規範、基數和特性，例如回應或感嘆、評論等。 - 当該テキストの生成に関わった人たちによる相互作用の程度、濃度、性質を - 示す。例えば、応答、合いの手、コメントなど。 - décrit l'étendue, la cardinalité et la nature de - toute interaction entre ceux qui produisent et ceux qui reçoivent le texte, par exemple sous - forme d'une réponse ou d'une interjection, d'un commentaire, etc. + 当該テキストの生成に関わった人たちによる相互作用の程度、濃度、性質を 示す。例えば、応答、合いの手、コメントなど。 + décrit l'étendue, la cardinalité et la nature de toute interaction entre ceux qui produisent et ceux qui reçoivent le texte, par exemple sous forme d'une réponse ou d'une interjection, d'un commentaire, etc. describe la existencia, localización y naturaleza de cualquier interacción entre los participantes de un texto, por ejemplo en forma de respuesta o interjección, comentario, etc. descrive la natura, la centralità e il grado di ogni interazione fra coloro che producono e coloro che sperimentano il testo, ad esempio sotto forma di risposta intromissione, commento, ecc. - @@ -27,13 +21,11 @@ form of response or interjection, commentary, etc. - specifies the degree of interaction between - active and passive participants in the text. + specifies the degree of interaction between active and passive participants in the text. 텍스트의 능동적 그리고 수동적 참여자들 사이의 상호작용 정도를 명시한다. 說明文本中主動與被動參與者之間的互動程度。 当該テキストにおける参加者間の相互作用の程度を示す。 - précise le degré d'interaction entre les - participants actifs et passifs au sein du texte. + précise le degré d'interaction entre les participants actifs et passifs au sein du texte. describe el grado de interacción entre los participantes activos y pasivos en un texto. specifica il grado di interazione tra partecipanti attivi e passivi all'interno del testo. @@ -44,8 +36,7 @@ form of response or interjection, commentary, etc. 無任何互動，例如獨白 no hay ninguna interacción de ningún tipo, p.ej. un monólogo 相互作用ではない。例えば、独白など。 - pas la moindre interaction, un -monologue par exemple. + pas la moindre interaction, un monologue par exemple. mancanza di qualsiasi interazione, ad esempio un monologo @@ -54,8 +45,7 @@ monologue par exemple. 某種程度上的互動，例如具有背景回應的獨白 cierto grado de interacción, p.ej. un monólogo con las respuestas de grupo ある程度の相互作用。例えば、反応する人がいる状況での独白など。 - un certain degré d'interaction, par -exemple un monologue avec une série de réponses. + un certain degré d'interaction, par exemple un monologue avec une série de réponses. qualche grado di interazione, ad esempio un monologo con risposte stabilite @@ -64,8 +54,7 @@ exemple un monologue avec une série de réponses. 完全性的互動，例如面對面交談 interacción completa, p.ej. una conversación cara a cara 完全なる相互作用。例えば、直接対話など。 - une interaction complète, par exemple -une conversation en tête-à-tête. + une interaction complète, par exemple une conversation en tête-à-tête. interazione completa. ad esempio conversazione faccia a faccia @@ -74,20 +63,17 @@ une conversation en tête-à-tête. 這項特性在此不適當或不適用 este parámetro es inadecuado o inaplicable en este caso 当該パラメータは、不適切、または使用が相応しくない。 - ce paramètre est inapproprié ou -inapplicable dans ce cas. + ce paramètre est inapproprié ou inapplicable dans ce cas. il parametro è inappropriato o inapplicabile in questo caso - specifies the number of active participants - (or addressors) producing parts of the text. + specifies the number of active participants (or addressors) producing parts of the text. 텍스트의 일부를 생산하는 능동적 참여자(또는 addressors)의 수를 명시한다. 說明創作文本部份內容的主動參與者 (或傳達者) 的人數。 当該テキストの生成に関わる能動的参加者の人数を示す。 - précise le nombre de participants actifs (ou - émetteurs) qui produisent des parties du texte + précise le nombre de participants actifs (ou émetteurs) qui produisent des parties du texte especifica el número de participantes activos (o emisores) que producen partes del texto. specifica il numero di partecipanti attivi (o addressor) che producono parti del testo. @@ -125,22 +111,17 @@ inapplicable dans ce cas. 傳達人數未知或未指明 número de interlocutores desconocidos o inespecificables 参加者は不明または特定不可能。 - un nombre d'émetteurs inconnu ou -impossible à spécifier. + un nombre d'émetteurs inconnu ou impossible à spécifier. un numero di partecipanti attivi sconosciuto o non specificabile - specifies the number of passive participants - (or addressees) to whom a text is directed - or in whose presence it is created or performed. + specifies the number of passive participants (or addressees) to whom a text is directed or in whose presence it is created or performed. 텍스트가 전달되는 또는 면전에서 생산 또는 수행되는 수동적 참여자(또는 addressees)의 수를 명시한다. 說明文本內容的被動參與者 (或接收者) 的人數，被動參與者即為文本產生或呈現的對象。 当該テキストの生成に関わる受動的参加者の人数を示す。 - précise le nombre de participants passifs (ou - récepteurs) à qui un texte est destiné ou en la présence de qui il est créé - ou représenté + précise le nombre de participants passifs (ou récepteurs) à qui un texte est destiné ou en la présence de qui il est créé ou représenté specifica il numero dei partecipanti o destinatari passivi ai quali il testo è diretto o alla presenza dei quali viene prodotto o recitato especifica el nombre de participantes pasivos (o receptores) a quienes se dirige el texto, o en cuya presencia se creó o representó el texto. @@ -151,8 +132,7 @@ impossible à spécifier. 文本內容傳遞給原創作者，例如日記 el texto se dirige a su creador, p.ej. un diario テキストは作成者に向けられたもの。例えば、日記など。 - le texte est adressé à soi-même, comme -un journal intime par exemple. + le texte est adressé à soi-même, comme un journal intime par exemple. il testo è indirizzato a colui chè l'ha prodotto, ad esempio un diario @@ -161,45 +141,34 @@ un journal intime par exemple. 文本內容傳遞給另一個人，例如私人信件 el texto se dirige a cualquier otra persona, p.ej. una carta personal テキストは他の人物に向けられたもの。例えば、個人書簡など。 - le texte est adressé à une seule autre -personne, comme une lettre personnelle par exemple. + le texte est adressé à une seule autre personne, comme une lettre personnelle par exemple. il testo è indirizzato ad una sola altra persona, ad esempio una lettera privata - text is addressed to a countable number of others - e.g. a conversation in which all participants are identified + text is addressed to a countable number of others e.g. a conversation in which all participants are identified 텍스트가 셀 수 있을 만큼의 수의 다른 사람들에게 전달된다. 예, 모든 참여자를 일일이 식별할 수 있는 대화 文本內容傳遞給一群人數可計的對象，例如參與者身分皆明確的一場對話 el texto se dirige a un número contable de receptores, p.ej. una conversación en la cual se identifiquen todos los participantes - テキストは可算のその他のもの。例えば、全参加者が特定できる会 - 話など。 - le texte est adressé à un ensemble -défini de personnes, comme une conversation où tous les participants -sont identifiés. + テキストは可算のその他のもの。例えば、全参加者が特定できる会 話など。 + le texte est adressé à un ensemble défini de personnes, comme une conversation où tous les participants sont identifiés. il testo è indirizzato ad uno specifico numero di persone, ad esempio una conversazione in cui tutti i partecipanti sono identificati - text is addressed to an undefined but fixed - number of participants e.g. a lecture + text is addressed to an undefined but fixed number of participants e.g. a lecture 텍스트가 규정할 수 없지만 고정된 수의 참여자들에게 전달된다. 예, 강의 文本內容傳遞給一群身分不明確但人數固定的參與者，例如授課 el texto se dirige a un número indefinido pero concreto de participantes, p.ej. una conferencia - テキストは人数が特定数である参加者に向けられたもの。例えば、 - 講義など。 - le texte est adressé à un ensemble -indéfini mais limité de personnes, comme une conférence par exemple. + テキストは人数が特定数である参加者に向けられたもの。例えば、 講義など。 + le texte est adressé à un ensemble indéfini mais limité de personnes, comme une conférence par exemple. il testo è indirizzato ad un numero indefinito, ma limitato di partecipanti, ad esempio una lezione - text is addressed to an undefined and indeterminately - large number e.g. a published book + text is addressed to an undefined and indeterminately large number e.g. a published book 텍스트가 규정할 수 없고 무한한 수의 사람들에게 전달된다. 예, 출판된 책 文本內容傳遞給眾多身分不明確、數量亦不固定的參與者，例如出版的書籍 el texto se dirige a un número indefinido e indeterminado de receptores, p.ej. un libro publicado - テキストは、その規模が判らない程の多数に向けられたもの。例え - ば、出版書籍など。 - le texte est adressé à un ensemble -indéfini et illimité de personnes, comme un livre publié par exemple. + テキストは、その規模が判らない程の多数に向けられたもの。例え ば、出版書籍など。 + le texte est adressé à un ensemble indéfini et illimité de personnes, comme un livre publié par exemple. il testo è indirizzato ad un numero indefinito e indeterminato di destinatari, ad esempio un libro pubblicato. diff --git a/P5/Source/Specs/memberOf.xml b/P5/Source/Specs/memberOf.xml index 4789e12524..8b2e533117 100644 --- a/P5/Source/Specs/memberOf.xml +++ b/P5/Source/Specs/memberOf.xml @@ -6,76 +6,84 @@ 부모 요소 또는 부류의 부류 원소 자격을 명시한다. 標明父元素或元素集所屬的元素集。 親要素や親クラスを示す。 - précise à quelle classe appartiennent la classe ou - l'élément parent. - especifica la pertenencia a una clase del elemento o - clase padre. - specifica l'appartenenza a una classe dell'elemento o - classe genitori + précise à quelle classe appartiennent la classe ou l'élément parent. + especifica la pertenencia a una clase del elemento o clase padre. + specifica l'appartenenza a una classe dell'elemento o classe genitori - + - specifies the identifier for a class of which the documented element or class is a - member or subclass. + specifies the identifier for a class of which the documented element or class is a member or subclass. 기록된 요소 또는 부류가 원소 또는 하위부류인 부류의 확인소를 명시한다. 標明一元素集的識別名稱，該元素集為所紀錄元素或元素集之所屬或附屬元素集 当該要素またはクラスが下位要素・下位クラスとなっているクラスの識 別子を示す。 - précise l’identifiant pour une classe pour laquelle - l'élément documenté ou classe est un membre ou sous-classe. - especifica el identificador de una clase de la cual - el elemento o clase indicados son un miembro o una subclase. - indica l'identificatore di una classe di cui - l'elemento o classe indicati sono un membro o una sottoclasse + précise l’identifiant pour une classe pour laquelle l'élément documenté ou classe est un membre ou sous-classe. + especifica el identificador de una clase de la cual el elemento o clase indicados son un miembro o una subclase. + indica l'identificatore di una classe di cui l'elemento o classe indicati sono un membro o una sottoclasse specifies the effect of this declaration on its parent module. 부모 모듈에 이 선언의 효과를 명시한다. - especifica el efecto de esta declaración en su módulo - padre. + especifica el efecto de esta declaración en su módulo padre. 当該宣言が親モジュールに与える影響を示す。 - indique l'effet de cette déclaration sur son module - parent. - specifica l'effetto della dichiarazione sul modulo - genitore + indique l'effet de cette déclaration sur son module parent. + specifica l'effetto della dichiarazione sul modulo genitore add this declaration is added to the current definitions 이 선언은 현 정의에 추가된다. - esta declaración se agrega a las definiciones - actuales + esta declaración se agrega a las definiciones actuales 当該宣言は、現行定義に追加される。 - cette déclaration s'ajoute aux définitions - courantes. - la dichiarazione è aggiunta alle definizioni - correnti + cette déclaration s'ajoute aux définitions courantes. + la dichiarazione è aggiunta alle definizioni correnti this declaration and all of its children are removed from the current setup 이 선언과 이 선언의 모든 자식은 현 구성에서 제거된다. - esta declaración y todos sus hijos se suprimen de - la disposición actual + esta declaración y todos sus hijos se suprimen de la disposición actual 当該宣言と全子要素は、現行定義から外される。 - cette déclaration et tous ses enfants sont - retirés du système courant. - la dichiarazione e i suoi discendenti sono - esclusi dall'impostazione corrente + cette déclaration et tous ses enfants sont retirés du système courant. + la dichiarazione e i suoi discendenti sono esclusi dall'impostazione corrente - - supplies the maximum number of times the element can occur in elements which use this model class in their content model + + Specifying any number of times greater than 1 that + an element may occur in a class reference only makes sense if + the class is being referenced as a sequence. (It has no effect + if the class is referenced as an alternation, and causes an + error if the class is referneced as an interleave.) However, the + capability to refer to a class as a sequence is being deprecated + (because there is no good way to define the order of that + sequence). Thus this attribute and min are also being + deprecated. + supplies the + maximum number of times the element can occur in elements which + use this model class in their content model - - supplies the minumum number of times the element must occur in elements which use this model class in their content model + + Specifying any number of times greater than 1 that + an element may occur in a class reference only makes sense if + the class is being referenced as a sequence. (It has no effect + if the class is referenced as an alternation, and causes an + error if the class is referneced as an interleave.) However, the + capability to refer to a class as a sequence is being deprecated + (because there is no good way to define the order of that + sequence). Thus this attribute and max are also being + deprecated. + supplies + the minumum number of times the element must occur in elements + which use this model class in their content model diff --git a/P5/Source/Specs/model.placeNamePart.xml b/P5/Source/Specs/model.placeNamePart.xml index cdf1d653ea..763c6951cc 100644 --- a/P5/Source/Specs/model.placeNamePart.xml +++ b/P5/Source/Specs/model.placeNamePart.xml @@ -7,13 +7,14 @@ 匯集構成地點名稱部分的元素。 場所名の部分となる要素をまとめる。 regroupe des éléments qui font partie d'un nom de lieu. - agrupa los elementos que forman parte del nombre de un - lugar - raggruppa gli elementi che fanno parte del nome di un - luogo + agrupa los elementos que forman parte del nombre de un lugar + raggruppa gli elementi che fanno parte del nome di un luogo + diff --git a/P5/Source/Specs/msIdentifier.xml b/P5/Source/Specs/msIdentifier.xml index e2b6899421..b2d8086f30 100644 --- a/P5/Source/Specs/msIdentifier.xml +++ b/P5/Source/Specs/msIdentifier.xml @@ -22,7 +22,15 @@ - + + + + + + + + + diff --git a/P5/Source/Specs/musicNotation.xml b/P5/Source/Specs/musicNotation.xml index e8380bb8f3..0aad00fa30 100644 --- a/P5/Source/Specs/musicNotation.xml +++ b/P5/Source/Specs/musicNotation.xml @@ -8,13 +8,11 @@ 악보 표기 유형 기술을 포함한다. 包含樂譜種類的描述。 記譜法の種類を示す。 - contient la description d'un type de notation - musicale. + contient la description d'un type de musicale notation. contiene la descripción de un tipo de anotación musical. contiene una descrizione del tipo di annotazione musicale - diff --git a/P5/Source/Specs/objectDesc.xml b/P5/Source/Specs/objectDesc.xml index 1123845ff9..e4d5662c7a 100644 --- a/P5/Source/Specs/objectDesc.xml +++ b/P5/Source/Specs/objectDesc.xml @@ -8,26 +8,18 @@ 기술되고 있는 대상을 구성하는 물리적 성분에 대한 기술을 포함한다. 包含討論中物件的材質組成成分描述。 当該対象の物理的構成要素の解説を示す。 - contient la description des composants matériels de - l'objet en cours de traitement. + contient la description des composants matériels de l'objet en cours de traitement. contiene una descripción de los componentes físicos que constituyen el objeto descrito. contiene una descrizione delle componenti fisiche che costituiscono l'oggetto descritto - - - - + - - - - - - + + @@ -35,23 +27,19 @@ form forme - a short project-specific name identifying the physical form of - the carrier, for example as a codex, roll, fragment, partial leaf, - cutting etc. + a short project-specific name identifying the physical form of the carrier, for example as a codex, roll, fragment, partial leaf, cutting etc. 미제본 원고, 명부, 부분, 부분적 장, 잘라낸 것 등과 같이 물리적 형태를 식별하는, 프로젝트에서 사용하는 간단한 이름 一個簡短的用途專用名稱，表示該媒介的物質外形，例如手抄本、名冊、斷片、部分頁面、剪報等。 - 当該キャリアの物理的な形を示す、プロジェクト固有の短い名前。例え - ば、冊子、巻子、断片、切れ端など。 - contient un nom abrégé spécifique au projet, - désignant la forme physique du support, par exemple : codex, rouleau, fragment, fragment - de feuillet, découpe, etc. + 当該キャリアの物理的な形を示す、プロジェクト固有の短い名前。例え ば、冊子、巻子、断片、切れ端など。 + contient un nom abrégé spécifique au projet, désignant la forme physique du support, par exemple : codex, rouleau, fragment, fragment de feuillet, découpe, etc. un nombre breve específico de un proyecto que identifica la forma física del documento, por ejemplo códex, rollo, fragmento, folio parcial, recorte, etc. un nome breve specifico di un progetto che identifica la forma fisica del documento, per esempio codice, rotolo, frammento, foglio parziale, ritaglio, ecc. -

Definitions for the -terms used may typically be provided by a - valList element in the project schema -specification.

 + +

Definitions for the terms used may typically be provided by + a valList element in the project schema + specification.

+ @@ -59,8 +47,8 @@ specification.

Early modern -parchment and -paper.

+ parchment and + paper.

 diff --git a/P5/Source/Specs/physDesc.xml b/P5/Source/Specs/physDesc.xml index 7a5ecdc023..7a63ef8981 100644 --- a/P5/Source/Specs/physDesc.xml +++ b/P5/Source/Specs/physDesc.xml @@ -8,30 +8,29 @@ descripción física description physique descrizione fisica - contains a full physical description of a -manuscript, manuscript part, or other object optionally subdivided using more -specialized elements from the model.physDescPart class. + contains a full physical description of a manuscript, manuscript part, or other object optionally subdivided using more specialized elements. model.physDescPart 클래스에서 더 특별화된 요소로 사용하기 위해 수의적으로 더 세분화한 원고 또는 원고 일부에 대한 완전한 물리적 기술을 포함한다. 包含一個手稿或手稿部分的完整材質描述，可以利用model.physDescPart class中的專門元素選擇性地再分類。 - 手書き資料の物理的な解説を示す。選択的に、クラスmodel.physDescPartに - ある要素に下位分解される。 - contient la description physique complète d'un - manuscrit ou d'une partie d'un manuscrit, éventuellement structurée en utilisant les éléments - plus spécialisés appartenant à la classe model.physDescPart. - contiene una descripción física completa de un manuscrito o de una de sus partes que puede ser ulteriormente subdividida utilizando elementos específicos de la clase model.physDescPart. + 手書き資料の物理的な解説を示す。選択的に、クラスmodel.physDescPartに ある要素に下位分解される。 + contient la description physique complète d'un manuscrit ou d'une partie d'un manuscrit, éventuellement structurée en utilisant les éléments plus spécialisés appartenant à la classe model.physDescPart. + contiene una descripción física completa de un manuscrito o de una de sus partes que puede ser ulteriormente subdividida utilizando elementos específicos de la clase model.physDescPart. contiene una descrizione fisica completa di un manoscritto o di una sua parte che può essere ulteriormente suddivisa utilizzando elementi specifici della classe .physDescPart. - - - - - - - + + + + + + + + + + + diff --git a/P5/Source/Specs/preparedness.xml b/P5/Source/Specs/preparedness.xml index 1f65c6356b..4aa8f529ff 100644 --- a/P5/Source/Specs/preparedness.xml +++ b/P5/Source/Specs/preparedness.xml @@ -4,8 +4,7 @@ preparedness degré de préparation - describes the extent to which a text may be regarded as -prepared or spontaneous. + describes the extent to which a text may be regarded as prepared or spontaneous. 텍스트가 준비된 것 또는 자발적인 것으로 간주될 수 있는지의 범위를 기술한다. 描述文本可能被視為經過準備或自然呈現的程度。 テキストが準備されたものか、即興的なものかの程度を示す。 @@ -15,7 +14,6 @@ prepared or spontaneous. - @@ -55,8 +53,7 @@ prepared or spontaneous. 依照一套事先定義的常規 sigue un conjunto predefinido de convenciones 事前の打ち合わせに従う。 - suit un ensemble de conventions -prédéfini. + suit un ensemble de conventions prédéfini. segue una serie di convenzioni predefinite @@ -65,8 +62,7 @@ prédéfini. 文本呈現前事先經過潤飾或修訂 revisado antes de la presentación 事前の準備が練り直しまたは修正されている。 - affiné ou révisé avant la -présentation. + affiné ou révisé avant la présentation. materiale pulito o revisionato prima della presentazione diff --git a/P5/Source/Specs/scriptDesc.xml b/P5/Source/Specs/scriptDesc.xml index ac47f46586..bdc688aeca 100644 --- a/P5/Source/Specs/scriptDesc.xml +++ b/P5/Source/Specs/scriptDesc.xml @@ -6,20 +6,13 @@ contains a description of the scripts used in a manuscript or other object. - - - - + - - - - - - + + diff --git a/P5/Source/Specs/sealDesc.xml b/P5/Source/Specs/sealDesc.xml index 5ebfc08749..19e2dd1dcd 100644 --- a/P5/Source/Specs/sealDesc.xml +++ b/P5/Source/Specs/sealDesc.xml @@ -11,34 +11,23 @@ describes the seals or similar items related to the object described, either as a series of paragraphs or as a series of seal elements. 일련의 문단 혹은 또는 일련의 seal 요소(부가적인 decoNote 요소와 함께)로 원고에 부착된 봉인 또는 기타 외부 항목을 기술한다. 描述章印或其他附於手稿的外部項目，可以是連續性的文字段落、或是一連串專用的印章元素，也許附上一些裝飾附註元素。 - 手書き資料に付属するシールや他の付着物について、一連の段落や、一連の - 要素sealにより、可能であれば要素decoNoteと共に示す。 - décrit les sceaux ou autres objets attachés au - manuscrit, soit en une série de paragraphes p, soit sous la forme d'une série - d'éléments seal, complétés éventuellement par des éléments decoNote. + 手書き資料に付属するシールや他の付着物について、一連の段落や、一連の 要素sealにより、可能であれば要素decoNoteと共に示す。 + décrit les sceaux ou autres objets attachés au manuscrit, soit en une série de paragraphes p, soit sous la forme d'une série d'éléments seal, complétés éventuellement par des éléments decoNote. describe los sellos u otros objetos externos aplicados a un manuscrito mediante una serie de párrafos o una serie de diversos elementos seal (sellos), eventualmente con ulteriores elementos decoNote. - descrive i sigilli o altri oggetti esterni applicati a un manoscritto sotto forma di una sequenza di paragrafi o una serie di diversi elementi seal, -eventualmente con ulteriori elementi decoNote + descrive i sigilli o altri oggetti esterni applicati a un manoscritto sotto forma di una sequenza di paragrafi o una serie di diversi elementi seal, eventualmente con ulteriori elementi decoNote - - - - + - - - - - - - - - - + + + + + + diff --git a/P5/Source/Specs/textDesc.xml b/P5/Source/Specs/textDesc.xml index 1a405db9af..07549a5925 100644 --- a/P5/Source/Specs/textDesc.xml +++ b/P5/Source/Specs/textDesc.xml @@ -8,13 +8,11 @@ description de texte descripción del texto descrizione del testo - provides a description of a text in terms of its -situational parameters. + provides a description of a text in terms of its situational parameters. 장면적 매개변수를 통해 텍스트에 대해 기술한다. 提供文本在情境特徵方面的相關描述。 状況パラメータにより、テキストの情報を示す。 - fournit la description d'un texte sous l'angle du - contexte situationnel. + fournit la description d'un texte sous l'angle du contexte situationnel. proporciona una descripción de un texto en términos de sus parámetros situacionales fornisce la descrizione di un testo in termini di paramentri situazionali @@ -25,7 +23,13 @@ situational parameters. - + + + + + + + diff --git a/P5/Source/Specs/typeDesc.xml b/P5/Source/Specs/typeDesc.xml index 67e476d856..f4025a098e 100644 --- a/P5/Source/Specs/typeDesc.xml +++ b/P5/Source/Specs/typeDesc.xml @@ -4,25 +4,17 @@ typeface description description des styles de caractère - contains a description of the typefaces or other aspects of - the printing of an incunable or other printed source. + contains a description of the typefaces or other aspects of the printing of an incunable or other printed source. contient la description des styles de caractères ou d'autres aspects de l'impression d'un incunable ou d'une autre source imprimée. - - - - + - - - - - - + + @@ -30,7 +22,7 @@

Uses an unidentified black letter font, probably from the - 15th century

+ 15th century

 @@ -39,7 +31,7 @@ Contains a mixture of blackletter and Roman (antiqua) typefaces Blackletter face, showing - similarities to those produced in Wuerzburg after 1470. + similarities to those produced in Wuerzburg after 1470. Roman face of Venetian origins. diff --git a/P5/Test/detest.odd b/P5/Test/detest.odd index 72effe8d3a..4928e7e0b8 100644 --- a/P5/Test/detest.odd +++ b/P5/Test/detest.odd @@ -234,7 +234,7 @@ - + diff --git a/P5/Test/detest.xml b/P5/Test/detest.xml index ae0d710202..9d799ca226 100644 --- a/P5/Test/detest.xml +++ b/P5/Test/detest.xml @@ -240,6 +240,8 @@
+ Bent double, like old beggars under sacks, @@ -464,6 +466,24 @@
+
+ + + + + + + + +

+ + + + +

+ +

+ diff --git a/P5/Test/expected-results/detest_xml_relaxng.log b/P5/Test/expected-results/detest_xml_relaxng.log index 7c91b71c43..e1b67d0e4c 100644 --- a/P5/Test/expected-results/detest_xml_relaxng.log +++ b/P5/Test/expected-results/detest_xml_relaxng.log @@ -22,10 +22,7 @@ required: detest.xml:235:10: error: attribute ^name with invalid value "123" required: data http://www.w3.org/2001/XMLSchema-datatypes^Name -detest.xml:244:10: error: unfinished content of element http://www.tei-c.org/ns/1.0^lg -required: - element http://www.tei-c.org/ns/1.0^l -detest.xml:271:37: error: invalid data or text not allowed +detest.xml:273:37: error: invalid data or text not allowed required: element http://www.tei-c.org/ns/1.0^add element http://www.tei-c.org/ns/1.0^surplus @@ -37,34 +34,34 @@ required: element http://www.tei-c.org/ns/1.0^cb element http://www.tei-c.org/ns/1.0^fw element http://www.tei-c.org/ns/1.0^anchor -detest.xml:291:11: error: attribute ^target with invalid value "#spanTest" +detest.xml:293:11: error: attribute ^target with invalid value "#spanTest" required: data http://www.w3.org/2001/XMLSchema-datatypes^anyURI -detest.xml:297:11: error: missing attributes of http://www.tei-c.org/ns/1.0^media +detest.xml:299:11: error: missing attributes of http://www.tei-c.org/ns/1.0^media required: attribute ^url -detest.xml:298:11: error: missing attributes of http://www.tei-c.org/ns/1.0^media +detest.xml:300:11: error: missing attributes of http://www.tei-c.org/ns/1.0^media required: attribute ^mimeType -detest.xml:304:51: error: invalid data or text not allowed +detest.xml:306:51: error: invalid data or text not allowed required: after -detest.xml:305:41: error: invalid data or text not allowed +detest.xml:307:41: error: invalid data or text not allowed required: after -detest.xml:306:61: error: invalid data or text not allowed +detest.xml:308:61: error: invalid data or text not allowed required: after -detest.xml:307:25: error: invalid data or text not allowed +detest.xml:309:25: error: invalid data or text not allowed required: after -detest.xml:371:12: error: element http://www.tei-c.org/ns/1.0^altIdentifier not allowed +detest.xml:373:12: error: element http://www.tei-c.org/ns/1.0^altIdentifier not allowed required: element http://www.tei-c.org/ns/1.0^msIdentifier -detest.xml:374:10: error: unfinished content of element http://www.tei-c.org/ns/1.0^msPart +detest.xml:376:10: error: unfinished content of element http://www.tei-c.org/ns/1.0^msPart required: element http://www.tei-c.org/ns/1.0^msIdentifier -detest.xml:403:10: error: element http://www.tei-c.org/ns/1.0^idno not allowed +detest.xml:405:10: error: element http://www.tei-c.org/ns/1.0^idno not allowed required: after allowed: @@ -77,7 +74,70 @@ allowed: element http://www.tei-c.org/ns/1.0^listRef element http://www.tei-c.org/ns/1.0^relatedItem element http://www.tei-c.org/ns/1.0^citedRange -detest.xml:481:12: error: attribute ^target with invalid value "" +detest.xml:471:20: error: element http://www.tei-c.org/ns/1.0^speaker not allowed +required: + element http://www.tei-c.org/ns/1.0^lg + element http://www.tei-c.org/ns/1.0^l + element http://www.tei-c.org/ns/1.0^ab + element http://www.tei-c.org/ns/1.0^p + element http://www.tei-c.org/ns/1.0^list + element http://www.tei-c.org/ns/1.0^listApp + element http://www.tei-c.org/ns/1.0^listWit + element http://www.tei-c.org/ns/1.0^table + element http://www.tei-c.org/ns/1.0^stage + element http://www.tei-c.org/ns/1.0^quote + element http://www.tei-c.org/ns/1.0^cit + element http://www.tei-c.org/ns/1.0^said + element http://www.tei-c.org/ns/1.0^floatingText +detest.xml:472:8: error: unfinished content of element http://www.tei-c.org/ns/1.0^sp +required: + element http://www.tei-c.org/ns/1.0^lg + element http://www.tei-c.org/ns/1.0^l + element http://www.tei-c.org/ns/1.0^ab + element http://www.tei-c.org/ns/1.0^p + element http://www.tei-c.org/ns/1.0^list + element http://www.tei-c.org/ns/1.0^listApp + element http://www.tei-c.org/ns/1.0^listWit + element http://www.tei-c.org/ns/1.0^table + element http://www.tei-c.org/ns/1.0^stage + element http://www.tei-c.org/ns/1.0^quote + element http://www.tei-c.org/ns/1.0^cit + element http://www.tei-c.org/ns/1.0^said + element http://www.tei-c.org/ns/1.0^floatingText +detest.xml:475:8: error: unfinished content of element http://www.tei-c.org/ns/1.0^sp +required: + element http://www.tei-c.org/ns/1.0^speaker +detest.xml:477:20: error: element http://www.tei-c.org/ns/1.0^speaker not allowed +required: + element http://www.tei-c.org/ns/1.0^lg + element http://www.tei-c.org/ns/1.0^l + element http://www.tei-c.org/ns/1.0^ab + element http://www.tei-c.org/ns/1.0^p + element http://www.tei-c.org/ns/1.0^list + element http://www.tei-c.org/ns/1.0^listApp + element http://www.tei-c.org/ns/1.0^listWit + element http://www.tei-c.org/ns/1.0^table + element http://www.tei-c.org/ns/1.0^stage + element http://www.tei-c.org/ns/1.0^quote + element http://www.tei-c.org/ns/1.0^cit + element http://www.tei-c.org/ns/1.0^said + element http://www.tei-c.org/ns/1.0^floatingText +detest.xml:482:20: error: element http://www.tei-c.org/ns/1.0^speaker not allowed +required: + element http://www.tei-c.org/ns/1.0^lg + element http://www.tei-c.org/ns/1.0^l + element http://www.tei-c.org/ns/1.0^ab + element http://www.tei-c.org/ns/1.0^p + element http://www.tei-c.org/ns/1.0^list + element http://www.tei-c.org/ns/1.0^listApp + element http://www.tei-c.org/ns/1.0^listWit + element http://www.tei-c.org/ns/1.0^table + element http://www.tei-c.org/ns/1.0^stage + element http://www.tei-c.org/ns/1.0^quote + element http://www.tei-c.org/ns/1.0^cit + element http://www.tei-c.org/ns/1.0^said + element http://www.tei-c.org/ns/1.0^floatingText +detest.xml:501:12: error: attribute ^target with invalid value "" required: data http://www.w3.org/2001/XMLSchema-datatypes^anyURI error: some documents are invalid