Skip to content

Commit

Permalink
Merge branch 'dev' into sydb_TD_fixup
Browse files Browse the repository at this point in the history
  • Loading branch information
@ebeshero
ebeshero committed Sep 19, 2024
2 parents 9b9bbb4 + 2f3b08b commit f14ded3
Show file tree
Hide file tree
Showing 65 changed files with 512 additions and 2,933 deletions.
35 changes: 1 addition & 34 deletions P5/Source/Specs/acquisition.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,39 +23,6 @@ institution.</desc>
<content>
<macroRef key="macro.specialPara"/>
</content>
<attList>
<attDef ident="calendar" usage="opt" validUntil="2024-11-11">
<desc type="deprecationInfo" versionDate="2023-05-11" xml:lang="en">The <att>calendar</att> attribute will be removed from this element
as it will only be allowed on elements that represent dates with their content. This is because the <att>calendar</att> attribute
(unlike <att>datingMethod</att> defined in
<ident type="class">att.datable.custom</ident>) defines the calendar system of the date
in the original material defined by the parent element, <emph>not</emph> the calendar to
which the date is normalized.</desc>
<desc versionDate="2021-04-26" xml:lang="en">indicates one or more systems or calendars to which the
date represented by the content of this element belongs.</desc>
<desc versionDate="2007-12-20" xml:lang="ko">날짜 표현 시스템 또는 달력 표시 형식을 표시한다.</desc>
<desc versionDate="2007-05-02" xml:lang="zh-TW">指明該日期表示所使用的曆法計算系統。</desc>
<desc versionDate="2019-02-03" xml:lang="ja">この要素を含むコンテントにおける日付の暦やシステムを示す。</desc>
<desc versionDate="2009-01-06" xml:lang="fr">indique le système ou le calendrier auquel
appartient la date exprimée dans le contenu de l'élément.</desc>
<desc versionDate="2007-05-04" xml:lang="es">indica el sistema o calendario en que se muestra
una fecha.</desc>
<desc versionDate="2007-01-21" xml:lang="it">indica il sistema o calendario al quale la data
appartiene.</desc>
<datatype minOccurs="1" maxOccurs="unbounded">
<dataRef key="teidata.pointer"/>
</datatype>
<constraintSpec scheme="schematron" ident="calendar-check-acquisition">
<constraint>
<sch:rule context="tei:*[@calendar]">
<sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
systems or calendars to which the date represented by the content of this element belongs,
but this <sch:name/> element has no textual content.</sch:assert>
</sch:rule>
</constraint>
</constraintSpec>
</attDef>
</attList>
<exemplum xml:lang="en">
<egXML xmlns="http://www.tei-c.org/ns/Examples" source="#UND">
<acquisition>Left to the <name type="place">Bodleian</name> by
Expand All @@ -77,4 +44,4 @@ institution.</desc>
<listRef>
<ptr target="#mshy"/>
</listRef>
</elementSpec>
</elementSpec>
65 changes: 12 additions & 53 deletions P5/Source/Specs/affiliation.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,14 @@
<gloss versionDate="2008-12-09" xml:lang="en">affiliation</gloss>
<gloss versionDate="2008-12-09" xml:lang="fr">affiliation</gloss>
<gloss versionDate="2024-04-11" xml:lang="de">Affiliation</gloss>
<desc versionDate="2005-01-14" xml:lang="en">contains an informal description of a person's present or past affiliation with some
organization, for example an employer or sponsor.</desc>
<desc versionDate="2005-01-14" xml:lang="en">contains an informal description of a person's present or past affiliation with some organization, for example an employer or sponsor.</desc>
<desc versionDate="2007-12-20" xml:lang="ko">고용주 또는 후원자와 같이 개인의 현재 또는 과거 소속 조직에 대한 비공식적 기술을 포함한다.</desc>
<desc versionDate="2007-05-02" xml:lang="zh-TW">包含非正式性的描述，關於個人現在或過去隸屬的團體，例如雇主或贊助者。</desc>
<desc versionDate="2022-06-07" xml:lang="ja">人物が所属している、またはしていた団体に関する情報を示す。例えば、雇い主や出資者など。</desc>
<desc versionDate="2008-12-09" xml:lang="fr">contient une description non formalisée portant sur
l'affiliation présente ou passée d'une personne à une organisation, par exemple un employeur
ou un sponsor.</desc>
<desc versionDate="2007-05-04" xml:lang="es">contiene una descripción informal de la afiliación
presente o pasada de una persona a una determinada organización, p.ej. un empleado o un
patrocinador.</desc>
<desc versionDate="2007-01-21" xml:lang="it">contiene una descrizione informale dell'appartenenza
presente o passata di una persona a una determinata organizzazione, per esempio un'azienda o
un ente finanziatore</desc>
<desc versionDate="2024-04-11" xml:lang="de">enthält eine informelle Beschreibung der gegenwärtigen
oder früheren Zugehörigkeit einer Person zu einer Organisation, z. B. eines Arbeitgebers oder Sponsors.</desc>
<desc versionDate="2008-12-09" xml:lang="fr">contient une description non formalisée portant sur l'affiliation présente ou passée d'une personne à une organisation, par exemple un employeur ou un sponsor.</desc>
<desc versionDate="2007-05-04" xml:lang="es">contiene una descripción informal de la afiliación presente o pasada de una persona a una determinada organización, p.ej. un empleado o un patrocinador.</desc>
<desc versionDate="2007-01-21" xml:lang="it">contiene una descrizione informale dell'appartenenza presente o passata di una persona a una determinata organizzazione, per esempio un'azienda o un ente finanziatore</desc>
<desc versionDate="2024-04-11" xml:lang="de">enthält eine informelle Beschreibung der gegenwärtigen oder früheren Zugehörigkeit einer Person zu einer Organisation, z. B. eines Arbeitgebers oder Sponsors.</desc>
<classes>
<memberOf key="att.global"/>
<memberOf key="model.addressLike"/>
Expand All @@ -34,48 +26,15 @@
<macroRef key="macro.phraseSeq"/>
</content>
<attList>
<attDef ident="calendar" usage="opt" validUntil="2024-11-11">
<desc type="deprecationInfo" versionDate="2023-05-11" xml:lang="en">The <att>calendar</att> attribute will be removed from this element
as it will only be allowed on elements that represent dates with their content. This is because the <att>calendar</att> attribute
(unlike <att>datingMethod</att> defined in
<ident type="class">att.datable.custom</ident>) defines the calendar system of the date
in the original material defined by the parent element, <emph>not</emph> the calendar to
which the date is normalized.</desc>
<desc versionDate="2021-04-26" xml:lang="en">indicates one or more systems or calendars to which the
date represented by the content of this element belongs.</desc>
<desc versionDate="2007-12-20" xml:lang="ko">날짜 표현 시스템 또는 달력 표시 형식을 표시한다.</desc>
<desc versionDate="2007-05-02" xml:lang="zh-TW">指明該日期表示所使用的曆法計算系統。</desc>
<desc versionDate="2019-02-03" xml:lang="ja">この要素を含むコンテントにおける日付の暦やシステムを示す。</desc>
<desc versionDate="2009-01-06" xml:lang="fr">indique le système ou le calendrier auquel
appartient la date exprimée dans le contenu de l'élément.</desc>
<desc versionDate="2007-05-04" xml:lang="es">indica el sistema o calendario en que se muestra
una fecha.</desc>
<desc versionDate="2007-01-21" xml:lang="it">indica il sistema o calendario al quale la data
appartiene.</desc>
<datatype minOccurs="1" maxOccurs="unbounded">
<dataRef key="teidata.pointer"/>
</datatype>
<constraintSpec scheme="schematron" ident="calendar-check-affiliation">
<constraint>
<sch:rule context="tei:*[@calendar]">
<sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
systems or calendars to which the date represented by the content of this element belongs,
but this <sch:name/> element has no textual content.</sch:assert>
</sch:rule>
</constraint>
</constraintSpec>
</attDef>


