Skip to content

Commit d2f3ce2

Browse files
ttasovacttasovac
committed
Merge branch 'dev'
2 parents 2332093 + 41e2b2a commit d2f3ce2

7 files changed

Lines changed: 206 additions & 171 deletions

File tree

‎Schemas/TEILex0/TEILex0.odd‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
</titleStmt>
118118
<editionStmt>
119119
<!--make sure to always update before publishing new version-->
120-
<edition n="0.9.3"/>
120+
<edition n="0.9.4"/>
121121
</editionStmt>
122122
<publicationStmt>
123123
<authority>DARIAH Working Group on Lexical Resources</authority>
@@ -132,6 +132,11 @@
132132
</fileDesc>
133133
<revisionDesc>
134134
<listChange>
135+
<listChange n="0.9.4">
136+
<change when="2024-05-12" type="xproc">fix documentation build on macOS and Windows in oXygen XML Editor</change>
137+
<change type="spec">added <code>degree</code> as <gi>gram</gi> <att>type</att> value</change>
138+
<change type="docs">fixed some typographical errors in the documentation</change>
139+
</listChange>
135140
<listChange n="0.9.3">
136141
<change when="2024-02-12" type="spec"><gi>catDesc</gi> <hi rend="italic">must</hi> contain a <gi>term</gi></change>
137142
<change type="spec">switch to using the external TEI add-on in oXygen when generating schema and documentation</change>

