Skip to content

Commit

Permalink
Sundry changes and add org/@ROLE=federatedState (#670).
Browse files Browse the repository at this point in the history
  • Loading branch information
@TomazErjavec
TomazErjavec committed Jul 17, 2023
1 parent 6012d47 commit 5cfb2c7
Show file tree
Hide file tree
Showing 15 changed files with 728 additions and 583 deletions.
22 changes: 10 additions & 12 deletions Schema/ParlaMint-schemaSpecs.odd.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -899,9 +899,9 @@
</desc>
<category xml:id="reference">
<catDesc xml:lang="sl">
<term>Referenca</term>: referenčni podkorpus, do 2019-10-31</catDesc>
<term>Referenca</term>: referenčni podkorpus, do 2020-10-30</catDesc>
<catDesc xml:lang="en">
<term>Reference</term>: reference subcorpus, until 2019-10-31</catDesc>
<term>Reference</term>: reference subcorpus, until 2020-01-30</catDesc>
</category>
...
</taxonomy>
Expand Down Expand Up @@ -4436,8 +4436,7 @@
</exemplum>
</elementSpec>
<elementSpec ident="taxonomy" module="header" mode="change">
<desc versionDate="2022-11-10" xml:lang="en">defines a typology explicitly by a structured
taxonomy.</desc>
<desc versionDate="2022-11-10" xml:lang="en">defines a typology explicitly by a structured taxonomy.</desc>
<content>
<elementRef key="desc" minOccurs="1" maxOccurs="unbounded"/>
<elementRef key="category" minOccurs="1" maxOccurs="unbounded"/>
Expand Down Expand Up @@ -4477,15 +4476,15 @@
</desc>
<category xml:id="reference">
<catDesc xml:lang="sl">
<term>Referenca</term>: referenčni podkorpus, do 2019-10-31</catDesc>
<term>Referenca</term>: referenčni podkorpus, do 2020-01-30</catDesc>
<catDesc xml:lang="en">
<term>Reference</term>: reference subcorpus, until 2019-10-31</catDesc>
<term>Reference</term>: reference subcorpus, until 2020-01-30</catDesc>
</category>
<category xml:id="covid">
<catDesc xml:lang="sl">
<term>COVID</term>: COVID podkorpus, od 2019-11-01 dalje</catDesc>
<term>COVID</term>: COVID podkorpus, od 2020-01-31 dalje</catDesc>
<catDesc xml:lang="en">
<term>COVID</term>: COVID subcorpus, from 2019-11-01 onwards</catDesc>
<term>COVID</term>: COVID subcorpus, from 2020-01-31 onwards</catDesc>
</category>
</taxonomy>
</egXML>
Expand Down Expand Up @@ -5401,9 +5400,7 @@
</exemplum>
</elementSpec>
<elementSpec ident="org" module="namesdates" mode="change">
<desc versionDate="2007-06-14" xml:lang="en">provides information
about an identifiable organisation such as a business, a tribe, or
any other grouping of people.</desc>
<desc versionDate="2023-04-06" xml:lang="en">provides information about an identifiable organisation such as the government, political party, ministry etc.</desc>
<content>
<sequence>
<elementRef key="head" minOccurs="0" maxOccurs="unbounded"/>
Expand All @@ -5420,6 +5417,7 @@
<attDef ident="role" mode="replace" usage="req">
<valList type="closed">
<valItem ident="country"/>
<valItem ident="federatedState"/>
<valItem ident="republic"/>
<valItem ident="government"/>
<valItem ident="ministry"/>
Expand Down Expand Up @@ -5449,9 +5447,9 @@
<valItem ident="ethnicCommunity"/>
</valList>
</attDef>
<!--org/@xml:lang-->
<!--org/@ana-->
<attDef ident="n" mode="delete"/>
<attDef ident="xml:lang" mode="delete"/>
<attDef ident="xml:base" mode="delete"/>
<attDef ident="xml:space" mode="delete"/>
<attDef ident="rend" mode="delete"/>
Expand Down
28 changes: 18 additions & 10 deletions Schema/ParlaMint.odd.rnc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ namespace xi = "http://www.w3.org/2001/XInclude"
namespace xlink = "http://www.w3.org/1999/xlink"
namespace xsl = "http://www.w3.org/1999/XSL/Transform"

# Schema generated from ODD source 2023-04-06T16:06:34Z. 2023-04-06.
# TEI Edition: Version 4.6.0a. Last updated on
# 5th January 2023, revision 9074b9038
# TEI Edition Location: https://www.tei-c.org/Vault/P5/Version 4.6.0a./
# Schema generated from ODD source 2023-07-17T13:14:26Z. 2023-07-17.
# TEI Edition: Version 4.7.0a. Last updated on
# 11th April 2023, revision bec660a72
# TEI Edition Location: https://www.tei-c.org/Vault/P5/Version 4.7.0a./
#

# This file is freely available and you are hereby authorised to copy, modify, and redistribute it in any way without further reference or permissions.
Expand Down Expand Up @@ -1578,6 +1578,10 @@ tei_TEI =
>> sch:ns [
prefix = "rng"
uri = "http://relaxng.org/ns/structure/1.0"
]
>> sch:ns [
prefix = "rna"
uri = "http://relaxng.org/ns/compatibility/annotations/1.0"
],

##
Expand Down Expand Up @@ -2329,7 +2333,7 @@ tei_occupation =
}
tei_org =

