Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update examples based on work with the converter #74

Merged
merged 12 commits into from
Jan 8, 2024
Merged

Update examples based on work with the converter #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
bc18c0b
Add examples based on work with the converter
jmccrae Jan 1, 2024
d5cc2b0
Also limit XML line length in examples
jmccrae Jan 1, 2024
600c0bc
Issue 70: JSON properties plural when appropriate
michmech Jan 4, 2024
ae9a3ea
Issue 69: whitespace handling in XML
michmech Jan 4, 2024
a8cdd31
Issue 68: memberType.role becomes optional
michmech Jan 4, 2024
634b9e3
Issue: 67: member.obverseListingOrder becomes optional
michmech Jan 4, 2024
246d4b6
Issue 66: member.memberID becomes member.ref
michmech Jan 4, 2024
ef10025
Issue 65: which objects have IDs
michmech Jan 4, 2024
7d74143
Issue 53: JSON examples missing
michmech Jan 4, 2024
9e50b2b
Merge pull request #75 from michmech/master
DavidFatDavidF Jan 5, 2024
bb9cb4f
Merge branch 'master' into examples-61
jmccrae Jan 5, 2024
5273b49
Update based on changes in Spec
jmccrae Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions dmlex-v1.0/specification/core/objectTypes/label.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@

<example>
<title>JSON</title>
<para>Implemented as a string</para>
<programlisting>
"..."
</programlisting>
Expand Down
1 change: 1 addition & 0 deletions dmlex-v1.0/specification/core/objectTypes/partOfSpeech.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@

<example>
<title>JSON</title>
<para>Implemented as a string</para>
<programlisting>
"..."
</programlisting>
Expand Down
2 changes: 1 addition & 1 deletion dmlex-v1.0/specification/dmlex.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,7 +742,7 @@
<ulink url="https://www.oasis-open.org/committees/download.php/14809/xml-catalogs.html"
>https://www.oasis-open.org/committees/download.php/14809/xml-catalogs.html</ulink>
</citetitle> OASIS Standard V1.1, 07 October 2005.</bibliomixed>
<bibliomixed id="XMLSchema"><abbrev>XML Schema</abbrev> W3C, <title>XML Schema</title>,
<bibliomixed id="bib_XMLSchema"><abbrev>XML Schema</abbrev> W3C, <title>XML Schema</title>,
<citetitle> refers to the two part standard comprising <link linkend="XMLSchema1">[XML
Schema Structures]</link> and <link linkend="XMLSchema2">[XML Schema Datatypes]</link>
</citetitle> (Second Editions) W3C Recommendations 28 October 2004.</bibliomixed>
Expand Down
1 change: 1 addition & 0 deletions dmlex-v1.0/specification/examples/examples.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,5 @@
<xi:include href="examples/21.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="examples/22.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="examples/23.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<xi:include href="examples/24.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
</section>
80 changes: 3 additions & 77 deletions dmlex-v1.0/specification/examples/examples/00.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,88 +33,14 @@
</example>
<example>
<title>XML</title>
<programlisting>
&lt;lexicographicResource uri="http://example.com" langCode="en"&gt;
&lt;entry id="abandon-verb"&gt;
&lt;headword&gt;abandon&lt;/headword&gt;
&lt;partOfSpeech value="verb"/&gt;
&lt;sense id="abandon-verb-1"&gt;
&lt;definition&gt;to suddenly leave a place or a person&lt;/definition&gt;
&lt;example&gt;
&lt;text&gt;I'm sorry I abandoned you like that.&lt;/text&gt;
&lt;/example&gt;
&lt;example&gt;
&lt;text&gt;Abandon ship!&lt;/text&gt;
&lt;label value="idiom"/&gt;
&lt;/example&gt;
&lt;sense id="abandon-verb-2"&gt;
&lt;label value="mostly-passive"/&gt;
&lt;definition&gt;to stop supporting an idea&lt;/definition&gt;
&lt;example&gt;
&lt;text&gt;That theory has been abandoned.&lt;/text&gt;
&lt;/example&gt;
&lt;/sense&gt;
&lt;/entry&gt;
&lt;lexicographicResource&gt;
</programlisting>
<xi:include href="source/0.xml.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
</example>
<example>
<title>JSON</title>
<programlisting>
{
"uri": "http://example.com",
"langCode": "en",
"entry": {
"id": "abandon-verb",
"headword": "abandon",
"partsOfSpeech": ["verb"],
"senses": [{
"id": "abandon-verb-1",
"definitions": [{
"text": "to suddenly leave a place or a person"
}],
"examples": [{
"text": "I'm sorry I abandoned you like that."
}, {
"text": "Abandon ship!",
"labels": ["idiom"]
}]
}, {
"id": "abandon-verb-2",
"labels": ["mostly-passive"],
"definitions": ["to stop supporting an idea"],
"examples": [{
"text": "That theory has been abandoned."
}]
}]
}
}
</programlisting>
<xi:include href="source/0.json.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
</example>
<example>
<title>RDF</title>
<programlisting>
&lt;#my-dictionary&gt; dmlex:entry &lt;#abandon-verb&gt; .

