Skip to content

Commit

Permalink
Merge pull request #39 from jmccrae/master
Browse files Browse the repository at this point in the history
Some fixes in the RDF specification
  • Loading branch information
DavidFatDavidF authored Aug 29, 2023
2 parents d3ba5f3 + f9ba311 commit 1dcea78
Show file tree
Hide file tree
Showing 43 changed files with 552 additions and 372 deletions.
2 changes: 1 addition & 1 deletion dmlex-v1.0/specification/dmlex.xml
Original file line number Diff line number Diff line change
Expand Up @@ -718,7 +718,7 @@
<para>Krek, Simon - JSI </para>
</listitem>
<listitem>
<para>McCrae, John - National University of Ireland Galway </para>
<para>McCrae, John - University of Galway </para>
</listitem>
<listitem>
<para>Měchura, Michal - Masaryk University </para>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,16 @@
<section id="rdf_CollocateMarker">
<title>RDF element: <literal>dmlex:CollocateMarker</literal></title>

<para>DEFINITION MISSING</para>
<para>Marks up a substring other than the headword inside an example, inside an example translation or inside a definition.</para>


<itemizedlist>
<title>Properties</title>
<listitem>
<para><literal>dmlex:label</literal> reference to <olink targetptr="rdf_Label">Label</olink></para>
<para><literal>dmlex:label</literal> OPTIONAL reference to <olink targetptr="rdf_Label">Label</olink></para>
</listitem>
<listitem>
<para><literal>dmlex:lemma</literal> OPTIONAL (at most 1) of type <literal>http://www.w3.org/2001/XMLSchema#string</literal></para>
</listitem>
</itemizedlist>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@
<itemizedlist>
<title>Properties</title>
<listitem>
<para><literal>dmlex:listingOrder</literal> REQUIRED (exactly 1) of type <literal>http://www.w3.org/2001/XMLSchema#nonNegativeInteger</literal></para>
<para><literal>dmlex:listingOrder</literal> REQUIRED (exactly 1) of type <literal>http://www.w3.org/2001/XMLSchema#nonNegativeInteger</literal></para>
</listitem>
<listitem>
<para><literal>dmlex:text</literal> REQUIRED (exactly 1) of type <literal>http://www.w3.org/2000/01/rdf-schema#Literal</literal></para>
<para><literal>dmlex:text</literal> REQUIRED (exactly 1) of type <literal>http://www.w3.org/2000/01/rdf-schema#Literal</literal></para>
</listitem>
<listitem>
<para><literal>dmlex:definitionType</literal> OPTIONAL (at most 1) reference to <olink targetptr="rdf_DefinitionType">DefinitionType</olink></para>
<para><literal>dmlex:definitionType</literal> OPTIONAL (at most 1) reference to <olink targetptr="rdf_DefinitionType">DefinitionType</olink></para>
</listitem>
<listitem>
<para><literal>dmlex:headwordMarker</literal> reference to <olink targetptr="rdf_HeadwordMarker">HeadwordMarker</olink></para>
<para><literal>dmlex:headwordMarker</literal> OPTIONAL reference to <olink targetptr="rdf_HeadwordMarker">HeadwordMarker</olink></para>
</listitem>
<listitem>
<para><literal>dmlex:collocateMarker</literal> reference to <olink targetptr="rdf_CollocateMarker">CollocateMarker</olink></para>
<para><literal>dmlex:collocateMarker</literal> OPTIONAL reference to <olink targetptr="rdf_CollocateMarker">CollocateMarker</olink></para>
</listitem>
</itemizedlist>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
<itemizedlist>
<title>Properties</title>
<listitem>
<para><literal>dmlex:tag</literal> REQUIRED (exactly 1)</para>
<para><literal>dmlex:tag</literal> REQUIRED (exactly 1)</para>
</listitem>
<listitem>
<para><literal>dmlex:description</literal> REQUIRED (exactly 1) of type <literal>http://www.w3.org/2000/01/rdf-schema#Literal</literal></para>
<para><literal>dmlex:description</literal> OPTIONAL (at most 1) of type <literal>http://www.w3.org/2000/01/rdf-schema#Literal</literal></para>
</listitem>
</itemizedlist>

