Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adjustments for deprecation of @calendar #2473

Merged
merged 11 commits into from
Oct 21, 2023
Merged

Adjustments for deprecation of @calendar #2473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
53a49cb
Checking repeated @xml:langs based on value (or absence) of @type.
raffazizzi Sep 12, 2023
b5bb6ea
moved deprecations message to the right place
raffazizzi Sep 12, 2023
edffc98
Merge branch 'dev' into issues2045-2432_update
raffazizzi Oct 12, 2023
aa38f38
Removed @calendar from att.datable. Added date, docDate, origDate, an…
raffazizzi Oct 13, 2023
1830ab7
fixes to schematron idents and references to new class
raffazizzi Oct 13, 2023
5aab69c
Remove extraneous @calendar defs
sydb Oct 14, 2023
290f25e
redoing deletion of extraneous @calendar definition while also restor…
sydb Oct 14, 2023
4e4bac5
Stop deleting @calendar from TEI Lite and jTEI exemplars:
sydb Oct 15, 2023
00324f3
tweaks to new constraintSpecs:
sydb Oct 16, 2023
5bcc343
Removed @calendar from individual elements in tei_jtei and tei_lite e…
sydb Oct 16, 2023
7006f1d
removed att.calendarSystem
raffazizzi Oct 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 30 additions & 1 deletion P5/Exemplars/tei_jtei.odd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1948,12 +1948,14 @@
<attList>
<attDef ident="notAfter" mode="delete"/>
<attDef ident="role" mode="delete"/>
<attDef ident="calendar" mode="delete"/> <!-- remove 2024-11-11 when @calender removed from <affliation> -->
</attList>
</elementSpec>
<elementSpec ident="application" mode="change">
<attList>
<attDef ident="type" mode="delete"/>
<attDef ident="notAfter" mode="delete"/>
<attDef ident="calendar" mode="delete"/> <!-- remove 2024-11-11 when @calender removed from <application> -->
</attList>
</elementSpec>
<elementSpec ident="att" module="tagdocs" mode="change">
Expand All @@ -1971,6 +1973,7 @@
</attList>
</elementSpec>
<classSpec ident="att.breaking" module="tei" type="atts" mode="delete"/>
<classSpec ident="att.calendarSystem" module="tei" type="atts" mode="delete"/>
<classSpec ident="att.cReferencing" module="tei" type="atts" mode="delete"/>
<classSpec ident="att.canonical" module="tei" type="atts" mode="delete"/>
<classSpec ident="att.citing" module="tei" type="atts" mode="change">
Expand All @@ -1993,9 +1996,28 @@
<attDef ident="group" mode="delete"/>
</attList>
</classSpec>
<!--
start @calendar removal section
This whole block should be removed along with the
2024-11-11 removal of @calendar from individual TEI
elements. Note that elements that have @calendar deleted
elsewhere in this ODD have been commented out here, and
those @calendars need to be removed wherever they are
declared in this ODD, too. —Syd, 2023-10-16
-->
<!-- elementSpec ident="affiliation" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec -->
<!-- elementSpec ident="application" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec -->
<!-- elementSpec ident="author" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec -->
<elementSpec ident="change" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
<!-- elementSpec ident="editor" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec -->
<!-- elementSpec ident="idno" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec -->
<elementSpec ident="licence" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
<!-- elementSpec ident="name" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec -->
<!-- elementSpec ident="orgName" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec -->
<elementSpec ident="resp" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
<!-- end @calendar removal block -->
<classSpec ident="att.datable" module="tei" type="atts" mode="change">
<attList>
<attDef ident="calendar" mode="delete"/>
<attDef ident="period" mode="delete"/>
</attList>
</classSpec>
Expand Down Expand Up @@ -2143,6 +2165,7 @@
</constraintSpec>
<attList>
<attDef ident="role" mode="delete"/>
<attDef ident="calendar" mode="delete"/> <!-- remove 2024-11-11 when @calender removed from <author> -->
</attList>
</elementSpec>
<elementSpec ident="availability" mode="change">
Expand Down Expand Up @@ -2374,6 +2397,7 @@
<valItem ident="technical"/>
</valList>
</attDef>
<attDef ident="calendar" mode="delete"/> <!-- remove 2024-11-11 when @calender removed from <editor> -->
</attList>
</elementSpec>
<elementSpec ident="emph" module="core" mode="change">
Expand Down Expand Up @@ -2550,6 +2574,7 @@
<attDef ident="role" mode="delete"/>
<attDef ident="notAfter" mode="delete"/>
<attDef ident="type" mode="delete"/>
<attDef ident="calendar" mode="delete"/> <!-- remove 2024-11-11 when @calender removed from <name> -->
</attList>
</elementSpec>
<elementSpec ident="note" mode="change">
Expand Down Expand Up @@ -2697,6 +2722,7 @@
<attDef ident="notAfter" mode="delete"/>
<attDef ident="role" mode="delete"/>
<attDef ident="type" mode="delete"/>
<attDef ident="calendar" mode="delete"/> <!-- remove 2024-11-11 when @calender removed from <orgName> -->
</attList>
</elementSpec>
<elementSpec ident="pubPlace" mode="change">
Expand Down Expand Up @@ -3098,6 +3124,9 @@
</sch:rule>
</constraint>
</constraintSpec>
<attList> <!-- remove 2024-11-11 when @calender removed from <idno> -->
<attDef ident="calendar" mode="delete"/> <!-- remove 2024-11-11 when @calender removed from <idno> -->
</attList> <!-- remove 2024-11-11 when @calender removed from <idno> -->
</elementSpec>
<elementSpec ident="graphic" module="core" mode="change">
<constraintSpec ident="jtei.sch-graphic-dimensions" scheme="schematron">
Expand Down
26 changes: 21 additions & 5 deletions P5/Exemplars/tei_lite.odd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2929,6 +2929,8 @@ $Id$
<attDef ident="rendition" mode="delete"/>
</attList>
</classSpec>

