Skip to content

Commit 3932b13

Browse files
mjakubicekmjakubicek
authored
Merge pull request #142 from jmccrae/issue-140
Changs to the Etymology Module
2 parents faa8d74 + 2b508df commit 3932b13

24 files changed

+117
-40
lines changed

‎dmlex-v1.0/specification/modules/etymology/extensions/sameAs.xml

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
3+
"http://www.docbook.org/xml/4.5/docbookx.dtd" [
4+
<!ENTITY % xinclude SYSTEM "../../../docbook/xinclude.mod" >
5+
%xinclude;
6+
<!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED" >
7+
]>
8+
9+
<section id="etymology_sameAs">
10+
<title>Extensions to <code>sameAs</code></title>
11+
<para>
12+
Extends the <code><olink targetptr="values_sameAs">sameAs</olink></code> object type
13+
from the <olink targetptr="values">Controlled Values Module</olink>.
14+
</para>
15+
16+
<itemizedlist>
17+
<title>Can additionally be a property of</title>
18+
<listitem>
19+
<para><literal><olink targetptr="linking_relationTypeTag">etymonLanguage</olink></literal></para>
20+
</listitem>
21+
<listitem>
22+
<para><literal><olink targetptr="linking_memberRoletag">etymonType</olink></literal></para>
23+
</listitem>
24+
</itemizedlist>
25+
26+
<example>
27+
<title>Relational database</title>
28+
<graphic fileref="modules/linking/databaseDiagrams/sameAs.svg" contentwidth="16cm"/>
29+
</example>
30+
31+
</section>

‎dmlex-v1.0/specification/modules/etymology/objectTypes/etymon.xml

-5
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,6 @@
4444
<para><literal><olink targetptr="etymology_etymonUnit">etymonUnit</olink></literal>
4545
<glossterm>required</glossterm> (one or more) and <glossterm>unique</glossterm>.</para>
4646
</listitem>
47-
<listitem>
48-
<para><literal>translation</literal>
49-
<glossterm>optional</glossterm> (zero or one). Normalised string. A translation or
50-
gloss of the etymon in the language of the lexicographic resource.</para>
51-
</listitem>
5247
<listitem>
5348
<para><literal>listingOrder</literal>
5449
<glossterm>required</glossterm> (exactly one). Number. The position of this origin

‎dmlex-v1.0/specification/modules/etymology/objectTypes/etymonLanguage.xml

+9-2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
<glossterm>optional</glossterm> (zero or one). Normalised string. The name of the etymon
3333
language, in the language of the lexicographic resource.</para>
3434
</listitem>
35+
<listitem>
36+
<para><literal><olink targetptr="etymology_sameAs">sameAs</olink></literal>
37+
<glossterm>optional</glossterm> (zero or more).</para>
38+
</listitem>
3539
</itemizedlist>
3640

3741
<note>
@@ -48,6 +52,7 @@
4852
<programlisting>
4953
&lt;etymonLanguage langCode="..."&gt;
5054
&lt;displayName&gt;...&lt;displayName&gt;
55+
&lt;sameAs.../&gt;
5156
&lt;/etymonLanguage&gt;
5257
</programlisting>
5358
</example>
@@ -57,7 +62,8 @@
5762
<programlisting>
5863
{
5964
"langCode": "..." ,
60-
"displayName": "..."
65+
"displayName": "...",
66+
"sameAs": [ ... ]
6167
}
6268
</programlisting>
6369
</example>
@@ -66,7 +72,8 @@
6672
<title>RDF</title>
6773
<programlisting>
6874
&lt;#etymonLanguage&gt; dmlex:langCode "..." ;
69-
dmlex:displayName "... " .
75+
dmlex:displayName "... " ;
76+
dmlex:sameAs ... .
7077
</programlisting>
7178
</example>
7279

‎dmlex-v1.0/specification/modules/etymology/objectTypes/etymonType.xml

+4
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@
3131
<glossterm>optional</glossterm> (zero or one). Normalised string. A human-readable
3232
explanation of this type.</para>
3333
</listitem>
34+
<listitem>
35+
<para><literal><olink targetptr="etymology_sameAs">sameAs</olink></literal>
36+
<glossterm>optional</glossterm> (zero or more).</para>
37+
</listitem>
3438
</itemizedlist>
3539

3640
<example>

‎dmlex-v1.0/specification/modules/etymology/specification.xml

+1
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,6 @@
2020
<xi:include href="objectTypes/etymonType.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
2121
<xi:include href="objectTypes/etymonLanguage.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
2222
<xi:include href="extensions/partOfSpeech.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
23+
<xi:include href="extensions/sameAs.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
2324