<attDef ident="type" usage="opt" mode="change">
<attDef ident="type" usage="opt" mode="change">
<datatype>
<dataRef key="teidata.enumerated"/>
<dataRef key="teidata.enumerated"/>
</datatype>
<valList type="open">
<valItem ident="sponsor"/>
<valItem ident="recommend"/>
<valItem ident="discredit"/>
<valItem ident="pledged"/>
<valItem ident="sponsor"/>
<valItem ident="recommend"/>
<valItem ident="discredit"/>
<valItem ident="pledged"/>
</valList>
</attDef>
</attList>
Expand Down Expand Up @@ -134,4 +93,4 @@
<listRef>
<ptr target="#CCAHPA"/>
</listRef>
</elementSpec>
</elementSpec>
82 changes: 22 additions & 60 deletions P5/Source/Specs/age.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,75 +22,37 @@
<macroRef key="macro.phraseSeq.limited"/>
</content>
<attList>
<attDef ident="calendar" usage="opt" validUntil="2024-11-11">
<desc type="deprecationInfo" versionDate="2023-05-11" xml:lang="en">The <att>calendar</att> attribute will be removed from this element
as it will only be allowed on elements that represent dates with their content. This is because the <att>calendar</att> attribute
(unlike <att>datingMethod</att> defined in
<ident type="class">att.datable.custom</ident>) defines the calendar system of the date
in the original material defined by the parent element, <emph>not</emph> the calendar to
which the date is normalized.</desc>
<desc versionDate="2021-04-26" xml:lang="en">indicates one or more systems or calendars to which the
date represented by the content of this element belongs.</desc>
<desc versionDate="2007-12-20" xml:lang="ko">날짜 표현 시스템 또는 달력 표시 형식을 표시한다.</desc>
<desc versionDate="2007-05-02" xml:lang="zh-TW">指明該日期表示所使用的曆法計算系統。</desc>
<desc xml:lang="ja" versionDate="2019-02-03">この要素を含むコンテントにおける日付の暦やシステムを示す。</desc>
<desc versionDate="2009-01-06" xml:lang="fr">indique le système ou le calendrier auquel
appartient la date exprimée dans le contenu de l'élément.</desc>
<desc versionDate="2007-05-04" xml:lang="es">indica el sistema o calendario en que se muestra
una fecha.</desc>
<desc versionDate="2007-01-21" xml:lang="it">indica il sistema o calendario al quale la data
appartiene.</desc>
<datatype minOccurs="1" maxOccurs="unbounded">
<dataRef key="teidata.pointer"/>
</datatype>
<constraintSpec scheme="schematron" ident="calendar-check-age">
<constraint>
<sch:rule context="tei:*[@calendar]">
<sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
systems or calendars to which the date represented by the content of this element belongs,
but this <sch:name/> element has no textual content.</sch:assert>
</sch:rule>
</constraint>
</constraintSpec>
</attDef>