Expand Down
18 changes: 9 additions & 9 deletions dmlex-v1.0/specification/serializations/RDF/elements/Entry.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,31 +20,31 @@
<itemizedlist>
<title>Properties</title>
<listitem>
<para><literal>dmlex:headword</literal> REQUIRED (exactly 1) of type <literal>http://www.w3.org/2000/01/rdf-schema#Literal</literal></para>
<para><literal>dmlex:headword</literal> REQUIRED (exactly 1) of type <literal>http://www.w3.org/2000/01/rdf-schema#Literal</literal></para>
</listitem>
<listitem>
<para><literal>dmlex:homographNumber</literal> OPTIONAL (at most 1) of type <literal>http://www.w3.org/2001/XMLSchema#nonNegativeInteger</literal></para>
<para><literal>dmlex:homographNumber</literal> OPTIONAL (at most 1) of type <literal>http://www.w3.org/2001/XMLSchema#nonNegativeInteger</literal></para>
</listitem>
<listitem>
<para><literal>dmlex:sense</literal> reference to <olink targetptr="rdf_Sense">Sense</olink> (subproperty of <literal>http://www.w3.org/ns/lemon/ontolex#evokes</literal>)</para>
<para><literal>dmlex:sense</literal> OPTIONAL reference to <olink targetptr="rdf_Sense">Sense</olink> (subproperty of <literal>http://www.w3.org/ns/lemon/ontolex#evokes</literal>)</para>
</listitem>
<listitem>
<para><literal>dmlex:etymology</literal> reference to <olink targetptr="rdf_Etymology">Etymology</olink></para>
<para><literal>dmlex:etymology</literal> OPTIONAL reference to <olink targetptr="rdf_Etymology">Etymology</olink></para>
</listitem>
<listitem>
<para><literal>dmlex:partOfSpeech</literal> reference to <olink targetptr="rdf_PartOfSpeech">PartOfSpeech</olink></para>
<para><literal>dmlex:partOfSpeech</literal> OPTIONAL reference to <olink targetptr="rdf_PartOfSpeech">PartOfSpeech</olink></para>
</listitem>
<listitem>
<para><literal>dmlex:label</literal> reference to <olink targetptr="rdf_Label">Label</olink></para>
<para><literal>dmlex:label</literal> OPTIONAL reference to <olink targetptr="rdf_Label">Label</olink></para>
</listitem>
<listitem>
<para><literal>dmlex:pronunciation</literal> reference to <olink targetptr="rdf_Pronunciation">Pronunciation</olink></para>
<para><literal>dmlex:pronunciation</literal> OPTIONAL reference to <olink targetptr="rdf_Pronunciation">Pronunciation</olink></para>
</listitem>
<listitem>
<para><literal>dmlex:inflectedForm</literal> reference to <olink targetptr="rdf_InflectedForm">InflectedForm</olink></para>
<para><literal>dmlex:inflectedForm</literal> OPTIONAL reference to <olink targetptr="rdf_InflectedForm">InflectedForm</olink></para>
</listitem>
<listitem>
<para><literal>dmlex:placeholderMarker</literal> reference to <olink targetptr="rdf_PlaceholderMarker">PlaceholderMarker</olink></para>
<para><literal>dmlex:placeholderMarker</literal> OPTIONAL reference to <olink targetptr="rdf_PlaceholderMarker">PlaceholderMarker</olink></para>
</listitem>
</itemizedlist>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
<itemizedlist>
<title>Properties</title>
<listitem>
<para><literal>dmlex:listingOrder</literal> REQUIRED (exactly 1) of type <literal>http://www.w3.org/2001/XMLSchema#nonNegativeInteger</literal></para>
<para><literal>dmlex:listingOrder</literal> REQUIRED (exactly 1) of type <literal>http://www.w3.org/2001/XMLSchema#nonNegativeInteger</literal></para>
</listitem>
<listitem>
<para><literal>dmlex:description</literal> OPTIONAL (at most 1) of type <literal>http://www.w3.org/2000/01/rdf-schema#Literal</literal></para>
<para><literal>dmlex:description</literal> OPTIONAL (at most 1) of type <literal>http://www.w3.org/2000/01/rdf-schema#Literal</literal></para>
</listitem>
<listitem>
<para><literal>dmlex:etymon</literal> reference to <olink targetptr="rdf_Etymon">Etymon</olink></para>
<para><literal>dmlex:etymon</literal> OPTIONAL reference to <olink targetptr="rdf_Etymon">Etymon</olink></para>
</listitem>
</itemizedlist>

Expand Down
13 changes: 8 additions & 5 deletions dmlex-v1.0/specification/serializations/RDF/elements/Etymon.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,22 @@
<itemizedlist>
<title>Properties</title>
<listitem>
<para><literal>dmlex:type</literal> OPTIONAL (at most 1) of type <literal>http://www.w3.org/2001/XMLSchema#string</literal></para>
<para><literal>dmlex:listingOrder</literal> REQUIRED (exactly 1) of type <literal>http://www.w3.org/2001/XMLSchema#nonNegativeInteger</literal></para>
</listitem>
<listitem>
<para><literal>dmlex:when</literal> OPTIONAL (at most 1) of type <literal>http://www.w3.org/2001/XMLSchema#string</literal></para>
<para><literal>dmlex:type</literal> OPTIONAL (at most 1) of type <literal>http://www.w3.org/2001/XMLSchema#string</literal></para>
</listitem>
<listitem>
<para><literal>dmlex:note</literal> OPTIONAL (at most 1) of type <literal>http://www.w3.org/2001/XMLSchema#string</literal></para>
<para><literal>dmlex:when</literal> OPTIONAL (at most 1) of type <literal>http://www.w3.org/2001/XMLSchema#string</literal></para>
</listitem>
<listitem>
<para><literal>dmlex:etymonUnit</literal> REQUIRED (at least 1) reference to <olink targetptr="rdf_EtymonUnit">EtymonUnit</olink></para>
<para><literal>dmlex:note</literal> OPTIONAL (at most 1) of type <literal>http://www.w3.org/2001/XMLSchema#string</literal></para>
</listitem>
<listitem>
<para><literal>dmlex:translation</literal> OPTIONAL (at most 1) of type <literal>http://www.w3.org/2001/XMLSchema#string</literal></para>
<para><literal>dmlex:etymonUnit</literal> REQUIRED (at least 1) reference to <olink targetptr="rdf_EtymonUnit">EtymonUnit</olink></para>
</listitem>
<listitem>
<para><literal>dmlex:translation</literal> OPTIONAL (at most 1) of type <literal>http://www.w3.org/2001/XMLSchema#string</literal></para>
</listitem>
</itemizedlist>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
<itemizedlist>
<title>Properties</title>
<listitem>
<para><literal>dmlex:langCode</literal> REQUIRED (exactly 1) of type <literal>http://www.w3.org/2001/XMLSchema#language</literal></para>
<para><literal>dmlex:langCode</literal> REQUIRED (exactly 1) of type <literal>http://www.w3.org/2001/XMLSchema#language</literal></para>
</listitem>
<listitem>
<para><literal>dmlex:displayName</literal> OPTIONAL (at most 1) of type <literal>http://www.w3.org/2001/XMLSchema#string</literal></para>
<para><literal>dmlex:displayName</literal> OPTIONAL (at most 1) of type <literal>http://www.w3.org/2001/XMLSchema#string</literal></para>
</listitem>
</itemizedlist>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
<itemizedlist>
<title>Properties</title>
<listitem>
<para><literal>dmlex:description</literal> OPTIONAL (at most 1) of type <literal>http://www.w3.org/2000/01/rdf-schema#Literal</literal></para>
<para><literal>dmlex:description</literal> OPTIONAL (at most 1) of type <literal>http://www.w3.org/2000/01/rdf-schema#Literal</literal></para>
</listitem>
<listitem>
<para><literal>dmlex:type</literal> REQUIRED (exactly 1) of type <literal>http://www.w3.org/2001/XMLSchema#string</literal></para>
<para><literal>dmlex:type</literal> REQUIRED (exactly 1) of type <literal>http://www.w3.org/2001/XMLSchema#string</literal></para>
</listitem>
</itemizedlist>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@
<itemizedlist>
<title>Properties</title>
<listitem>
<para><literal>dmlex:listingOrder</literal> REQUIRED (exactly 1) of type <literal>http://www.w3.org/2001/XMLSchema#nonNegativeInteger</literal></para>
<para><literal>dmlex:listingOrder</literal> REQUIRED (exactly 1) of type <literal>http://www.w3.org/2001/XMLSchema#nonNegativeInteger</literal></para>
</listitem>
<listitem>
<para><literal>dmlex:language</literal> REQUIRED (exactly 1) of type <literal>http://www.w3.org/2001/XMLSchema#language</literal> (subproperty of <literal>http://www.w3.org/ns/lemon/lime#language</literal>)</para>
<para><literal>dmlex:language</literal> REQUIRED (exactly 1) of type <literal>http://www.w3.org/2001/XMLSchema#language</literal> (subproperty of <literal>http://www.w3.org/ns/lemon/lime#language</literal>)</para>
</listitem>
<listitem>
<para><literal>dmlex:partOfSpeech</literal> reference to <olink targetptr="rdf_PartOfSpeech">PartOfSpeech</olink></para>
<para><literal>dmlex:partOfSpeech</literal> OPTIONAL reference to <olink targetptr="rdf_PartOfSpeech">PartOfSpeech</olink></para>
</listitem>
<listitem>
<para><literal>dmlex:text</literal> REQUIRED (exactly 1) of type <literal>http://www.w3.org/2000/01/rdf-schema#Literal</literal></para>
<para><literal>dmlex:text</literal> REQUIRED (exactly 1) of type <literal>http://www.w3.org/2000/01/rdf-schema#Literal</literal></para>
</listitem>
<listitem>
<para><literal>dmlex:translation</literal> OPTIONAL (at most 1) of type <literal>http://www.w3.org/2001/XMLSchema#string</literal></para>
<para><literal>dmlex:translation</literal> OPTIONAL (at most 1) of type <literal>http://www.w3.org/2001/XMLSchema#string</literal></para>
</listitem>
<listitem>
<para><literal>dmlex:reconstructed</literal> OPTIONAL (at most 1) of type <literal>http://www.w3.org/2001/XMLSchema#boolean</literal></para>
<para><literal>dmlex:reconstructed</literal> OPTIONAL (at most 1) of type <literal>http://www.w3.org/2001/XMLSchema#boolean</literal></para>
</listitem>
</itemizedlist>

Expand Down
18 changes: 9 additions & 9 deletions dmlex-v1.0/specification/serializations/RDF/elements/Example.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,31 +14,31 @@
<itemizedlist>
<title>Properties</title>
<listitem>
<para><literal>dmlex:listingOrder</literal> REQUIRED (exactly 1) of type <literal>http://www.w3.org/2001/XMLSchema#nonNegativeInteger</literal></para>
<para><literal>dmlex:listingOrder</literal> REQUIRED (exactly 1) of type <literal>http://www.w3.org/2001/XMLSchema#nonNegativeInteger</literal></para>
</listitem>
<listitem>
<para><literal>dmlex:label</literal> reference to <olink targetptr="rdf_Label">Label</olink></para>
<para><literal>dmlex:label</literal> OPTIONAL reference to <olink targetptr="rdf_Label">Label</olink></para>
</listitem>
<listitem>
<para><literal>dmlex:text</literal> REQUIRED (exactly 1) of type <literal>http://www.w3.org/2000/01/rdf-schema#Literal</literal></para>
<para><literal>dmlex:text</literal> REQUIRED (exactly 1) of type <literal>http://www.w3.org/2000/01/rdf-schema#Literal</literal></para>
</listitem>
<listitem>
<para><literal>dmlex:soundFile</literal> OPTIONAL (at most 1) of type <literal>http://www.w3.org/2001/XMLSchema#anyURI</literal></para>
<para><literal>dmlex:soundFile</literal> OPTIONAL (at most 1) of type <literal>http://www.w3.org/2001/XMLSchema#anyURI</literal></para>
</listitem>
<listitem>
<para><literal>dmlex:sourceIdentity</literal> OPTIONAL (at most 1) of type <literal>http://www.w3.org/2000/01/rdf-schema#Literal</literal></para>
<para><literal>dmlex:sourceIdentity</literal> OPTIONAL (at most 1) of type <literal>http://www.w3.org/2000/01/rdf-schema#Literal</literal></para>
</listitem>
<listitem>
<para><literal>dmlex:sourceElaboration</literal> OPTIONAL (at most 1) of type <literal>http://www.w3.org/2000/01/rdf-schema#Literal</literal></para>
<para><literal>dmlex:sourceElaboration</literal> OPTIONAL (at most 1) of type <literal>http://www.w3.org/2000/01/rdf-schema#Literal</literal></para>
</listitem>
<listitem>
<para><literal>dmlex:exampleTranslation</literal> reference to <olink targetptr="rdf_ExampleTranslation">ExampleTranslation</olink></para>
<para><literal>dmlex:exampleTranslation</literal> OPTIONAL reference to <olink targetptr="rdf_ExampleTranslation">ExampleTranslation</olink></para>
</listitem>
<listitem>
<para><literal>dmlex:headwordMarker</literal> reference to <olink targetptr="rdf_HeadwordMarker">HeadwordMarker</olink></para>
<para><literal>dmlex:headwordMarker</literal> OPTIONAL reference to <olink targetptr="rdf_HeadwordMarker">HeadwordMarker</olink></para>
</listitem>
<listitem>
<para><literal>dmlex:collocateMarker</literal> reference to <olink targetptr="rdf_CollocateMarker">CollocateMarker</olink></para>
<para><literal>dmlex:collocateMarker</literal> OPTIONAL reference to <olink targetptr="rdf_CollocateMarker">CollocateMarker</olink></para>
</listitem>
</itemizedlist>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,25 @@
<itemizedlist>
<title>Properties</title>
<listitem>
<para><literal>dmlex:listingOrder</literal> of type <literal>http://www.w3.org/2001/XMLSchema#nonNegativeInteger</literal></para>
<para><literal>dmlex:listingOrder</literal> OPTIONAL of type <literal>http://www.w3.org/2001/XMLSchema#nonNegativeInteger</literal></para>
</listitem>
<listitem>
<para><literal>dmlex:language</literal> OPTIONAL (at most 1) of type <literal>http://www.w3.org/2001/XMLSchema#language</literal> (subproperty of <literal>http://www.w3.org/ns/lemon/lime#language</literal>)</para>
<para><literal>dmlex:language</literal> OPTIONAL (at most 1) of type <literal>http://www.w3.org/2001/XMLSchema#language</literal> (subproperty of <literal>http://www.w3.org/ns/lemon/lime#language</literal>)</para>
</listitem>
<listitem>
<para><literal>dmlex:label</literal> reference to <olink targetptr="rdf_Label">Label</olink></para>
<para><literal>dmlex:label</literal> OPTIONAL reference to <olink targetptr="rdf_Label">Label</olink></para>
</listitem>
<listitem>
<para><literal>dmlex:text</literal> REQUIRED (exactly 1) of type <literal>http://www.w3.org/2000/01/rdf-schema#Literal</literal></para>
<para><literal>dmlex:text</literal> REQUIRED (exactly 1) of type <literal>http://www.w3.org/2000/01/rdf-schema#Literal</literal></para>
</listitem>
<listitem>
<para><literal>dmlex:soundFile</literal> of type <literal>http://www.w3.org/2001/XMLSchema#anyURI</literal></para>
<para><literal>dmlex:soundFile</literal> OPTIONAL of type <literal>http://www.w3.org/2001/XMLSchema#anyURI</literal></para>
</listitem>
<listitem>
<para><literal>dmlex:headwordMarker</literal> reference to <olink targetptr="rdf_HeadwordMarker">HeadwordMarker</olink></para>
<para><literal>dmlex:headwordMarker</literal> OPTIONAL reference to <olink targetptr="rdf_HeadwordMarker">HeadwordMarker</olink></para>
</listitem>
<listitem>
<para><literal>dmlex:collocateMarker</literal> reference to <olink targetptr="rdf_CollocateMarker">CollocateMarker</olink></para>
<para><literal>dmlex:collocateMarker</literal> OPTIONAL reference to <olink targetptr="rdf_CollocateMarker">CollocateMarker</olink></para>
</listitem>
</itemizedlist>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
<itemizedlist>
<title>Properties</title>
<listitem>
<para><literal>dmlex:language</literal> OPTIONAL (at most 1) of type <literal>http://www.w3.org/2001/XMLSchema#language</literal> (subproperty of <literal>http://www.w3.org/ns/lemon/lime#language</literal>)</para>
<para><literal>dmlex:language</literal> OPTIONAL (at most 1) of type <literal>http://www.w3.org/2001/XMLSchema#language</literal> (subproperty of <literal>http://www.w3.org/ns/lemon/lime#language</literal>)</para>
</listitem>
<listitem>
<para><literal>dmlex:text</literal> REQUIRED (exactly 1) of type <literal>http://www.w3.org/2000/01/rdf-schema#Literal</literal></para>
<para><literal>dmlex:text</literal> REQUIRED (exactly 1) of type <literal>http://www.w3.org/2000/01/rdf-schema#Literal</literal></para>
</listitem>
</itemizedlist>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
<itemizedlist>
<title>Properties</title>
<listitem>
<para><literal>dmlex:startIndex</literal> REQUIRED (exactly 1) of type <literal>http://www.w3.org/2001/XMLSchema#string</literal></para>
<para><literal>dmlex:startIndex</literal> REQUIRED (exactly 1) of type <literal>http://www.w3.org/2001/XMLSchema#string</literal></para>
</listitem>
<listitem>
<para><literal>dmlex:endIndex</literal> REQUIRED (exactly 1) of type <literal>http://www.w3.org/2001/XMLSchema#string</literal></para>
<para><literal>dmlex:endIndex</literal> REQUIRED (exactly 1) of type <literal>http://www.w3.org/2001/XMLSchema#string</literal></para>
</listitem>
</itemizedlist>

Expand Down
Loading

0 comments on commit 1dcea78

Please sign in to comment.