2425
</section>

‎dmlex-v1.0/specification/schemas/JSON/dmlex.schema.json

+14-3
Original file line numberDiff line numberDiff line change
@@ -906,9 +906,6 @@
906906
"$ref": "#/$defs/etymonUnit"
907907
},
908908
"minItems": 1
909-
},
910-
"translation": {
911-
"type": "string"
912909
}
913910
},
914911
"additionalProperties": false
@@ -950,6 +947,13 @@
950947
"description": {
951948
"type": "string",
952949
"minLength": 1
950+
},
951+
"sameAs": {
952+
"type": "array",
953+
"items": {
954+
"$ref": "#/$defs/sameAs"
955+
},
956+
"uniqueItems": true
953957
}
954958
},
955959
"additionalProperties": false
@@ -963,6 +967,13 @@
963967
},
964968
"displayName": {
965969
"type": "string"
970+
},
971+
"sameAs": {
972+
"type": "array",
973+
"items": {
974+
"$ref": "#/$defs/sameAs"
975+
},
976+
"uniqueItems": true
966977
}
967978
},
968979
"additionalProperties": false

‎dmlex-v1.0/specification/schemas/JSON/dmlex_no-crosslingual.schema.json

+15-5
Original file line numberDiff line numberDiff line change
@@ -709,11 +709,7 @@
709709
"$ref": "#/$defs/etymonUnit"
710710
},
711711
"minItems": 1
712-
},
713-
"translation": {
714-
"type": "string"
715-
}
716-
},
712+
} },
717713
"additionalProperties": false
718714
},
719715
"etymonUnit": {
@@ -753,6 +749,13 @@
753749
"description": {
754750
"type": "string",
755751
"minLength": 1
752+
},
753+
"sameAs": {
754+
"type": "array",
755+
"items": {
756+
"$ref": "#/$defs/sameAs"
757+
},
758+
"uniqueItems": true
756759
}
757760
},
758761
"additionalProperties": false
@@ -766,6 +769,13 @@
766769
},
767770
"displayName": {
768771
"type": "string"
772+
},
773+
"sameAs": {
774+
"type": "array",
775+
"items": {
776+
"$ref": "#/$defs/sameAs"
777+
},
778+
"uniqueItems": true
769779
}
770780
},
771781
"additionalProperties": false

‎dmlex-v1.0/specification/schemas/RDF/dmlex-etymology.ttl

+4-3
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@ dmlex:Etymon a owl:Class ;
4949
a owl:Restriction ;
5050
owl:onProperty dmlex:etymonUnit ;
5151
owl:minCardinality 1 ] , [
52-
a owl:Restriction ;
53-
owl:onProperty dmlex:translation ;
54-
owl:maxCardinality 1 ] , [
5552
a owl:Restriction ;
5653
owl:onProperty dmlex:listingOrder ;
5754
owl:cardinality 1 ] .
@@ -140,3 +137,7 @@ dmlex:displayName a owl:ObjectProperty ;
140137
rdfs:label "Display Name"@en ;
141138
rdfs:domain dmlex:EtymonLanguage ;
142139
rdfs:range xsd:string .
140+
141+
142+
dmlex:EtymonLanguage rdfs:subClassOf dmlex:HasSameAs .
143+
dmlex:EtymonType rdfs:subClassOf dmlex:HasSameAs .

‎dmlex-v1.0/specification/schemas/RDF/dmlex.ttl

+4-1
Original file line numberDiff line numberDiff line change
@@ -926,7 +926,6 @@ dmlex:translation a owl:DatatypeProperty ;
926926
rdfs:domain dmlex:HasTranslation ;
927927
rdfs:range xsd:string .
928928

929-
dmlex:Etymon rdfs:subClassOf dmlex:HasTranslation .
930929
dmlex:EtymonUnit rdfs:subClassOf dmlex:HasTranslation .
931930

932931
dmlex:EtymonUnit a owl:Class ;
@@ -990,3 +989,7 @@ dmlex:displayName a owl:ObjectProperty ;
990989
rdfs:label "Display Name"@en ;
991990
rdfs:domain dmlex:EtymonLanguage ;
992991
rdfs:range xsd:string .
992+
993+
dmlex:EtymonLanguage rdfs:subClassOf dmlex:HasSameAs .
994+
dmlex:EtymonType rdfs:subClassOf dmlex:HasSameAs .
995+

‎dmlex-v1.0/specification/schemas/XML/dmlex.xsd

