Skip to content

Commit 8bdea24

Browse files
mjakubicekmjakubicek
authored
Merge pull request #143 from mjakubicek/master
editorial fixes + some NVH examples
2 parents 3932b13 + 4cbf948 commit 8bdea24

Some content is hidden

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

53 files changed

+340
-119
lines changed

‎dmlex-v1.0/specification/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ dmlex_uml.svg: dmlex.dot
2727
dmlex.dot: dmlex.dot.m4 dmlex.dot.content
2828
m4 $< > $@
2929

30-
dmlex.dot.content: schemas/informativeCopiesOf3rdPartySchemas/NVH/dmlex.nvh nvh2dot.py
30+
dmlex.dot.content: schemas/informativeCopiesOf3rdPartySchemas/NVH/dmlex_model_description.nvh nvh2dot.py
3131
awk '/<programlisting>/,/<\/programlisting>/' $< | tail -n+2 | head -n-1 | ./nvh2dot.py > $@
3232

3333
Makefile.dep: dmlex.xml $(SOURCE_XML) makedep.sh

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,4 +157,17 @@
157157
<graphic fileref="core/databaseDiagrams/entry.svg" contentwidth="16cm"/>
158158
</example>
159159

160+
<example>
161+
<title>NVH</title>
162+
<programlisting>
163+
entry: [headword]
164+
homograph: ...
165+
pos: ...
166+
label: ...
167+
pronunciation: ...
168+
form: ...
169+
sense: ...
170+
</programlisting>
171+
</example>
172+
160173
</section>

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,16 @@
9696
<graphic fileref="core/databaseDiagrams/inflectedForm.svg" contentwidth="16cm"/>
9797
</example>
9898

99+
<example>
100+
<title>NVH</title>
101+
<programlisting>
102+
form: [text]
103+
tag: ...
104+
label: ...
105+
pronunciation: ...
106+
</programlisting>
107+
</example>
108+
99109
<itemizedlist>
100110
<title>Comments</title>
101111
<listitem>

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,4 +112,15 @@
112112
<graphic fileref="core/databaseDiagrams/lexicographicResource.svg" contentwidth="16cm"/>
113113
</example>
114114

115+
<example>
116+
<title>NVH</title>
117+
<programlisting>
118+
lexicographicResource: http://example.com/dictionary
119+
title: An example dictionary
120+
langCode: en
121+
entry: ...
122+
entry: ...
123+
</programlisting>
124+
</example>
125+
115126
</section>

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,11 @@
8181
<graphic fileref="core/databaseDiagrams/partOfSpeech.svg" contentwidth="16cm"/>
8282
</example>
8383

84+
<example>
85+
<title>NVH</title>
86+
<programlisting>
87+
pos: [tag]
88+
</programlisting>
89+
</example>
90+
8491
</section>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636
</listitem>
3737
<listitem>
3838
<para><literal><olink targetptr="core_transcription">transcription</olink></literal>
39-
<glossterm>optional</glossterm> (zero or more) and <glossterm>unique</glossterm>.
40-
Normalised string.</para>
39+
<glossterm>optional</glossterm> (zero or more) and <glossterm>unique</glossterm>.</para>
4140
</listitem>
4241
</itemizedlist>
4342
</listitem>

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,16 @@
100100
</programlisting>
101101
</example>
102102

103+
<example>
104+
<title>NVH</title>
105+
<programlisting>
106+
sense: [indicator]
107+
definition: ...
108+
label: ...
109+
example: ...
110+
</programlisting>
111+
</example>
112+
103113
<example>
104114
<title>Relational database</title>
105115
<graphic fileref="core/databaseDiagrams/sense.svg" contentwidth="16cm"/>

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -953,7 +953,7 @@
953953
<para>This description uses the <ulink url="https://www.namevaluehierarchy.org/schema.html">NVH schema notation style</ulink> and the convention that all object types and their properties are prefixed by either <literal>core@</literal> or <literal>MODULENAME@</literal> strings. Their arity is denoted by a <literal>*</literal> (zero or more), <literal>+</literal> (one or more), <literal>?</literal> (zero or one) or <literal>N+</literal> (<literal>N</literal> or more). If no arity is given, it indicates the arity of 1, i.e. being required and occurring exactly once.
954954
</para>
955955
<programlisting>
956-
<xi:include href="schemas/informativeCopiesOf3rdPartySchemas/NVH/dmlex.nvh" xmlns:xi="http://www.w3.org/2001/XInclude"/>
956+
<xi:include href="schemas/informativeCopiesOf3rdPartySchemas/NVH/dmlex_model_description.nvh" xmlns:xi="http://www.w3.org/2001/XInclude"/>
957957
</programlisting>
958958
</appendix>
959959