## (organization) provides information about an identifiable organisation such as a business, a tribe, or any other grouping of people. [13.3.3. Organizational Data]
## (organization) provides information about an identifiable organisation such as the government, political party, ministry etc. [13.3.3. Organizational Data]
element org {
(tei_head*,
tei_orgName+,
Expand All @@ -2338,6 +2342,7 @@ tei_org =
tei_desc?,
tei_listEvent?,
tei_state*),
tei_att.global.attribute.xmllang,
tei_att.global.analytic.attribute.ana,

## (identifier) provides a unique identifier for the element bearing the attribute.
Expand All @@ -2348,6 +2353,9 @@ tei_org =

##
"country"
|
##
"federatedState"
|
##
"republic"
Expand Down Expand Up @@ -2980,19 +2988,19 @@ tei_att.linguistic.attribute.join =
## when present, provides information on whether the token in question is adjacent to another, and if so, on which side.
attribute join {

## (the token is not adjacent to another)
## the token is not adjacent to another
"no"
|
## (there is no whitespace on the left side of the token)
## there is no whitespace on the left side of the token
"left"
|
## (there is no whitespace on the right side of the token)
## there is no whitespace on the right side of the token
"right"
|
## (there is no whitespace on either side of the token)
## there is no whitespace on either side of the token
"both"
|
## (the token overlaps with another; other devices (specifying the extent and the area of overlap) are needed to more precisely locate this token in the character stream)
## the token overlaps with another; other devices (specifying the extent and the area of overlap) are needed to more precisely locate this token in the character stream
"overlap"
}?
sch:pattern [
Expand Down
32 changes: 22 additions & 10 deletions Schema/ParlaMint.odd.rng
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
xmlns:xlink="http://www.w3.org/1999/xlink"
datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
ns="http://www.tei-c.org/ns/1.0"><!--
Schema generated from ODD source 2023-04-06T16:06:30Z. 2023-04-06.
TEI Edition: Version 4.6.0a. Last updated on
5th January 2023, revision 9074b9038
TEI Edition Location: https://www.tei-c.org/Vault/P5/Version 4.6.0a./
Schema generated from ODD source 2023-07-17T13:14:19Z. 2023-07-17.
TEI Edition: Version 4.7.0a. Last updated on
11th April 2023, revision bec660a72
TEI Edition Location: https://www.tei-c.org/Vault/P5/Version 4.7.0a./
--><!--This file is freely available and you are hereby authorised to copy, modify, and redistribute it in any way without further reference or permissions.-->
<define name="tei_att.ascribed.attributes">
Expand Down Expand Up @@ -2694,6 +2694,15 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
prefix="rng"
uri="http://relaxng.org/ns/structure/1.0"/>
<sch:ns xmlns="http://www.tei-c.org/ns/1.0"
xmlns:eg="http://www.tei-c.org/ns/Examples"
xmlns:egXML="http://www.tei-c.org/ns/Examples"
xmlns:pm="ParlaMint"
xmlns:rng="http://relaxng.org/ns/structure/1.0"
xmlns:sch="http://purl.oclc.org/dsdl/schematron"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
prefix="rna"
uri="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<attribute name="xml:id">
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<data type="ID"/>
Expand Down Expand Up @@ -3689,7 +3698,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
</define>
<define name="tei_org">
<element name="org">
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(organization) provides information about an identifiable organisation such as a business, a tribe, or any other grouping of people. [13.3.3. Organizational Data]</a:documentation>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(organization) provides information about an identifiable organisation such as the government, political party, ministry etc. [13.3.3. Organizational Data]</a:documentation>
<group>
<zeroOrMore>
<ref name="tei_head"/>
Expand All @@ -3713,6 +3722,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
<ref name="tei_state"/>
</zeroOrMore>
</group>
<ref name="tei_att.global.attribute.xmllang"/>
<ref name="tei_att.global.analytic.attribute.ana"/>
<attribute name="xml:id">
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(identifier) provides a unique identifier for the element bearing the attribute.</a:documentation>
Expand All @@ -3723,6 +3733,8 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
<choice>
<value>country</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>federatedState</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>republic</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
<value>government</value>
Expand Down Expand Up @@ -4416,15 +4428,15 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">when present, provides information on whether the token in question is adjacent to another, and if so, on which side.</a:documentation>
<choice>
<value>no</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(the token is not adjacent to another) </a:documentation>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">the token is not adjacent to another</a:documentation>
<value>left</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(there is no whitespace on the left side of the token) </a:documentation>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">there is no whitespace on the left side of the token</a:documentation>
<value>right</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(there is no whitespace on the right side of the token) </a:documentation>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">there is no whitespace on the right side of the token</a:documentation>
<value>both</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(there is no whitespace on either side of the token) </a:documentation>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">there is no whitespace on either side of the token</a:documentation>
<value>overlap</value>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(the token overlaps with another; other devices (specifying the extent and the area of overlap) are needed to more precisely locate this token in the character stream) </a:documentation>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">the token overlaps with another; other devices (specifying the extent and the area of overlap) are needed to more precisely locate this token in the character stream</a:documentation>
</choice>
</attribute>
</optional>
Expand Down
4 changes: 2 additions & 2 deletions Schema/ParlaMint.odd.sch
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<schema xmlns="http://purl.oclc.org/dsdl/schematron" queryBinding="xslt2">
<title>ISO Schematron rules</title>
<!-- This file generated 2023-04-06T16:06:38Z by 'extract-isosch.xsl'. -->
<!-- This file generated 2023-07-17T13:14:30Z by 'extract-isosch.xsl'. -->
<!-- ********************* -->
<!-- namespaces, declared: -->
<!-- ********************* -->
<!-- ********************* -->
<!-- namespaces, implicit: -->
<!-- ********************* -->
<ns prefix="esp-d3e4667" uri="http://www.w3.org/2001/XInclude"/>
<ns prefix="esp-d3e4814" uri="http://www.w3.org/2001/XInclude"/>
<ns prefix="tei" uri="http://www.tei-c.org/ns/1.0"/>
</schema>
Loading

0 comments on commit 5cfb2c7

Please sign in to comment.