&lt;abandon-verb&gt; dmlex:headword "abandon" ;
dmlex:partOfSpeech "verb" ;
dmlex:sense &lt;#abandon-verb-1"&gt; , &lt;#abandon-verb-2&gt; .

&lt;#abandon-verb-1&lt; dmlex:definition [
dmlex:text "to suddenly leave a place or a person" ] ;
dmlex:example [
dmlex:text "I'm sorry I abandoned you like that."
] , [
dmlex:text "Abandon ship!" ;
dmlex:labels "idiom" ] .


&lt;#abandon-verb-2"&gt;
dmlex:label "mostly-passive" ;
dmlex:definition [
dmlex:text "to stop supporting an idea" ] ;
dmlex:example [
dmlex:text "That theory has been abandoned." ] .
</programlisting>
<xi:include href="source/0.rdf.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
</example>
</section>
36 changes: 6 additions & 30 deletions dmlex-v1.0/specification/examples/examples/01.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,38 +24,14 @@
</example>
<example>
<title>XML</title>
<programlisting>
&lt;entry id="folúsghlantóir-n"&gt;
&lt;headword&gt;folúsghlantóir&lt;/headword&gt;
&lt;partOfSpeech tag="n-masc"/&gt;
&lt;inflectedForm tag="sg-gen"&gt;
&lt;text>folúsghlantóra&lt;/text>
&lt;/inflectedForm&gt;
&lt;inflectedForm tag="pl"&gt;
&lt;text>folúsghlantóirí&lt;/text>
&lt;/inflectedForm&gt;
&lt;sense&gt;...&lt;/sense&gt;
&lt;/entry&gt;
</programlisting>
<xi:include href="source/1.xml.xml"/>
</example>
<example>
<title>JSON</title>
<programlisting>
{
"id": "folúsghlantóir-n",
"headword": "folúsghlantóir",
"partsOfSpeech": ["n-masc"],
"inflectedForms": [{
"tag": "sg-gen",
"text": "folúsghlantóra"
}, {
"tag": "pl",
"text": "folúsghlantóirí"
}],
"senses": [...]
}
</programlisting>
<xi:include href="source/1.json.xml"/>
</example>
<example>
<title>RDF</title>
<xi:include href="source/1.rdf.xml"/>
</example>


</section>
27 changes: 6 additions & 21 deletions dmlex-v1.0/specification/examples/examples/02.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,29 +20,14 @@
</example>
<example>
<title>XML</title>
<programlisting>
&lt;entry id="aardvark-noun"&gt;
&lt;headword&gt;aardvark&lt;/headword&gt;
&lt;pronunciation&gt;
&lt;transcription&gt;a:rdva:rk&lt;/transcription&gt;
&lt;/pronunciation&gt;
&lt;sense&gt;...&lt;/sense&gt;
&lt;/entry&gt;
</programlisting>
<xi:include href="source/2.xml.xml"/>
</example>
<example>
<title>JSON</title>
<programlisting>
{
"id": "aardvark-noun",
"headword": "aardvark",
"pronunciations": [{
"transcriptions": [{"text": "a:rdva:rk"}]
}],
"senses": [...]
}
</programlisting>
<xi:include href="source/2.json.xml"/>
</example>
<example>
<title>RDF</title>
<xi:include href="source/2.rdf.xml"/>
</example>


</section>
24 changes: 6 additions & 18 deletions dmlex-v1.0/specification/examples/examples/03.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,26 +18,14 @@
</example>
<example>
<title>XML</title>
<programlisting>
&lt;entry id="aardvark-noun"&gt;
&lt;headword&gt;aardvark&lt;/headword&gt;
&lt;pronunciation soundFile="aardvark.mp3"/&gt;
&lt;sense&gt;...&lt;/sense&gt;
&lt;/entry&gt;
</programlisting>
<xi:include href="source/3.xml.xml"/>
</example>
<example>
<title>JSON</title>
<programlisting>
{
"id": "aardvark-noun",
"headword": "aardvark",
"pronunciations": [{
"soundFile": "aardvark.mp3"
}],
"senses": [...]
}
</programlisting>
<xi:include href="source/3.json.xml"/>
</example>
<example>
<title>RDF</title>
<xi:include href="source/3.rdf.xml"/>
</example>

