Skip to content

Commit

Permalink
Merge branch 'devel' of github.com:clarin-eric/ParlaMint into devel
Browse files Browse the repository at this point in the history
  • Loading branch information
matyaskopp committed May 14, 2024
2 parents ce7e03c + f4c05b0 commit eccd993
Show file tree
Hide file tree
Showing 11 changed files with 2,062 additions and 526 deletions.
2 changes: 1 addition & 1 deletion Schema/ParlaMint.rnc
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ person =
(element sex {
attribute value { "M" | "F" | "U" | "O" | "N" },
empty
}?
}
& element birth { life-event.content }?
& element death { life-event.content }?
& affiliation*
Expand Down
26 changes: 12 additions & 14 deletions Schema/ParlaMint.rng
Original file line number Diff line number Diff line change
Expand Up @@ -280,20 +280,18 @@
<ref name="persName"/>
</oneOrMore>
<interleave>
<optional>
<element name="sex">
<attribute name="value">
<choice>
<value>M</value>
<value>F</value>
<value>U</value>
<value>O</value>
<value>N</value>
</choice>
</attribute>
<empty/>
</element>
</optional>
<element name="sex">
<attribute name="value">
<choice>
<value>M</value>
<value>F</value>
<value>U</value>
<value>O</value>
<value>N</value>
</choice>
</attribute>
<empty/>
</element>
<optional>
<element name="birth">
<ref name="life-event.content"/>
Expand Down
1,550 changes: 1,548 additions & 2 deletions Schema/compile.log

Large diffs are not rendered by default.

13 changes: 5 additions & 8 deletions Scripts/parlamint2release.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -371,17 +371,14 @@
</xsl:choose>
</xsl:template>


<!-- Processing persons: fix missing sex and fix affiliations -->
<xsl:template match="tei:*[not(name()='affiliation')] | comment() | text()" mode="person">
<xsl:apply-templates select="." mode="root"/>
</xsl:template>

<xsl:template match="tei:persName" mode="person">
<xsl:apply-templates select="." mode="root"/>
<!-- Insert missing sex after last persName -->
<xsl:if test="not(following-sibling::tei:persName or following-sibling::tei:sex)">
<sex value="U"/>
<xsl:if test="self::tei:persName and not(following-sibling::tei:persName)">
<!-- Insert missing sex after last persName -->
<xsl:if test="not(following-sibling::tei:sex)">
<sex value="U"/>
</xsl:if>
</xsl:if>
</xsl:template>

Expand Down
11 changes: 4 additions & 7 deletions TEI/ParlaMint-schemaSpecs.editing.odd.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<schemaSpec xmlns="http://www.tei-c.org/ns/1.0"
xmlns:eg="http://www.tei-c.org/ns/Examples"
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"
Expand Down Expand Up @@ -3686,15 +3686,12 @@
</exemplum>
</elementSpec>
<elementSpec ident="person" module="namesdates" mode="change">
<desc
versionDate="2005-12-14"
xml:lang="en">provides information about an identifiable individual, for example a participant in a language interaction, or a person referred to in a
historical source.</desc>
<desc versionDate="2024-05-14" xml:lang="en">provides information about a speaker in the corpus, at the very least their name and sex.</desc>
<content>
<sequence>
<elementRef key="persName" minOccurs="1" maxOccurs="unbounded"/>
<alternate minOccurs="0" maxOccurs="unbounded">
<elementRef key="sex" minOccurs="0" maxOccurs="1"/>
<alternate minOccurs="1" maxOccurs="unbounded">
<elementRef key="sex" minOccurs="1" maxOccurs="1"/>
<elementRef key="birth" minOccurs="0" maxOccurs="1"/>
<elementRef key="death" minOccurs="0" maxOccurs="1"/>
<elementRef key="affiliation" minOccurs="0" maxOccurs="unbounded"/>
Expand Down
7 changes: 3 additions & 4 deletions TEI/ParlaMint-schemaSpecs.odd.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6116,13 +6116,12 @@
</exemplum>
</elementSpec>
<elementSpec ident="person" module="namesdates" mode="change">
<desc versionDate="2005-12-14" xml:lang="en">provides information about an identifiable individual, for example a participant in a language interaction, or a person referred to in a
historical source.</desc>
<desc versionDate="2024-05-14" xml:lang="en">provides information about a speaker in the corpus, at the very least their name and sex.</desc>
<content>
<sequence>
<elementRef key="persName" minOccurs="1" maxOccurs="unbounded"/>
<alternate minOccurs="0" maxOccurs="unbounded">
<elementRef key="sex" minOccurs="0" maxOccurs="1"/>
<alternate minOccurs="1" maxOccurs="unbounded">
<elementRef key="sex" minOccurs="1" maxOccurs="1"/>
<elementRef key="birth" minOccurs="0" maxOccurs="1"/>
<elementRef key="death" minOccurs="0" maxOccurs="1"/>
<elementRef key="affiliation" minOccurs="0" maxOccurs="unbounded"/>
Expand Down
8 changes: 4 additions & 4 deletions TEI/ParlaMint.odd.rnc
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ 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 2024-04-08T18:37:48Z. 2024-03-03.
# Schema generated from ODD source 2024-05-14T10:06:52Z. 2024-05-14.
# 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./
Expand Down Expand Up @@ -2479,17 +2479,17 @@ tei_org =
}
tei_person =