@@ -978,7 +978,7 @@
978978
<para>Filip, David - Masaryk University (previously TCD, ADAPT Centre) </para>
979979
</listitem>
980980
<listitem>
981-
<para>Jakubíček, Miloš - Lexical Computing </para>
981+
<para>Jakubíček, Miloš - Lexical Computing, Masaryk University </para>
982982
</listitem>
983983
<listitem>
984984
<para>Kallas, Jelena - Institute of the Estonian Language</para>
@@ -995,6 +995,9 @@
995995
<listitem>
996996
<para>Krek, Simon - Jožef Stefan Institute </para>
997997
</listitem>
998+
<listitem>
999+
<para>Kovář, Vojtěch - Lexical Computing, Masaryk University </para>
1000+
</listitem>
9981001
<listitem>
9991002
<para>McCrae, John - University of Galway </para>
10001003
</listitem>

‎dmlex-v1.0/specification/examples/examples/build_source.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,16 @@
4646
outf.write(line.replace("<", "&lt;").replace(">", "&gt;"))
4747
outf.write("</programlisting>\n")
4848

49+
for f in glob("source/*.nvh"):
50+
with open(f) as inf:
51+
with open(f + ".xml", "w") as outf:
52+
outf.write("<!-- This example is automatically generated. DO NOT EDIT -->\n")
53+
outf.write("<programlisting>\n")
54+
for line in inf.readlines():
55+
while len(line) > N:
56+
outf.write(line[:N].replace("<", "&lt;").replace(">", "&gt;"))
57+
outf.write("\n")
58+
line = line[N:]
59+
outf.write(line.replace("<", "&lt;").replace(">", "&gt;"))
60+
outf.write("</programlisting>\n")
61+

‎dmlex-v1.0/specification/examples/examples/source/0.nvh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
lexicographicResource: http://example.com
2+
langCode: en
3+
entry: abandon
4+
pos: verb
5+
sense:
6+
definition: to suddenly leave a place or a person
7+
example: I'm sorry I abandoned you like that.
8+
example: Abandon ship!
9+
label: idiom
10+
sense:
11+
label: mostly-passive
12+
definition: to stop supporting an idea
13+
example: That theory has been abandoned.

‎dmlex-v1.0/specification/examples/examples/source/1.nvh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
entry: folúsghlantóir
2+
pos: n-masc
3+
form: folúsghlantóra
4+
tag: sg-gen
5+
form: folúsghlantóirí
6+
tag: pl
7+
sense: ...

‎dmlex-v1.0/specification/examples/examples/source/10.nvh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
lexicographicResource: http://example.com
2+
title: My Irish-Multilingual Dictionary
3+
langCode: ga
4+
translationLanguage: en
5+
translationLanguage: de
6+
translationLanguage: cs

‎dmlex-v1.0/specification/examples/examples/source/11.nvh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
entry: fómhar
2+
sense:
3+
en_translation: autumn
4+
en_translation: fall
5+
de_translation: Herbst
6+
cs_translation: podzim
7+
sense:
8+
en_translation: harvest
9+
de_translation: Ernte
10+
cs_translation: sklizeň

‎dmlex-v1.0/specification/examples/examples/source/12.nvh

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
lexicographicResource: http://example.com
2+
langCode: en
3+
entry: glasses
4+
sense:
5+
definition: an optical seeing aid
6+
entry: microscope
7+
sense:
8+
definition: equipment for looking at very small things
9+
entry: lens
10+
sense:
11+
definition: curved glass that makes things seem bigger
12+
relation: meronymy
13+
member: example.com/entry/glasses~0~0/sense/0~an%20optical%20seeing%20aid
14+
role: whole
15+
member: example.com/entry/lens~0~0/sense/0~curved%20glass%20that%20makes%20things%20seem%20bigger
16+
role: part
17+
relation: meronymy
18+
member: example.com/entry/microscope~0~0/sense/0~equipment%20for%20looking%20at%20very%20small%20things
19+
role: whole
20+
member: example.com/entry/lens~0~0/sense/0~curved%20glass%20that%20makes%20things%20seem%20bigger
21+
role: part
22+
relationType: meronomy
23+
description: part-whole relationship
24+
memberType: sense
25+
role: whole
26+
min: 1
27+
max: 1
28+
hint: navigate
29+
memberType: sense
30+
role: part
31+
min: 1
32+
max: 1
33+
hint: navigate

‎dmlex-v1.0/specification/examples/examples/source/13.nvh

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
lexicographicResource: http://example.com
2+
langCode: en
3+
entry: buy
4+
sense:
5+
definition: get something by paying money for it
6+
entry: sell
7+
sense:
8+
definition: exchange something for money
9+
relation: antonyms
10+
member: example.com/entry/buy~0~0/sense/0~get%20something%20by%20paying%20money%20for%20it
11+
member: example.com/entry/sell~0~0/sense/0~exchange%20something%20for%20money
12+
relationType: antonyms
13+
memberType: sense
14+
min: 2
15+
max: 2
16+
hint: navigate

‎dmlex-v1.0/specification/examples/examples/source/14.nvh

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
lexicographicResource: http://example.com
2+
langCode: de
3+
translationLanguage: en
4+
entry: See
5+
pos: n-fem
6+
sense:
7+
headwordTranslation: sea
8+
entry: Meer
9+
pos: n-neut
10+
sense:
11+
headwordTranslation: sea
12+
entry: Ozean
13+
pos: n-masc
14+
sense
15+
headwordTranslation: ocean
16+
relation: synonyms
17+
description: words that mean sea and ocean
18+
member: example.com/entry/See~0~0/sense/0~0
19+
member: example.com/entry/Meer~0~0/sense/0~0
20+
member: example.com/entry/Ozean~0~0/sense/0~0
21+
relationType: synonyms
22+
description: synonyms and near synonyms
23+
memberType: sense
24+
min: 2
25+
hint: navigate

