Skip to content

Commit

Permalink
Add optional org/desc (for BE).
Browse files Browse the repository at this point in the history
  • Loading branch information
@TomazErjavec
TomazErjavec committed Jan 30, 2021
1 parent c666fab commit 9869e60
Show file tree
Hide file tree
Showing 5 changed files with 73 additions and 77 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ vra = $j Schema/ParlaMint-teiCorpus.ana.rng # Corpus root / analysed
vca = $j Schema/ParlaMint-TEI.ana.rng # Corpus component / analysed

# Check links
LANG = SI
LANG = CZ
PREF = /project/corpora/Parla/ParlaMint/ParlaMint
val-links:
ls ParlaMint-${LANG}/ParlaMint-*.xml | grep '_' | grep -v '.ana' | xargs -I % \
Expand Down
143 changes: 67 additions & 76 deletions Schema/ParlaMint-TEI.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -426,96 +426,87 @@
<xs:element name="comment" abstract="true"/>
<xs:element name="gap" substitutionGroup="ns1:comment">
<xs:complexType>
<xs:complexContent>
<xs:extension base="ns1:desc">
<xs:attribute name="reason" use="required">
<xs:simpleType>
<xs:restriction base="xs:token">
<xs:enumeration value="editorial"/>
<xs:enumeration value="inaudible"/>
</xs:restriction>
</xs:simpleType>
</xs:attribute>
</xs:extension>
</xs:complexContent>
<xs:sequence>
<xs:element ref="ns1:desc"/>
</xs:sequence>
<xs:attribute name="reason" use="required">
<xs:simpleType>
<xs:restriction base="xs:token">
<xs:enumeration value="editorial"/>
<xs:enumeration value="inaudible"/>
</xs:restriction>
</xs:simpleType>
</xs:attribute>
</xs:complexType>
</xs:element>
<xs:element name="kinesic" substitutionGroup="ns1:comment">
<xs:complexType>
<xs:complexContent>
<xs:extension base="ns1:desc">
<xs:attribute name="type">
<xs:simpleType>
<xs:restriction base="xs:token">
<xs:enumeration value="applause"/>
<xs:enumeration value="ringing"/>
<xs:enumeration value="signal"/>
<xs:enumeration value="kinesic"/>
<xs:enumeration value="playback"/>
<xs:enumeration value="gesture"/>
<xs:enumeration value="laughter"/>
<xs:enumeration value="snapping"/>
<xs:enumeration value="noise"/>
</xs:restriction>
</xs:simpleType>
</xs:attribute>
<xs:attribute name="who" type="xs:anyURI"/>
</xs:extension>
</xs:complexContent>
<xs:sequence>
<xs:element ref="ns1:desc"/>
</xs:sequence>
<xs:attribute name="type">
<xs:simpleType>
<xs:restriction base="xs:token">
<xs:enumeration value="applause"/>
<xs:enumeration value="ringing"/>
<xs:enumeration value="signal"/>
<xs:enumeration value="kinesic"/>
<xs:enumeration value="playback"/>
<xs:enumeration value="gesture"/>
<xs:enumeration value="laughter"/>
<xs:enumeration value="snapping"/>
<xs:enumeration value="noise"/>
</xs:restriction>
</xs:simpleType>
</xs:attribute>
<xs:attribute name="who" type="xs:anyURI"/>
</xs:complexType>
</xs:element>
<xs:element name="incident" substitutionGroup="ns1:comment">
<xs:complexType>
<xs:complexContent>
<xs:extension base="ns1:desc">
<xs:attribute name="type">
<xs:simpleType>
<xs:restriction base="xs:token">
<xs:enumeration value="action"/>
<xs:enumeration value="incident"/>
<xs:enumeration value="leaving"/>
<xs:enumeration value="entering"/>
<xs:enumeration value="break"/>
<xs:enumeration value="sound"/>
<xs:enumeration value="editorial"/>
</xs:restriction>
</xs:simpleType>
</xs:attribute>
<xs:attribute name="who" type="xs:anyURI"/>
</xs:extension>
</xs:complexContent>
<xs:sequence>
<xs:element ref="ns1:desc"/>
</xs:sequence>
<xs:attribute name="type">
<xs:simpleType>
<xs:restriction base="xs:token">
<xs:enumeration value="action"/>
<xs:enumeration value="incident"/>
<xs:enumeration value="leaving"/>
<xs:enumeration value="entering"/>
<xs:enumeration value="break"/>
<xs:enumeration value="sound"/>
<xs:enumeration value="editorial"/>
</xs:restriction>
</xs:simpleType>
</xs:attribute>
<xs:attribute name="who" type="xs:anyURI"/>
</xs:complexType>
</xs:element>
<xs:element name="vocal" substitutionGroup="ns1:comment">
<xs:complexType>
<xs:complexContent>
<xs:extension base="ns1:desc">
<xs:attribute name="type" use="required">
<xs:simpleType>
<xs:restriction base="xs:token">
<xs:enumeration value="speaking"/>
<xs:enumeration value="interruption"/>
<xs:enumeration value="noise"/>
<xs:enumeration value="laughter"/>
<xs:enumeration value="exclamat"/>
<xs:enumeration value="shouting"/>
<xs:enumeration value="greeting"/>
<xs:enumeration value="question"/>
<xs:enumeration value="signal"/>
<xs:enumeration value="clarification"/>
</xs:restriction>
</xs:simpleType>
</xs:attribute>
<xs:attribute name="who" type="xs:anyURI"/>
</xs:extension>
</xs:complexContent>
<xs:sequence>
<xs:element ref="ns1:desc"/>
</xs:sequence>
<xs:attribute name="type" use="required">
<xs:simpleType>
<xs:restriction base="xs:token">
<xs:enumeration value="speaking"/>
<xs:enumeration value="interruption"/>
<xs:enumeration value="noise"/>
<xs:enumeration value="laughter"/>
<xs:enumeration value="exclamat"/>
<xs:enumeration value="shouting"/>
<xs:enumeration value="greeting"/>
<xs:enumeration value="question"/>
<xs:enumeration value="signal"/>
<xs:enumeration value="clarification"/>
</xs:restriction>
</xs:simpleType>
</xs:attribute>
<xs:attribute name="who" type="xs:anyURI"/>
</xs:complexType>
</xs:element>
<xs:complexType name="desc">
<xs:sequence>
<xs:element ref="ns1:desc"/>
</xs:sequence>
</xs:complexType>
<xs:element name="desc">
<xs:complexType mixed="true">
<xs:attributeGroup ref="ns1:lang.att"/>
Expand Down
1 change: 1 addition & 0 deletions Schema/ParlaMint-teiCorpus.rnc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ listOrg =
orgName+,
event*,
idno*,
desc?,
listEvent?
}+,
listRelation?
Expand Down
3 changes: 3 additions & 0 deletions Schema/ParlaMint-teiCorpus.rng
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,9 @@
<zeroOrMore>
<ref name="idno"/>
</zeroOrMore>
<optional>
<ref name="desc"/>
</optional>
<optional>
<ref name="listEvent"/>
</optional>
Expand Down
1 change: 1 addition & 0 deletions Schema/ParlaMint-teiCorpus.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@
<xs:element maxOccurs="unbounded" ref="ns1:orgName"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="ns1:event"/>
<xs:element minOccurs="0" maxOccurs="unbounded" ref="ns1:idno"/>
<xs:element minOccurs="0" ref="ns1:desc"/>
<xs:element minOccurs="0" ref="ns1:listEvent"/>
</xs:sequence>
<xs:attributeGroup ref="ns1:global.atts"/>
Expand Down

0 comments on commit 9869e60

Please sign in to comment.