+2-1
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,6 @@ It might be possible to re-write them as <assert>s using concatenation of values
642642
<xs:sequence>
643643
<xs:element name="note" minOccurs="0" type="xs:string"/>
644644
<xs:element ref="etymonUnit" maxOccurs="unbounded"/>
645-
<xs:element name="translation" minOccurs="0" type="xs:string"/>
646645
</xs:sequence>
647646
<xs:attribute name="when" use="optional" type="xs:string"/>
648647
<xs:attribute name="type" use="optional" type="xs:string"/>
@@ -667,6 +666,7 @@ It might be possible to re-write them as <assert>s using concatenation of values
667666
<xs:complexType name="etymonTypeType">
668667
<xs:sequence>
669668
<xs:element name="description" minOccurs="0" type="nonEmptyString"/>
669+
<xs:element ref="sameAs" minOccurs="0" maxOccurs="unbounded"/>
670670
</xs:sequence>
671671
<xs:attribute name="type" use="required" type="nonEmptyString"/>
672672
</xs:complexType>
@@ -676,6 +676,7 @@ It might be possible to re-write them as <assert>s using concatenation of values
676676
<xs:complexType name="etymonLanguageType">
677677
<xs:sequence>
678678
<xs:element name="displayName" minOccurs="0" type="xs:string"/>
679+
<xs:element ref="sameAs" minOccurs="0" maxOccurs="unbounded"/>
679680
</xs:sequence>
680681
<xs:attribute name="langCode" use="required" type="xs:language"/>
681682
</xs:complexType>

‎dmlex-v1.0/specification/schemas/XML/dmlex_no-crosslingual.xsd

+2-1
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,6 @@ It might be possible to re-write them as <assert>s using concatenation of values
527527
<xs:sequence>
528528
<xs:element name="note" minOccurs="0" type="xs:string"/>
529529
<xs:element ref="etymonUnit" maxOccurs="unbounded"/>
530-
<xs:element name="translation" minOccurs="0" type="xs:string"/>
531530
</xs:sequence>
532531
<xs:attribute name="when" use="optional" type="xs:string"/>
533532
<xs:attribute name="type" use="optional" type="xs:string"/>
@@ -552,6 +551,7 @@ It might be possible to re-write them as <assert>s using concatenation of values
552551
<xs:complexType name="etymonTypeType">
553552
<xs:sequence>
554553
<xs:element name="description" minOccurs="0" type="nonEmptyString"/>
554+
<xs:element ref="sameAs" minOccurs="0" maxOccurs="unbounded"/>
555555
</xs:sequence>
556556
<xs:attribute name="type" use="required" type="nonEmptyString"/>
557557
</xs:complexType>
@@ -561,6 +561,7 @@ It might be possible to re-write them as <assert>s using concatenation of values
561561
<xs:complexType name="etymonLanguageType">
562562
<xs:sequence>
563563
<xs:element name="displayName" minOccurs="0" type="xs:string"/>
564+
<xs:element ref="sameAs" minOccurs="0" maxOccurs="unbounded"/>
564565
</xs:sequence>
565566
<xs:attribute name="langCode" use="required" type="xs:language"/>
566567
</xs:complexType>

‎dmlex-v1.0/specification/serializations/JSON/objects/etymon.xml

-4
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@
2929
<glossterm>required</glossterm>, array of one or more <literal><olink
3030
targetptr="json_etymonUnit">etymonUnit</olink></literal> instances</para>
3131
</listitem>
32-
<listitem>
33-
<para><literal>"translation"</literal>
34-
<glossterm>optional</glossterm>, string</para>
35-
</listitem>
3632
</itemizedlist>
3733

3834
</section>

‎dmlex-v1.0/specification/serializations/JSON/objects/etymonLanguage.xml

+5
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@
2020
<para><literal>"displayName"</literal>
2121
<glossterm>optional</glossterm>, string</para>
2222
</listitem>
23+
<listitem>
24+
<para><literal>"sameAs"</literal>
25+
<glossterm>optional</glossterm>, array of zero or more strings implementing the
26+
<olink targetptr="values_sameAs">sameAs</olink> object type</para>
27+
</listitem>
2328
</itemizedlist>
2429

2530
</section>

‎dmlex-v1.0/specification/serializations/JSON/objects/etymonType.xml

+5
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@
2020
<para><literal>"description"</literal>
2121
<glossterm>optional</glossterm>, string</para>
2222
</listitem>
23+
<listitem>
24+
<para><literal>"sameAs"</literal>
25+
<glossterm>optional</glossterm>, array of zero or more strings implementing the
26+
<olink targetptr="values_sameAs">sameAs</olink> object type</para>
27+
</listitem>
2328
</itemizedlist>
2429