<classSpec ident="att.calendarSystem" module="tei" type="atts" mode="delete"/>

<classSpec type="atts"
ident="att.global.linking"
Expand All @@ -2950,11 +2952,25 @@ $Id$
<attDef ident="to" mode="delete"/>
</attList>
</classSpec>
<classSpec type="atts" ident="att.datable" module="tei" mode="change">
<attList>
<attDef ident="calendar" mode="delete"/>
</attList>
</classSpec>
<!--
start @calendar removal section
This whole block should be removed along with the
2024-11-11 removal of @calendar from individual TEI
elements. —Syd, 2023-10-16
-->
<elementSpec ident="author" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
<elementSpec ident="change" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
<elementSpec ident="creation" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
<elementSpec ident="editor" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
<elementSpec ident="funder" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
<elementSpec ident="idno" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
<elementSpec ident="licence" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
<elementSpec ident="name" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
<elementSpec ident="principal" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
<elementSpec ident="resp" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
<elementSpec ident="sponsor" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
<elementSpec ident="title" mode="change"><attList><attDef ident="calendar" mode="delete"/></attList></elementSpec>
<!-- end @calendar removal block -->
<classSpec type="atts"
ident="att.internetMedia"
module="tei"
Expand Down
2 changes: 1 addition & 1 deletion P5/Source/Guidelines/en/CO-CoreElements.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2381,7 +2381,7 @@ of the <ident type="class">att.datable.w3c</ident> and <ident type="class">att.d
<att>when</att> and <att>calendar</att> attributes will be discussed here:
<specList>
<specDesc key="att.datable.w3c" atts="when"/>
<specDesc key="att.datable" atts="calendar"/>
<specDesc key="att.calendarSystem" atts="calendar"/>
</specList>
</p>
<p>Dates can occur virtually anywhere in a text, but in some contexts
Expand Down
4 changes: 2 additions & 2 deletions P5/Source/Guidelines/en/ND-NamesDates.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2907,7 +2907,7 @@ Journal r&#xE9;dig&#xE9; par Camille Desmoulins</title>,
<xi:include href="../../Specs/att.personal.xml"/>
<xi:include href="../../Specs/model.placeLike.xml"/>
<xi:include href="../../Specs/att.datable.iso.xml"/>
<!--<xi:include href="../../Specs/att.calendarSystem.xml"/>--><!-- Uncomment this after @calendar is deprecated on att.datable -->
<xi:include href="../../Specs/att.calendarSystem.xml"/>
<xi:include href="../../Specs/att.duration.iso.xml"/>
<xi:include href="../../Specs/teidata.temporal.iso.xml"/>
<xi:include href="../../Specs/teidata.duration.iso.xml"/>
Expand Down Expand Up @@ -2936,7 +2936,7 @@ Journal r&#xE9;dig&#xE9; par Camille Desmoulins</title>,
</egXML>

