Skip to content

Commit 373efac

Browse files
DavidFatDavidFDavidFatDavidF
committed
Merge branch 'master' of https://github.com/oasis-tcs/lexidma 
2 parents c476596 + 9e50b2b commit 373efac

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+231
-160
lines changed

‎dmlex-v1.0/specification/core/objectTypes/label.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676

7777
<example>
7878
<title>JSON</title>
79+
<para>Implemented as a string</para>
7980
<programlisting>
8081
"..."
8182
</programlisting>

‎dmlex-v1.0/specification/core/objectTypes/partOfSpeech.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060

6161
<example>
6262
<title>JSON</title>
63+
<para>Implemented as a string</para>
6364
<programlisting>
6465
"..."
6566
</programlisting>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -743,7 +743,7 @@
743743
<ulink url="https://www.oasis-open.org/committees/download.php/14809/xml-catalogs.html"
744744
>https://www.oasis-open.org/committees/download.php/14809/xml-catalogs.html</ulink>
745745
</citetitle> OASIS Standard V1.1, 07 October 2005.</bibliomixed>
746-
<bibliomixed id="XMLSchema"><abbrev>XML Schema</abbrev> W3C, <title>XML Schema</title>,
746+
<bibliomixed id="bib_XMLSchema"><abbrev>XML Schema</abbrev> W3C, <title>XML Schema</title>,
747747
<citetitle> refers to the two part standard comprising <link linkend="XMLSchema1">[XML
748748
Schema Structures]</link> and <link linkend="XMLSchema2">[XML Schema Datatypes]</link>
749749
</citetitle> (Second Editions) W3C Recommendations 28 October 2004.</bibliomixed>

‎dmlex-v1.0/specification/examples/examples/12.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
- sense (id: lens-1)
2727
- definition (text: curved glass that makes things seem bigger)
2828
- relation (type: meronymy)
29-
- member (memberID: glasses-1, role: whole)
30-
- member (memberID: lens-1, role: part)
29+
- member (ref: glasses-1, role: whole)
30+
- member (ref: lens-1, role: part)
3131
- relation (type: meronymy)
32-
- member (memberID: microscrope-1, role: whole)
33-
- member (memberID: lens-1, role: part)
32+
- member (ref: microscrope-1, role: whole)
33+
- member (ref: lens-1, role: part)
3434
- relationType (type: meronomy, description: part-whole relationship)
3535
- memberType (role: whole, type: sense, min: 1, max: 1, hint: navigate)
3636
- memberType (role: part, type: sense, min: 1, max: 1, hint: navigate)
@@ -59,12 +59,12 @@
5959
&lt;/sense&gt;
6060
&lt;/entry&gt;
6161
&lt;relation type="meronymy"&gt;
62-
&lt;member memberID="glasses-1" role="whole"/&gt;
63-
&lt;member memberID="lens-1" role="part"/&gt;
62+
&lt;member ref="glasses-1" role="whole"/&gt;
63+
&lt;member ref="lens-1" role="part"/&gt;
6464
&lt;/relation&gt;
6565
&lt;relation type="meronymy"&gt;
66-
&lt;member memberID="microscrope-1" role="whole"/&gt;
67-
&lt;member memberID="lens-1" role="part"/&gt;
66+
&lt;member ref="microscrope-1" role="whole"/&gt;
67+
&lt;member ref="lens-1" role="part"/&gt;
6868
&lt;/relation&gt;
6969
&lt;relationType type="meronomy"&gt;
7070
&lt;description&gt;part-whole relationship&lt;/description&gt;
@@ -103,19 +103,19 @@
103103
"relations": [{
104104
"type": "meronymy",
105105
"members": [{
106-
"memberID": "glasses-1",
106+
"ref": "glasses-1",
107107
"role": "whole"
108108
}, {
109-
"memberID": "lens-1",
109+
"ref": "lens-1",
110110
"role": "part"
111111
}]
112112
}, {
113113
"type": "meronymy",
114114
"members": [{
115-
"memberID": "microscope-1",
115+
"ref": "microscope-1",
116116
"role": "whole"
117117
}, {
118-
"memberId": "lens-1",
118+
"ref": "lens-1",
119119
"role": "part"
120120
}]
121121
}],