</section>
27 changes: 6 additions & 21 deletions dmlex-v1.0/specification/examples/examples/04.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,29 +19,14 @@
</example>
<example>
<title>XML</title>
<programlisting>
&lt;entry id="aardvark-noun"&gt;
&lt;headword&gt;aardvark&lt;/headword&gt;
&lt;pronunciation soundFile="aardvark.mp3"&gt;
&lt;transcription&gt;a:rdva:rk&lt;/transcription&gt;
&lt;/pronunciation&gt;
&lt;sense&gt;...&lt;/sense&gt;
&lt;/entry&gt;
</programlisting>
<xi:include href="source/4.xml.xml"/>
</example>
<example>
<title>JSON</title>
<programlisting>
{
"id": "aardvark-noun",
"headword": "aardvark",
"pronunciations": [{
"soundFile": "aardvark.mp3",
"transcriptions": [{"text": "a:rdva:rk"}]
}],
"senses": [...]
}
</programlisting>
<xi:include href="source/4.json.xml"/>
</example>
<example>
<title>RDF</title>
<xi:include href="source/4.rdf.xml"/>
</example>

</section>
74 changes: 6 additions & 68 deletions dmlex-v1.0/specification/examples/examples/05.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,76 +32,14 @@
</example>
<example>
<title>XML</title>
<programlisting>
&lt;lexicographicResource uri="http://example.com" langCode="ga"&gt;
&lt;entry id="folúsghlantóir-n"&gt;
&lt;headword&gt;folúsghlantóir&lt;/headword&gt;
&lt;partOfSpeech value="n-masc"/&gt;
&lt;inflectedForm tag="sg-gen"&gt;
&lt;text>folúsghlantóra&lt;/text>
&lt;/inflectedForm&gt;
&lt;inflectedForm tag="pl"&gt;
&lt;text>folúsghlantóirí&lt;/text>
&lt;/inflectedForm&gt;
&lt;sense&gt;...&lt;/sense&gt;
&lt;/entry&gt;
&lt;partOfSpeechTag tag="n-masc"&gt;
&lt;description&gt;masculine noun&lt;/description&gt;
&lt;/partOfSpeechTag&gt;
&lt;partOfSpeechTag tag="n-fem"&gt;
&lt;description&gt;feminine noun&lt;/description&gt;
&lt;/partOfSpeechTag&gt;
&lt;inflectedFormTag tag="sg-gen"&gt;
&lt;description&gt;singular genitive&lt;/description&gt;
&lt;forPartOfSpeech tag="n-masc"/&gt;
&lt;forPartOfSpeech tag="n-fem"/&gt;
&lt;/tag&gt;
&lt;tag value="pl"&gt;
&lt;description&gt;plural&lt;/description&gt;
&lt;target value="inflectedTag"/&gt;
&lt;forPartOfSpeech tag="n-masc"/&gt;
&lt;forPartOfSpeech tag="n-fem"/&gt;
&lt;/tag&gt;
&lt;/lexicographicResource&gt;
</programlisting>
<xi:include href="source/5.xml.xml"/>
</example>
<example>
<title>JSON</title>
<programlisting>
{
"uri": "http://example.com",
"langCode": "ga",
"entries": [{
"id": "folúsghlantóir-n",
"headword": "folúsghlantóir",
"partsOfSpeech": ["n-masc"],
"inflectedForms": [{
"tag": "sg-gen",
"text": "folúsghlantóra"
}, {
"tag": "pl",
"text": "folúsghlantóirí"
}],
"senses": [...]
}],
"partOfSpeechTags": [{
"tag": "n-masc",
"description": "masculine noun"
}, {
"tag": "n-fem",
"description": "feminine noun"
}],
"inflectedFormTags": [{
"tag": "sg-gen",
"description": "singular genitive"
"forPartsOfSpeech": ["n-masc", "n-fem"]
}, {
"tag": "pl",
"description": "plural",
"forPartsOfSpeech": ["n-masc", "n-fem"]
}]
}
</programlisting>
<xi:include href="source/5.json.xml"/>
</example>
<example>
<title>RDF</title>
<xi:include href="source/5.rdf.xml"/>
</example>

</section>
Loading
Loading