2530
</section>

‎dmlex-v1.0/specification/serializations/NVH/nodes/etymon.xml

-3
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@
2323
<listitem>
2424
<para><literal><olink targetptr="nvh_etymonUnit">etymonUnit</olink></literal> <glossterm>required</glossterm> (one or more)</para>
2525
</listitem>
26-
<listitem>
27-
<para><literal>translation</literal> <glossterm>optional</glossterm> (zero or one)</para>
28-
</listitem>
2926
</itemizedlist>
3027

3128

‎dmlex-v1.0/specification/serializations/NVH/nodes/etymonLanguage.xml

+3
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
<listitem>
2222
<para><literal>displayName</literal> <glossterm>optional</glossterm> (zero or one)</para>
2323
</listitem>
24+
<listitem>
25+
<para><literal><olink targetptr="nvh_sameAs">sameAs</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
26+
</listitem>
2427
</itemizedlist>
2528

2629

‎dmlex-v1.0/specification/serializations/NVH/nodes/etymonType.xml

+3
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
<listitem>
2222
<para><literal>description</literal> <glossterm>optional</glossterm> (zero or one)</para>
2323
</listitem>
24+
<listitem>
25+
<para><literal><olink targetptr="nvh_sameAs">sameAs</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
26+
</listitem>
2427
</itemizedlist>
2528

2629

‎dmlex-v1.0/specification/serializations/RDB/tables/etymons.xml

-3
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@
3232
<listitem>
3333
<para><literal>note: nvarchar</literal></para>
3434
</listitem>
35-
<listitem>
36-
<para><literal>translation: nvarchar</literal></para>
37-
</listitem>
3835
<listitem>
3936
<para><literal>listingOrder: int</literal></para>
4037
</listitem>

‎dmlex-v1.0/specification/serializations/RDF/elements/Etymon.xml

+1-4
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,7 @@
2828
<listitem>
2929
<para><literal>dmlex:etymonUnit</literal> REQUIRED (at least 1) reference to <olink targetptr="rdf_EtymonUnit">EtymonUnit</olink></para>
3030
</listitem>
31-
<listitem>
32-
<para><literal>dmlex:translation</literal> OPTIONAL (at most 1) of type <literal>http://www.w3.org/2001/XMLSchema#string</literal></para>
33-
</listitem>
3431
</itemizedlist>
3532

3633

37-
</section>
34+
</section>

‎dmlex-v1.0/specification/serializations/RDF/elements/EtymonLanguage.xml

+4-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@
1919
<listitem>
2020
<para><literal>dmlex:displayName</literal> OPTIONAL (at most 1) of type <literal>http://www.w3.org/2001/XMLSchema#string</literal></para>
2121
</listitem>
22+
<listitem>
23+
<para><literal>dmlex:sameAs</literal> OPTIONAL</para>
24+
</listitem>
2225
</itemizedlist>
2326

2427

25-
</section>
28+
</section>

‎dmlex-v1.0/specification/serializations/RDF/elements/EtymonType.xml

+4-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@
1919
<listitem>
2020
<para><literal>dmlex:type</literal> REQUIRED (exactly 1) of type <literal>http://www.w3.org/2001/XMLSchema#string</literal></para>
2121
</listitem>
22+
<listitem>
23+
<para><literal>dmlex:sameAs</literal> OPTIONAL</para>
24+
</listitem>
2225
</itemizedlist>
2326

2427

25-
</section>
28+
</section>

‎dmlex-v1.0/specification/serializations/XML/elements/etymon.xml

-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@
2727
<listitem>
2828
<para><literal><olink targetptr="xml_etymonUnit">&lt;etymonUnit&gt;</olink></literal> <glossterm>required</glossterm> (one or more)</para>
2929
</listitem>
30-
<listitem>
31-
<para><literal>&lt;translation&gt;</literal> <glossterm>optional</glossterm> (zero or one)</para>
32-
</listitem>
3330
</itemizedlist>
3431

3532

‎dmlex-v1.0/specification/serializations/XML/elements/etymonLanguage.xml

+3
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
<listitem>
2222
<para><literal>&lt;displayName&gt;</literal> <glossterm>optional</glossterm> (zero or one)</para>
2323
</listitem>
24+
<listitem>
25+
<para><literal><olink targetptr="xml_sameAs">&lt;sameAs&gt;</olink></literal> <glossterm>optional</glossterm> (zero or more)</para>
26+
</listitem>
2427
</itemizedlist>
2528

2629

0 commit comments

Comments
 (0)