‎dmlex-v1.0/specification/examples/examples/source/2.nvh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
entry: aardvark
2+
pronunciation:
3+
transcription: a:rdva:rk
4+
sense: ...

‎dmlex-v1.0/specification/examples/examples/source/3.nvh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
entry: aardvark
2+
pronunciation: aardvark.mp3
3+
sense: ...

‎dmlex-v1.0/specification/examples/examples/source/4.nvh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
entry: aardvark
2+
pronunciation: aardvark.mp3
3+
transcription: a:rdva:rk
4+
sense: ...

‎dmlex-v1.0/specification/examples/examples/source/5.nvh

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
lexicographicResource: http://example.com
2+
langCode: ga
3+
entry: folúsghlantóir
4+
pos: n-masc
5+
form: folúsghlantóra
6+
tag: sg-gen
7+
form: folúsghlantóirí
8+
tag: pl
9+
sense: ...
10+
posTag: n-masc
11+
description: masculine noun
12+
posTag: n-fem
13+
description: feminine noun
14+
formTag: sg-gen
15+
description: singular genitive
16+
formTag: pl
17+
description: plural

‎dmlex-v1.0/specification/examples/examples/source/6.nvh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
posTag: n-masc
2+
description: masculine noun
3+
sameAs: http://www.lexinfo.net/ontology/3.0/lexinfo#noun
4+
sameAs: uri: http://www.lexinfo.net/ontology/3.0/lexinfo#masculine
5+
posTag: n-fem
6+
description: feminine noun
7+
sameAs: http://www.lexinfo.net/ontology/3.0/lexinfo#noun
8+
sameAs: http://www.lexinfo.net/ontology/3.0/lexinfo#feminine

‎dmlex-v1.0/specification/examples/examples/source/7.nvh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
lexicographicResource: http://example.com
2+
title: My German-English Dictionary
3+
langCode: de
4+
translationLanguage: en

‎dmlex-v1.0/specification/examples/examples/source/8.nvh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
entry: doctor
2+
sense: medical doctor
3+
translation: Arzt
4+
pos: n-masc
5+
translation: Ärztin
6+
pos: n-fem
7+
sense: academic title
8+
translation: Doktor
9+
pos: n-masc
10+
translation: Doktorin
11+
pos: n-fem

‎dmlex-v1.0/specification/examples/examples/source/9.nvh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
entry: Treppenwitz
2+
pos: n-masc
3+
sense:
4+
explanation: belated realisation of what one could have said
5+
translation: staircase wit

‎dmlex-v1.0/specification/modules/values/objectTypes/inflectedFormTag.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<glossterm>optional</glossterm> (zero or one). Normalised string. A statement about
4242
constraints and recommendation on using this tag. This can be a human-readable description
4343
such as "for use with German nouns only" or a machine-readable instruction in any format
44-
understandable to the DMLex implemenation, such as <code>partOfSpeech=noun AND
44+
understandable to the DMLex implementation, such as <code>partOfSpeech=noun AND
4545
language=de</code>.</para>
4646
</listitem>
4747
<listitem>

‎dmlex-v1.0/specification/modules/values/objectTypes/labelTag.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<glossterm>optional</glossterm> (zero or one). Normalised string. A statement about
5151
constraints and recommendation on using this tag. This can be a human-readable description
5252
such as "for use with German nouns only" or a machine-readable instruction in any format
53-
understandable to the DMLex implemenation, such as <code>partOfSpeech=noun AND
53+
understandable to the DMLex implementation, such as <code>partOfSpeech=noun AND
5454
language=de</code>.</para>
5555
</listitem>
5656
<listitem>

‎dmlex-v1.0/specification/modules/values/objectTypes/partOfSpeechTag.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<glossterm>optional</glossterm> (zero or one). Normalised string. A statement about
4141
constraints and recommendation on using this tag. This can be a human-readable description
4242
such as "for use in German and Czech only" or a machine-readable instruction in any format
43-
understandable to the DMLex implemenation, such as <code>language=de OR
43+
understandable to the DMLex implementation, such as <code>language=de OR
4444
language=cs</code>.</para>
4545
</listitem>
4646
<listitem>

‎dmlex-v1.0/specification/modules/values/objectTypes/transcriptionSchemeTag.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<glossterm>optional</glossterm> (zero or one). Normalised string. A statement about
3939
constraints and recommendation on using this tag. This can be a human-readable description
4040
such as "for use in German and Czech only" or a machine-readable instruction in any format
41-
understandable to the DMLex implemenation, such as <code>language=de OR
41+
understandable to the DMLex implementation, such as <code>language=de OR
4242
language=cs</code>.</para>
4343
</listitem>
4444
</itemizedlist>

0 commit comments

Comments
 (0)