‎dmlex-v1.0/specification/examples/examples/13.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
- sense (id: sell-1)
2323
- definition (text: exchange something for money)
2424
- relation (type: antonyms)
25-
- member (memberID: buy-1)
26-
- member (memberID: sell-1)
25+
- member (ref: buy-1)
26+
- member (ref: sell-1)
2727
- relationType: (type: antonyms)
2828
- memberType (type: sense, min: 2, max: 2, hint: navigate)
2929
</programlisting>
@@ -45,8 +45,8 @@
4545
&lt;/sense&gt;
4646
&lt;/entry&gt;
4747
&lt;relation type="antonyms"&gt;
48-
&lt;member memberID="buy-1"/&gt;
49-
&lt;member memberID="sell-1"/&gt;
48+
&lt;member ref="buy-1"/&gt;
49+
&lt;member ref="sell-1"/&gt;
5050
&lt;/relation&gt;
5151
&lt;relationType type="antonyms"&gt;
5252
&lt;memberType type="sense" min="2" max="2" hint="navigate"/&gt;
@@ -77,8 +77,8 @@
7777
"relations": [{
7878
"type": "antonyms",
7979
"members": [
80-
{"memberID": "buy-1"},
81-
{"memberID": "sell-1"}
80+
{"ref": "buy-1"},
81+
{"ref": "sell-1"}
8282
]
8383
}],
8484
"relationTypes": [{

‎dmlex-v1.0/specification/examples/examples/14.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
- sense (id: der-ozean-1)
3131
- headwordTranslation (text: ocean)
3232
- relation (type: synonyms, description: words that mean sea and ocean)
33-
- member (memberID: die-see-1)
34-
- member (memberID: das-meer-1)
35-
- member (memberID: der-ozean-1)
33+
- member (ref: die-see-1)
34+
- member (ref: das-meer-1)
35+
- member (ref: der-ozean-1)
3636
- relationType (type: synonyms, description: synonyms and near synonyms)
3737
memberType (type: sense, min: 2, hint: navigate)
3838
</programlisting>
@@ -65,9 +65,9 @@
6565
&lt;/entry&gt;
6666
&lt;relation type="synonyms"&gt;
6767
&lt;description&gt;words that mean sea and ocean&lt;/description&gt;
68-
&lt;member memberID="die-see-1"/&gt;
69-
&lt;member memberID="das-meer-1"/&gt;
70-
&lt;member memberID="der-ozean-1"/&gt;
68+
&lt;member ref="die-see-1"/&gt;
69+
&lt;member ref="das-meer-1"/&gt;
70+
&lt;member ref="der-ozean-1"/&gt;
7171
&lt;/relation&gt;
7272
&lt;relationType type="synonyms"&gt;
7373
&lt;description&gt;synonyms and near synonyms&lt;/description&gt;
@@ -112,9 +112,9 @@
112112
"type": "synonyms",
113113
"description": "words that mean sea and ocean",
114114
"members": [
115-
{"memberID": "die-see-1"},
116-
{"memberID": "das-meer-1"},
117-
{"memberID": "der-ozean-1"}
115+
{"ref": "die-see-1"},
116+
{"ref": "das-meer-1"},
117+
{"ref": "der-ozean-1"}
118118
]
119119
}],
120120
"relationTypes": [{

‎dmlex-v1.0/specification/examples/examples/15.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
- partOfSpeech (tag: n)
2929
- label (tag: americanSpelling)
3030
- relation (type: variants)
31-
- member (memberID: colour)
32-
- member (memberID: color)
31+
- member (ref: colour)
32+
- member (ref: color)
3333
- relationType (type: variants, description: words which differ only in spelling)
3434
- memberType (type: entry, min: 2, hint: navigate)
3535
</programlisting>
@@ -53,8 +53,8 @@
5353
&lt;label tag="americanSpelling"/&gt;
5454
&lt;/entry&gt;
5555
&lt;relation type="variants"&gt;
56-
&lt;member memberID="colour"/&gt;
57-
&lt;member memberID="color"/&gt;
56+
&lt;member ref="colour"/&gt;
57+
&lt;member ref="color"/&gt;
5858
&lt;/relation&gt;
5959
&lt;relationType type="variants"&gt;
6060
&lt;description&gt;words which differ only in spelling&lt;/description&gt;
@@ -88,8 +88,8 @@
8888
"relations": [{
8989
"type": "variants",
9090
"members": [
91-
{"memberID": "colour"},
92-
{"memberID": "color"}
91+
{"ref": "colour"},
92+
{"ref": "color"}
9393
]
9494
}],
9595
"relationTypes": [{

‎dmlex-v1.0/specification/examples/examples/16.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
- definition (text: interest or excitement)
3131
- example (text: Examples add colour to your writing.)
3232
- relation (type: subsensing)
33-
- member (memberID: colour-1, role: super)
34-
- member (memberID: colour-2, role: sub)
33+
- member (rer: colour-1, role: super)
34+
- member (ref: colour-2, role: sub)
3535
- relation (type: subsensing)
36-
- member (memberID: colour-1, role: super)
37-
- member (memberID: colour-3, role: sub)
36+
- member (ref: colour-1, role: super)
37+
- member (ref: colour-3, role: sub)
3838
- relationType (type: subsensing, scopeRestriction: sameEntry)
3939
- memberType (role: super, type: sense, min: 1, max: 1, hint: none)
4040
- memberRole (role: sub, type: sense, min: 1, max: 1, hint: embed)
@@ -64,12 +64,12 @@
6464
&lt;/sense&gt;
6565
&lt;/entry&gt;
6666
&lt;relation type="subsensing"&gt;
67-
&lt;member memberID="colour-1" role="super"/&gt;
68-
&lt;member memberID="colour-2" role="sub"/&gt;
67+
&lt;member ref="colour-1" role="super"/&gt;
68+
&lt;member ref="colour-2" role="sub"/&gt;
6969
&lt;/relation&gt;
7070
&lt;relation type="subsensing"&gt;
71-
&lt;member memberID="colour-1" role="super"/&gt;
72-
&lt;member memberID="colour-3" role="sub"/&gt;
71+
&lt;member ref="colour-1" role="super"/&gt;
72+
&lt;member ref="colour-3" role="sub"/&gt;
7373
&lt;/relation&gt;
7474
&lt;relationType type="subsensing" scopeRestriction="sameEntry"&gt;
7575
&lt;memberType role="super" type="sense" min="1" max="1" hint="none"/&gt;
@@ -108,14 +108,14 @@
108108
"relations": [{
109109
"type": "subsensing",
110110
"members": [
111-
{"role": "super", "memberID": "colour-1"},
112-
{"role": "sub", "memberID": "colour-2"}
111+
{"role": "super", "ref": "colour-1"},
112+
{"role": "sub", "ref": "colour-2"}
113113
]
114114
}, {
115115
"type": "subsensing",
116116
"members": [
117-
{"role": "super", "memberID": "colour-1"},
118-
{"role": "sub", "memberID": "colour-3"}
117+
{"role": "super", "ref": "colour-1"},
118+
{"role": "sub", "ref": "colour-3"}
119119
]
120120
}],
121121
"relationTypes": [{

‎dmlex-v1.0/specification/examples/examples/17.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
- sense (id: better-safe-1)
2626
- definition (text: you should be careful even if it seems unnecessary)
2727
- relation (type: subentrying)
28-
member (memberID: safe-1, role: container)
29-
member (memberID: better-safe, role: subentry)
28+
member (ref: safe-1, role: container)
29+
member (ref: better-safe, role: subentry)
3030
- relationType (type: subentrying, scopeRestriction: sameResource)
3131
- memberType (role: container, type: sense, min: 1, max: 1, hint: navigate)
3232
- memberType (role: subentry, type: entry, min: 1, max: 1, hint: embed)
@@ -56,8 +56,8 @@
5656
&lt;/sense&gt;
5757
&lt;/entry&gt;
5858
&lt;relation type="subentrying"&gt;
59-
&lt;member memberID="safe-1" role="container"/&gt;
60-
&lt;member memberID="better-safe" role="subentry"/&gt;
59+
&lt;member ref="safe-1" role="container"/&gt;
60+
&lt;member ref="better-safe" role="subentry"/&gt;
6161
&lt;/relation&gt;
6262
&lt;relationType type="subentrying" scopeRestriction="sameResource"&gt;
6363
&lt;memberType role="container" type="sense" min="1" max="1" hint="navigate"/&gt;
@@ -97,8 +97,8 @@
9797
"relations": [{
9898
"type": "subentrying",
9999
"members": [
100-
{"role": "container", "memberID": "safe-1"},
101-
{"role": "subentry", "memberID": "better-safe"}
100+
{"role": "container", "ref": "safe-1"},
101+
{"role": "subentry", "ref": "better-safe"}
102102
]
103103
}],
104104
"relationTypes": [{

‎dmlex-v1.0/specification/examples/examples/18.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
- sense (id: bible-2)
2525
- definition (text: a book considered important for a subject)
2626
- relation (type: subentrying)
27-
- member (memberID: bible-1, role: container)
28-
- member (memberID: the-bible, role: subentry)
27+
- member (ref: bible-1, role: container)
28+
- member (ref: the-bible, role: subentry)
2929
- relationType (type: subentrying, scopeRestcriction: sameResource)
3030
- memberType (role: container, type: sense, min: 1, max: 1, hint: navigate)
3131
- memberRole (role: subentry, type: entry, min: 1, max: 1, hint: embed)
@@ -53,8 +53,8 @@
5353
&lt;/sense&gt;
5454
&lt;/entry&gt;
5555
&lt;relation type="subentrying"&gt;
56-
&lt;member memberID="bible-1" role="container"/&gt;
57-
&lt;member memberID="the-bible" role="subentry"/&gt;
56+
&lt;member ref="bible-1" role="container"/&gt;
57+
&lt;member ref="the-bible" role="subentry"/&gt;
5858
&lt;/relation&gt;
5959
&lt;relationType type="subentrying" scopeRestriction="sameResource"&gt;
6060
&lt;memberType role="container" type="sense" min="1" max="1" hint="navigate"/&gt;
@@ -89,8 +89,8 @@
8989
"relations": [{
9090
"type": "subentrying",
9191
"members": [
92-
{"role": "container", "memberID": "bible-1"},
93-
{"role": "subentry", "memberID": "the-bible"}
92+
{"role": "container", "ref": "bible-1"},
93+
{"role": "subentry", "ref": "the-bible"}
9494
]
9595
}],
9696
"relationTypes": [{

‎dmlex-v1.0/specification/examples/examples/19.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@
2020
<title>XML</title>
2121
<programlisting>
2222
&lt;entry id="continue-studies"&gt;
23-
&lt;headword&gt;
24-
continue &lt;placeholderMarker&gt;your&lt;/placeholderMarker&gt; studies
25-
&lt;/headword&gt;
23+
&lt;headword&gt;continue &lt;placeholderMarker&gt;your&lt;/placeholderMarker&gt; studies&lt;/headword&gt;
2624
&lt;sense.../&gt;
2725
&lt;/entry&gt;
2826
</programlisting>

‎dmlex-v1.0/specification/examples/examples/20.xml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,10 @@
2121
<title>XML</title>
2222
<programlisting>
2323
&lt;entry id="beat-up"&gt;
24-
&lt;headword&gt;
25-
beat &lt;placeholderMarker&gt;sb.&lt;/placeholderMarker&gt; up
26-
&lt;/headword&gt;
24+
&lt;headword&gt;beat &lt;placeholderMarker&gt;sb.&lt;/placeholderMarker&gt; up&lt;/headword&gt;
2725
&lt;sense id="beat-up-1"&gt;
2826
&lt;headwordTranslation&gt;
29-
&lt;text&gt;
30-
&lt;placeholderMarker&gt;jemanden&lt;/placeholderMarker&gt; verprügeln
31-
&lt;/text&gt;
27+
&lt;text&gt;&lt;placeholderMarker&gt;jemanden&lt;/placeholderMarker&gt; verprügeln&lt;/text&gt;
3228
&lt;/headwordTranslation&gt;
3329
&lt;/sense&gt;
3430
&lt;/entry&gt;

‎dmlex-v1.0/specification/examples/examples/21.xml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,18 @@
2121
</example>
2222
<example>
2323
<title>XML</title>
24+
<para>The character <code>\</code> at the end of a line means that the line continues on the next line (with leading whitespace removed).</para>
2425
<programlisting>
2526
&lt;entry id="autopsy"&gt;
2627
&lt;headword&gt;autopsy&lt;/headword&gt;
2728
&lt;sense id="autopsy-1"&gt;
2829
&lt;headwordTranslation&gt;&lt;text&gt;pitva&lt;/text&gt;&lt;/headwordTranslation&gt;
2930
&lt;example&gt;
30-
&lt;text&gt;
31-
The coroner performed an &lt;headwordMarker&gt;autopsy&lt;/headwordMarker&gt;.
32-
&lt;/text&gt;
31+
&lt;text&gt;The coroner performed an \
32+
&lt;headwordMarker&gt;autopsy&lt;/headwordMarker&gt;.&lt;/text&gt;
3333
&lt;exampleTranslation&gt;
34-
&lt;text&gt;
35-
Koroner provedl &lt;headwordMarker&gt;pitvu&lt;/headwordMarker&gt;.
36-
&lt;/text&gt;
34+
&lt;text&gt;Koroner provedl \
35+
&lt;headwordMarker&gt;pitvu&lt;/headwordMarker&gt;.&lt;/text&gt;
3736
&lt;/exampleTranslation&gt;
3837
&lt;/example&gt;
3938
&lt;/sense&gt;

‎dmlex-v1.0/specification/examples/examples/22.xml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,20 @@
2525
</example>
2626
<example>
2727
<title>XML</title>
28+
<para>The character <code>\</code> at the end of a line means that the line continues on the next line (with leading whitespace removed).</para>
2829
<programlisting>
2930
&lt;entry id="autopsy"&gt;
3031
&lt;headword&gt;autopsy&lt;/headword&gt;
3132
&lt;sense id="autopsy-1"&gt;
3233
&lt;headwordTranslation&gt;&lt;text&gt;pitva&lt;/text&gt;&lt;/headwordTranslation&gt;
3334
&lt;example&gt;
34-
&lt;text&gt;
35-
The coroner &lt;collocateMarker lemma="perform"&gt;performed&lt;/collocateMarker&gt;
36-
an &lt;headwordMarker&gt;autopsy&lt;/headwordMarker&gt;.
37-
&lt;/text&gt;
35+
&lt;text&gt;The coroner \
36+
&lt;collocateMarker lemma="perform"&gt;performed&lt;/collocateMarker&gt; \
37+
&lt;headwordMarker&gt;autopsy&lt;/headwordMarker&gt;.&lt;/text&gt;
3838
&lt;exampleTranslation&gt;
39-
&lt;text&gt;
40-
Koroner &lt;collocateMarker lemma="provést"&gt;provedl&lt;/collocateMarker&gt;
41-
&lt;headwordMarker&gt;pitvu&lt;/headwordMarker&gt;.
42-
&lt;/text&gt;
39+
&lt;text&gt;Koroner \
40+
&lt;collocateMarker lemma="provést"&gt;provedl&lt;/collocateMarker&gt; \
41+
&lt;headwordMarker&gt;pitvu&lt;/headwordMarker&gt;.&lt;/text&gt;
4342
&lt;/exampleTranslation&gt;
4443
&lt;/example&gt;
4544
&lt;/sense&gt;

‎dmlex-v1.0/specification/modules/annotation/objectTypes/collocateMarker.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,7 @@
6060
<example>
6161
<title>XML</title>
6262
<programlisting>
63-
&lt;itemMarker id="..." lemma="..."&gt;
64-
...
65-
&lt;label tag="..."/&gt;
66-
&lt;/itemMarker&gt;
63+
&lt;collocateMarker id="..." lemma="..."&gt;...&lt;label tag="..."/&gt;&lt;/collocateMarker&gt;
6764
</programlisting>
6865
</example>
6966

0 commit comments

Comments
 (0)