<attDef ident="type" usage="opt" mode="change">
<attDef ident="type" usage="opt" mode="change">
<datatype>
<dataRef key="teidata.enumerated"/>
<dataRef key="teidata.enumerated"/>
</datatype>
<valList type="open">
<valItem ident="western"/>
<valItem ident="sui"/>
<valItem ident="subjective"/>
<valItem ident="objective"/>
<valItem ident="inWorld">
<gloss versionDate="2017-06-08" xml:lang="en">in world</gloss>
<gloss versionDate="2018-09-08" xml:lang="es">en el mundo</gloss>
<gloss versionDate="2018-12-20" xml:lang="ja">物語世界</gloss>
<desc versionDate="2017-06-08" xml:lang="en">age of a fictional character at the time the story
takes place, rather than at the time the story is
told</desc>
<desc versionDate="2018-09-08" xml:lang="es">Edad de un personaje ficcional en el tiempo en el que la historia sucede (no en el tiempo en el cual es contada).</desc>
<desc versionDate="2018-12-20" xml:lang="ja">物語を語る時点ではなく、物語の中の時点における架空の人物の年齢。</desc>
</valItem>
<valItem ident="chronological"/>
<valItem ident="biological"/>
<valItem ident="psychological"/>
<valItem ident="functional"/>
<valItem ident="western"/>
<valItem ident="sui"/>
<valItem ident="subjective"/>
<valItem ident="objective"/>
<valItem ident="inWorld">
<gloss versionDate="2017-06-08" xml:lang="en">in world</gloss>
<gloss versionDate="2018-09-08" xml:lang="es">en el mundo</gloss>
<gloss versionDate="2018-12-20" xml:lang="ja">物語世界</gloss>
<desc versionDate="2017-06-08" xml:lang="en">age of a fictional character at the time the story takes place, rather than at the time the story is told</desc>
<desc versionDate="2018-09-08" xml:lang="es">Edad de un personaje ficcional en el tiempo en el que la historia sucede (no en el tiempo en el cual es contada).</desc>
<desc versionDate="2018-12-20" xml:lang="ja">物語を語る時点ではなく、物語の中の時点における架空の人物の年齢。</desc>
</valItem>
<valItem ident="chronological"/>
<valItem ident="biological"/>
<valItem ident="psychological"/>
<valItem ident="functional"/>
</valList>
</attDef>
<attDef ident="value" usage="opt">
<desc versionDate="2006-10-08" xml:lang="en">supplies a numeric code representing the age or age group</desc>
<desc versionDate="2007-12-20" xml:lang="ko">나이 또는 연령대를 표시하는 수치 부호를 제시한다.</desc>
<desc versionDate="2007-05-02" xml:lang="zh-TW">提供一個代表該年齡或年齡層的數字代碼</desc>
<desc versionDate="2008-04-05" xml:lang="ja">年齢または年齢層を数値で示す。</desc>
<desc versionDate="2008-12-09" xml:lang="fr">fournit un code numérique représentant l'âge ou la
tranche d'âge.</desc>
<desc versionDate="2007-05-04" xml:lang="es">proporciona un código numérico que representa la edad
o el intervalo de edad.</desc>
<desc versionDate="2007-01-21" xml:lang="it">assegna un codice numerico che rappresenta l'età o la
fascia di età</desc>
<desc versionDate="2008-12-09" xml:lang="fr">fournit un code numérique représentant l'âge ou la tranche d'âge.</desc>
<desc versionDate="2007-05-04" xml:lang="es">proporciona un código numérico que representa la edad o el intervalo de edad.</desc>
<desc versionDate="2007-01-21" xml:lang="it">assegna un codice numerico che rappresenta l'età o la fascia di età</desc>
<datatype><dataRef key="teidata.count"/></datatype>
<remarks versionDate="2006-10-08" xml:lang="en">
<p>This attribute may be used to complement a more detailed discussion of a person's age in
Expand Down Expand Up @@ -136,4 +98,4 @@
<listRef>
<ptr target="#NDPERSEpc"/>
</listRef>
</elementSpec>
</elementSpec>
36 changes: 1 addition & 35 deletions P5/Source/Specs/altIdentifier.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
<memberOf key="att.typed"/>
<memberOf key="att.datable"/>
</classes>