‎Schemas/TEILex0/TEILex0.parts/02__entries.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,11 @@
208208
<cell><code rend="language-xml">&lt;gram
209209
type="government">[+conj.]&lt;/gram></code></cell>
210210
</row>
211+
<row>
212+
<cell>-</cell>
213+
<cell><code rend="language-xml">&lt;gram
214+
type="degree">comp.&lt;/gram></code></cell>
215+
</row>
211216
</table></p>
212217
<p>Note: See also next section on <ref target="#collocates">Collocates</ref>.</p>
213218
<p>TEI5 is missing a specific element for encoding the grammatical aspect of verbs (for

‎Schemas/TEILex0/TEILex0.parts/40__specification.xml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,8 @@
173173
</valItem>
174174
<valItem ident="hyponymy">
175175
<desc> Relation between lexical units X and Y characterised by the
176-
property that the sentence This is a(n) X entails, but is not
177-
entailed by the sentence This is a(n) Y. (Adapted from Cruse (1986)) </desc>
176+
property that the sentence ‘This is a(n) X’ entails, but is not
177+
entailed by the sentence ‘This is a(n) Y’. (Adapted from Cruse (1986).) </desc>
178178
<remarks>
179179
<p>Hyponymy and its converse hypernymy are the linguistic parallels
180180
of the relation of inclusion between two classes.</p>
@@ -185,8 +185,8 @@
185185
</valItem>
186186
<valItem ident="hypernymy">
187187
<desc>Relation between lexical heads X and Y characterised by the
188-
property that the sentence This is a(n) Y entails, but is not
189-
entailed by the sentence This is a(n) X. (Adapted from Cruse (1986)) </desc>
188+
property that the sentence ‘This is a(n) Y’ entails, but is not
189+
entailed by the sentence ‘This is a(n) X’. (Adapted from Cruse (1986).) </desc>
190190
<remarks>
191191
<p>Hyperonymy is the converse of hyponymy.</p>
192192
<p> Example: dog/animal (animal is a hypernym of dog)</p>
@@ -195,15 +195,15 @@
195195
<valItem ident="meronymy">
196196
<desc>An inclusion relation between lexical heads X and Y which reflect
197197
a potential part-whole relation between their referents in
198-
discourse. (Adapted from Cruse (2011, p. 140))</desc>
198+
discourse. (Adapted from Cruse (2011, p. 140).)</desc>
199199
<remarks>
200200
<p>Example: finger:hand (finger is said to be a meronym of hand, and
201201
hand is said to be the holonym of finger).</p>
202202
</remarks>
203203
</valItem>
204204
<valItem ident="antonymy"/>
205205
<valItem ident="related">
206-
<desc>The default reference to another lexical unit when no addtional
206+
<desc>The default reference to another lexical unit when no additional
207207
information is available.</desc>
208208
</valItem>
209209
<!-- further values to be added there -->
@@ -700,11 +700,13 @@
700700
uri="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-case.html"
701701
/>
702702
</valItem>
703+
<valItem ident="degree"/>
703704
<valItem ident="gender">
704705
<equiv name="gen"
705706
uri="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-gen.html"
706707
/>
707708
</valItem>
709+
<valItem ident="government"/>
708710
<valItem ident="inflectionType">
709711
<equiv name="iType"
710712
uri="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-iType.html"
@@ -731,7 +733,6 @@
731733
uri="https://www.tei-c.org/release/doc/tei-p5-doc/en/html/ref-colloc.html"
732734
/>
733735
</valItem>
734-
<valItem ident="government"/>
735736
</valList>
736737
</attDef>
737738
</attList>

‎Schemas/TEILex0/TEILex0.xpr‎

Lines changed: 49 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -12119,7 +12119,47 @@ oxy:current-selected-element()[ancestor-or-self::*:cell[namespace-uri()='http://
1211912119
<scenarioAssociation-array>
1212012120
<scenarioAssociation>
1212112121
<field name="url">
12122-
<String>TEILex0.parts/40__specification.xml</String>
12122+
<String>xproc/teilex0.xpl</String>
12123+
</field>
12124+
<field name="scenarioIds">
12125+
<list>
12126+
<String>TEILex0: Generate documentation</String>
12127+
</list>
12128+
</field>
12129+
<field name="scenarioTypes">
12130+
<list>
12131+
<String>XPROC</String>
12132+
</list>
12133+
</field>
12134+
<field name="scenarioStorageLocations">
12135+
<list>
12136+
<Byte>2</Byte>
12137+
</list>
12138+
</field>
12139+
</scenarioAssociation>
12140+
<scenarioAssociation>
12141+
<field name="url">
12142+
<String>TEILex0.parts/02__entries.xml</String>
12143+
</field>
12144+
<field name="scenarioIds">
12145+
<list>
12146+
<String>TEILex0: Generate documentation</String>
12147+
</list>
12148+
</field>
12149+
<field name="scenarioTypes">
12150+
<list>
12151+
<String>XPROC</String>
12152+
</list>
12153+
</field>
12154+
<field name="scenarioStorageLocations">
12155+
<list>
12156+
<Byte>2</Byte>
12157+
</list>
12158+
</field>
12159+
</scenarioAssociation>
12160+
<scenarioAssociation>
12161+
<field name="url">
12162+
<String>TEILex0.odd</String>
1212312163
</field>
1212412164
<field name="scenarioIds">
1212512165
<list>
@@ -12159,16 +12199,16 @@ oxy:current-selected-element()[ancestor-or-self::*:cell[namespace-uri()='http://
1215912199
</scenarioAssociation>
1216012200
<scenarioAssociation>
1216112201
<field name="url">
12162-
<String>xproc/teilex0.xpl</String>
12202+
<String>TEILex0.parts/40__specification.xml</String>
1216312203
</field>
1216412204
<field name="scenarioIds">
1216512205
<list>
12166-
<String>TEILex0: Generate documentation</String>
12206+
<String>TEILex0: ODD to RELAX NG XML</String>
1216712207
</list>
1216812208
</field>
1216912209
<field name="scenarioTypes">
1217012210
<list>
12171-
<String>XPROC</String>
12211+
<String>ANT</String>
1217212212
</list>
1217312213
</field>
1217412214
<field name="scenarioStorageLocations">
@@ -12199,7 +12239,7 @@ oxy:current-selected-element()[ancestor-or-self::*:cell[namespace-uri()='http://
1219912239
</scenarioAssociation>
1220012240
<scenarioAssociation>
1220112241
<field name="url">
12202-
<String>../../../../../../../Applications/Oxygen%20XML%20Editor/frameworks/tei/xml/tei/stylesheet/common/teianttasks.xml</String>
12242+
<String>file:/Applications/Oxygen%20XML%20Editor/frameworks/tei/xml/tei/stylesheet/common/teianttasks.xml</String>
1220312243
</field>
1220412244
<field name="scenarioIds">
1220512245
<list>
@@ -12377,26 +12417,6 @@ oxy:current-selected-element()[ancestor-or-self::*:cell[namespace-uri()='http://
1237712417
</list>
1237812418
</field>
1237912419
</scenarioAssociation>
12380-
<scenarioAssociation>
12381-
<field name="url">
12382-
<String>TEILex0.parts/02__entries.xml</String>
12383-
</field>
12384-
<field name="scenarioIds">
12385-
<list>
12386-
<String>TEILex0: Generate documentation</String>
12387-
</list>
12388-
</field>
12389-
<field name="scenarioTypes">
12390-
<list>
12391-
<String>XPROC</String>
12392-
</list>
12393-
</field>
12394-
<field name="scenarioStorageLocations">
12395-
<list>
12396-
<Byte>2</Byte>
12397-
</list>
12398-
</field>
12399-
</scenarioAssociation>
1240012420
<scenarioAssociation>
1240112421
<field name="url">
1240212422
<String>TEILex0.examples/examples.xml</String>
@@ -12980,7 +13000,7 @@ oxy:current-selected-element()[ancestor-or-self::*:cell[namespace-uri()='http://
1298013000
<String>TEI source file.</String>
1298113001
</field>
1298213002
<field name="value">
12983-
<null/>
13003+
<String>${framework(TEI P5)}/xml/tei/odd/p5subset.xml</String>
1298413004
</field>
1298513005
<field name="defaultValue">
1298613006
<null/>
@@ -13384,7 +13404,7 @@ oxy:current-selected-element()[ancestor-or-self::*:cell[namespace-uri()='http://
1338413404
<String>odd2oddSource</String>
1338513405
</field>
1338613406
<field name="value">
13387-
<String>${frameworksDir}/tei/xml/tei/stylesheet/odds/odd2odd.xsl</String>
13407+
<String>${framework(TEI P5)}/xml/tei/stylesheet/odds/odd2odd.xsl</String>
1338813408
</field>
1338913409
</xprocOption>
1339013410
<xprocOption>
@@ -13395,7 +13415,7 @@ oxy:current-selected-element()[ancestor-or-self::*:cell[namespace-uri()='http://
1339513415
<String>odd2liteSource</String>
1339613416
</field>
1339713417
<field name="value">
13398-
<String>${frameworksDir}/tei/xml/tei/stylesheet/odds/odd2lite.xsl</String>
13418+
<String>${framework(TEI P5)}/xml/tei/stylesheet/odds/odd2lite.xsl</String>
1339913419
</field>
1340013420
</xprocOption>
1340113421
</xprocOption-array>
@@ -13436,7 +13456,7 @@ oxy:current-selected-element()[ancestor-or-self::*:cell[namespace-uri()='http://
1343613456
<String>defaultSource</String>
1343713457
</field>
1343813458
<field name="value">
13439-
<String>${frameworks}/tei/xml/tei/odd/p5subset.xml</String>
13459+
<String>${framework(TEI P5)}/xml/tei/odd/p5subset.xml</String>
1344013460
</field>
1344113461
</xprocParameter>
1344213462
</xprocParameter-array>

‎Schemas/TEILex0/out/TEILex0.rng‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
xmlns:xlink="http://www.w3.org/1999/xlink"
66
datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
77
ns="http://www.tei-c.org/ns/1.0"><!--
8-
Schema generated from ODD source 2025-05-03T07:42:15Z. .
8+
Schema generated from ODD source 2025-05-12T14:44:10Z. .
99
TEI Edition: P5 Version 4.9.0. Last updated on 24th January 2025, revision f73186978
1010
TEI Edition Location: https://www.tei-c.org/Vault/P5/4.9.0/
1111
@@ -4971,16 +4971,20 @@ Suggested values include: 1] simple; 2] lemma; 3] variant; 4] compound; 5] deriv
49714971
<ref name="att.typed.attribute.subtype"/>
49724972
<attribute name="type">
49734973
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0">
4974-
Suggested values include: 1] pos; 2] aspect; 3] case; 4] gender; 5] inflectionType; 6] mood; 7] number; 8] tense; 9] valency; 10] collocate; 11] government</a:documentation>
4974+
Suggested values include: 1] pos; 2] aspect; 3] case; 4] degree; 5] gender; 6] government; 7] inflectionType; 8] mood; 9] number; 10] tense; 11] valency; 12] collocate</a:documentation>
49754975
<choice>
49764976
<value>pos</value>
49774977
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
49784978
<value>aspect</value>
49794979
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
49804980
<value>case</value>
49814981
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
4982+
<value>degree</value>
4983+
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
49824984
<value>gender</value>
49834985
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
4986+
<value>government</value>
4987+
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
49844988
<value>inflectionType</value>
49854989
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
49864990
<value>mood</value>
@@ -4993,8 +4997,6 @@ Suggested values include: 1] pos; 2] aspect; 3] case; 4] gender; 5] inflectionTy
49934997
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
49944998
<value>collocate</value>
49954999
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
4996-
<value>government</value>
4997-
<a:documentation xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"/>
49985000
<data type="Name"/>
49995001
</choice>
50005002
</attribute>
@@ -5165,15 +5167,15 @@ Suggested values include: 1] pos; 2] aspect; 3] case; 4] gender; 5] inflectionTy
51655167
<value>synonymy</value>
51665168
<a:documentation>Relation between two lexical units X and Y which are syntactically identical and have the property that any declarative sentence S containing X has equivalent truth conditions to another sentence S’ which is identical to S, except that X is replaced by Y. (Adapted from Cruse (1986).)</a:documentation>
51675169
<value>hyponymy</value>
5168-
<a:documentation>Relation between lexical units X and Y characterised by the property that the sentence This is a(n) X entails, but is not entailed by the sentence This is a(n) Y. (Adapted from Cruse (1986)) </a:documentation>
5170+
<a:documentation>Relation between lexical units X and Y characterised by the property that the sentence ‘This is a(n) X’ entails, but is not entailed by the sentence ‘This is a(n) Y’. (Adapted from Cruse (1986).) </a:documentation>
51695171
<value>hypernymy</value>
5170-
<a:documentation>Relation between lexical heads X and Y characterised by the property that the sentence This is a(n) Y entails, but is not entailed by the sentence This is a(n) X. (Adapted from Cruse (1986)) </a:documentation>
5172+
<a:documentation>Relation between lexical heads X and Y characterised by the property that the sentence ‘This is a(n) Y’ entails, but is not entailed by the sentence ‘This is a(n) X’. (Adapted from Cruse (1986).) </a:documentation>
51715173
<value>meronymy</value>
5172-
<a:documentation>An inclusion relation between lexical heads X and Y which reflect a potential part-whole relation between their referents in discourse. (Adapted from Cruse (2011, p. 140))</a:documentation>
5174+
<a:documentation>An inclusion relation between lexical heads X and Y which reflect a potential part-whole relation between their referents in discourse. (Adapted from Cruse (2011, p. 140).)</a:documentation>
51735175
<value>antonymy</value>
51745176
<a:documentation/>
51755177
<value>related</value>
5176-
<a:documentation>The default reference to another lexical unit when no addtional information is available.</a:documentation>
5178+
<a:documentation>The default reference to another lexical unit when no additional information is available.</a:documentation>
51775179
</choice>
51785180
</attribute>
51795181
<optional>

‎docs/pages/TEILex0/TEILex0.html‎

Lines changed: 64 additions & 63 deletions
Large diffs are not rendered by default.

‎docs/pages/TEILex0/spec.html‎

Lines changed: 64 additions & 63 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)