<p>The following attributes can now be used to encode dates using this calendar: <specList>
<specDesc key="att.datable" atts="calendar"/>
<specDesc key="att.calendarSystem" atts="calendar"/>
<specDesc key="att.datable.custom"
atts="when-custom notBefore-custom notAfter-custom from-custom to-custom datingMethod"/>
</specList>
Expand Down
35 changes: 34 additions & 1 deletion P5/Source/Specs/acquisition.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Dual-licensed under CC-by and BSD2 licences
See the file COPYING.txt for details
$Date$
$Id$
--><?xml-model href="https://jenkins.tei-c.org/job/TEIP5-dev/lastSuccessfulBuild/artifact/P5/release/xml/tei/odd/p5.nvdl" type="application/xml" schematypens="http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0"?><elementSpec xmlns="http://www.tei-c.org/ns/1.0" module="msdescription" xml:id="ACQUISITION" ident="acquisition">
--><?xml-model href="https://jenkins.tei-c.org/job/TEIP5-dev/lastSuccessfulBuild/artifact/P5/release/xml/tei/odd/p5.nvdl" type="application/xml" schematypens="http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0"?><elementSpec xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="msdescription" xml:id="ACQUISITION" ident="acquisition">
<gloss xml:lang="en" versionDate="2007-06-12">acquisition</gloss>
<gloss xml:lang="es" versionDate="2022-06-16">adquisición</gloss>
<gloss versionDate="2007-06-12" xml:lang="fr">acquisition</gloss>
Expand All @@ -26,6 +26,39 @@ 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 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-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 Down
44 changes: 37 additions & 7 deletions P5/Source/Specs/affiliation.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
<?xml version="1.0" encoding="UTF-8"?><!--
Copyright TEI Consortium.
Dual-licensed under CC-by and BSD2 licences
See the file COPYING.txt for details
$Date$
$Id$
-->
<?xml-model href="https://jenkins.tei-c.org/job/TEIP5-dev/lastSuccessfulBuild/artifact/P5/release/xml/tei/odd/p5.nvdl" type="application/xml" schematypens="http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0"?>
<elementSpec xmlns="http://www.tei-c.org/ns/1.0" module="namesdates" ident="affiliation">
--><?xml-model href="https://jenkins.tei-c.org/job/TEIP5-dev/lastSuccessfulBuild/artifact/P5/release/xml/tei/odd/p5.nvdl" type="application/xml" schematypens="http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0"?><elementSpec xmlns="http://www.tei-c.org/ns/1.0" xmlns:sch="http://purl.oclc.org/dsdl/schematron" module="namesdates" ident="affiliation">
<gloss xml:lang="en" versionDate="2008-12-09">affiliation</gloss>
<gloss versionDate="2008-12-09" xml:lang="fr">affiliation</gloss>
<desc versionDate="2005-01-14" xml:lang="en">contains an informal description of a person's present or past affiliation with some
Expand Down Expand Up @@ -37,7 +34,40 @@
<macroRef key="macro.phraseSeq"/>
</content>
<attList>
<attDef ident="type" usage="opt" mode="change">
<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-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">
<datatype>
<dataRef key="teidata.enumerated"/>
</datatype>
Expand Down Expand Up @@ -104,4 +134,4 @@
<listRef>
<ptr target="#CCAHPA"/>
</listRef>
</elementSpec>
</elementSpec>
Loading