<content>
<sequence>
<classRef key="model.placeNamePart" expand="sequenceOptional"/>
Expand All @@ -33,39 +32,6 @@
<elementRef key="note" minOccurs="0"/>
</sequence>
</content>
<attList>
<attDef ident="calendar" usage="opt" validUntil="2024-11-11">
<desc type="deprecationInfo" versionDate="2023-05-11" xml:lang="en">The <att>calendar</att> attribute will be removed from this element
as it will only be allowed on elements that represent dates with their content. This is because the <att>calendar</att> attribute
(unlike <att>datingMethod</att> defined in
<ident type="class">att.datable.custom</ident>) defines the calendar system of the date
in the original material defined by the parent element, <emph>not</emph> the calendar to
which the date is normalized.</desc>
<desc versionDate="2021-04-26" xml:lang="en">indicates one or more systems or calendars to which the
date represented by the content of this element belongs.</desc>
<desc versionDate="2007-12-20" xml:lang="ko">날짜 표현 시스템 또는 달력 표시 형식을 표시한다.</desc>
<desc versionDate="2007-05-02" xml:lang="zh-TW">指明該日期表示所使用的曆法計算系統。</desc>
<desc xml:lang="ja" versionDate="2019-02-03">この要素を含むコンテントにおける日付の暦やシステムを示す。</desc>
<desc versionDate="2009-01-06" xml:lang="fr">indique le système ou le calendrier auquel
appartient la date exprimée dans le contenu de l'élément.</desc>
<desc versionDate="2007-05-04" xml:lang="es">indica el sistema o calendario en que se muestra
una fecha.</desc>
<desc versionDate="2007-01-21" xml:lang="it">indica il sistema o calendario al quale la data
appartiene.</desc>
<datatype minOccurs="1" maxOccurs="unbounded">
<dataRef key="teidata.pointer"/>
</datatype>
<constraintSpec scheme="schematron" ident="calendar-check-altIdentifier">
<constraint>
<sch:rule context="tei:*[@calendar]">
<sch:assert test="string-length( normalize-space(.) ) gt 0"> @calendar indicates one or more
systems or calendars to which the date represented by the content of this element belongs,
but this <sch:name/> element has no textual content.</sch:assert>
</sch:rule>
</constraint>
</constraintSpec>
</attDef>
</attList>
<exemplum xml:lang="en">
<egXML xmlns="http://www.tei-c.org/ns/Examples" source="#UND">
<altIdentifier>
Expand Down Expand Up @@ -109,4 +75,4 @@
<listRef>
<ptr target="#msid"/>
</listRef>
</elementSpec>
</elementSpec>
Loading

0 comments on commit f14ded3

Please sign in to comment.