## (person) provides information about an identifiable individual, for example a participant in a language interaction, or a person referred to in a historical source. [13.3.2. The Person Element 15.2.2. The Participant Description]
## (person) provides information about a speaker in the corpus, at the very least their name and sex. [13.3.2. The Person Element 15.2.2. The Participant Description]
element person {
(tei_persName+,
(tei_sex?
(tei_sex
| tei_birth?
| tei_death?
| tei_affiliation*
| tei_occupation*
| tei_education*
| tei_idno*
| tei_figure*)*),
| tei_figure*)+),
tei_att.global.attribute.xmlid,
tei_att.global.attribute.n,
tei_att.global.attribute.xmllang,
Expand Down
12 changes: 5 additions & 7 deletions TEI/ParlaMint.odd.rng
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
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 2024-04-08T18:37:43Z. 2024-03-03.
Schema generated from ODD source 2024-05-14T10:06:48Z. 2024-05-14.
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./
Expand Down Expand Up @@ -3841,16 +3841,14 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
</define>
<define name="tei_person">
<element name="person">
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(person) provides information about an identifiable individual, for example a participant in a language interaction, or a person referred to in a historical source. [13.3.2. The Person Element 15.2.2. The Participant Description]</a:documentation>
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">(person) provides information about a speaker in the corpus, at the very least their name and sex. [13.3.2. The Person Element 15.2.2. The Participant Description]</a:documentation>
<group>
<oneOrMore>
<ref name="tei_persName"/>
</oneOrMore>
<zeroOrMore>
<oneOrMore>
<choice>
<optional>
<ref name="tei_sex"/>
</optional>
<ref name="tei_sex"/>
<optional>
<ref name="tei_birth"/>
</optional>
Expand All @@ -3873,7 +3871,7 @@ On <name/>, either the @marks attribute should be used, or a paragraph of descri
<ref name="tei_figure"/>
</zeroOrMore>
</choice>
</zeroOrMore>
</oneOrMore>
</group>
<ref name="tei_att.global.attribute.xmlid"/>
<ref name="tei_att.global.attribute.n"/>
Expand Down
4 changes: 2 additions & 2 deletions TEI/ParlaMint.odd.sch
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 2024-04-08T18:37:52Z by 'extract-isosch.xsl'. -->
<!-- This file generated 2024-05-14T10:06:56Z by 'extract-isosch.xsl'. -->
<!-- ********************* -->
<!-- namespaces, declared: -->
<!-- ********************* -->
<!-- ********************* -->
<!-- namespaces, implicit: -->
<!-- ********************* -->
<ns prefix="esp-d3e5059" uri="http://www.w3.org/2001/XInclude"/>
<ns prefix="esp-d3e5063" uri="http://www.w3.org/2001/XInclude"/>
<ns prefix="tei" uri="http://www.tei-c.org/ns/1.0"/>
</schema>
5 changes: 3 additions & 2 deletions TEI/ParlaMint.odd.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</titleStmt>
<publicationStmt>
<publisher>CLARIN</publisher>
<date>2024-03-03</date>
<date>2024-05-14</date>
<availability status="free">
<p>This file is freely available and you are hereby authorised to copy, modify, and
redistribute it in any way without further reference or permissions.</p>
Expand All @@ -48,6 +48,7 @@
</projectDesc>
</encodingDesc>
<revisionDesc>
<change when="2024-05-14">Tomaž Erjavec: Make person/sex obligatory.</change>
<change when="2024-03-03">Tomaž Erjavec: Slighlty edit the section of affiliations.</change>
<change when="2024-02-08">Tomaž Erjavec: Change encoding of name so it allows more .ana elements.</change>
<change when="2024-01-25">Tomaž Erjavec: Change encoding of org/state so it is TEI compliant.</change>
Expand Down Expand Up @@ -75,7 +76,7 @@
<ref target="https://github.com/clarin-eric/ParlaMint">ParlaMint corpora</ref></titlePart>
</docTitle>
<!--docEdition>v4.1</docEdition-->
<docDate>2024-03-03</docDate>
<docDate>2024-05-14</docDate>
<!--byline>Tomaž Erjavec, Matyáš Kopp, Katja Meden</byline-->
</titlePage>
<p></p>
Expand Down
950 changes: 475 additions & 475 deletions docs/index.html

Large diffs are not rendered by default.

0 comments on commit eccd993

Please sign in to comment.