Skip to content

Commit

Permalink
Language (#67)
Browse files Browse the repository at this point in the history
* minor updates to descriptions in Language object

* build

* make geoJSON a property of Location

* remove `custom` attribute from Access schema

* update Phoneme schema

* update docs

* separate upload script

* Morpheme.form > Morpheme.transcription

closes #64

* build

* version bump

* update example in readme
  • Loading branch information
dwhieb authored Mar 8, 2017
1 parent 23444ea commit 1c111c1
Show file tree
Hide file tree
Showing 35 changed files with 282 additions and 518 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ The DLx project recommends JSON because it has become the data interchange forma
},
"morphemes": [
{
"form": {
"transcription": {
"spa": "hola",
"ipa": "ola"
},
Expand All @@ -63,7 +63,7 @@ The DLx project recommends JSON because it has become the data interchange forma
},
"morphemes": [
{
"form": {
"transcription": {
"spa": "me",
"ipa": "me"
},
Expand All @@ -83,7 +83,7 @@ The DLx project recommends JSON because it has become the data interchange forma
},
"morphemes": [
{
"form": {
"transcription": {
"spa": "llam",
"ipa": "jam"
},
Expand All @@ -92,7 +92,7 @@ The DLx project recommends JSON because it has become the data interchange forma
}
},
{
"form": {
"transcription": {
"spa": "o",
"ipa": "o"
},
Expand All @@ -112,7 +112,7 @@ The DLx project recommends JSON because it has become the data interchange forma
},
"morphemes": [
{
"form": {
"transcription": {
"spa": "Daniel",
"ipa": "dænjəl"
},
Expand Down
2 changes: 1 addition & 1 deletion docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ <h3>Non-Linguistic Schemas</h3>
<nav>
<h1>Schemas</h1>
<ul>
<li><a href="schemas/Abbreviation.html">Abbreviation</a></li><li><a href="schemas/Address.html">Address</a></li><li><a href="schemas/Access.html">Access Rights</a></li><li><a href="schemas/Bundle.html">Bundle</a></li><li><a href="schemas/Contributor.html">Contributor</a></li><li><a href="schemas/DateCreated.html">Date Created</a></li><li><a href="schemas/DateModified.html">Date Modified</a></li><li><a href="schemas/DateRecorded.html">Date Recorded</a></li><li><a href="schemas/Language.html">Language</a></li><li><a href="schemas/Lexeme.html">Lexeme</a></li><li><a href="schemas/LexemeReference.html">Lexeme Reference</a></li><li><a href="schemas/Lexicon.html">Lexicon</a></li><li><a href="schemas/Media.html">Media File</a></li><li><a href="schemas/Location.html">Location</a></li><li><a href="schemas/MultiLangString.html">Multi-Language Text / String</a></li><li><a href="schemas/Note.html">Note</a></li><li><a href="schemas/Morpheme.html">Morpheme</a></li><li><a href="schemas/Person.html">Person</a></li><li><a href="schemas/Orthography.html">Orthography</a></li><li><a href="schemas/Phrase.html">Phrase</a></li><li><a href="schemas/Phoneme.html">Phoneme</a></li><li><a href="schemas/Text.html">Text</a></li><li><a href="schemas/Reference.html">Bibliographic Reference</a></li><li><a href="schemas/Tags.html">Tags</a></li><li><a href="schemas/Url.html">URL</a></li><li><a href="schemas/Word.html">Word</a></li>
<li><a href="schemas/Abbreviation.html">Abbreviation</a></li><li><a href="schemas/Access.html">Access Rights</a></li><li><a href="schemas/Bundle.html">Bundle</a></li><li><a href="schemas/Contributor.html">Contributor</a></li><li><a href="schemas/Address.html">Address</a></li><li><a href="schemas/DateModified.html">Date Modified</a></li><li><a href="schemas/DateRecorded.html">Date Recorded</a></li><li><a href="schemas/DateCreated.html">Date Created</a></li><li><a href="schemas/Language.html">Language</a></li><li><a href="schemas/Lexeme.html">Lexeme</a></li><li><a href="schemas/LexemeReference.html">Lexeme Reference</a></li><li><a href="schemas/Lexicon.html">Lexicon</a></li><li><a href="schemas/Media.html">Media File</a></li><li><a href="schemas/MultiLangString.html">Multi-Language Text / String</a></li><li><a href="schemas/Morpheme.html">Morpheme</a></li><li><a href="schemas/Note.html">Note</a></li><li><a href="schemas/Orthography.html">Orthography</a></li><li><a href="schemas/Person.html">Person</a></li><li><a href="schemas/Phoneme.html">Phoneme</a></li><li><a href="schemas/Phrase.html">Phrase</a></li><li><a href="schemas/Reference.html">Bibliographic Reference</a></li><li><a href="schemas/Text.html">Text</a></li><li><a href="schemas/Tags.html">Tags</a></li><li><a href="schemas/Url.html">URL</a></li><li><a href="schemas/Word.html">Word</a></li><li><a href="schemas/Location.html">Location</a></li>
</ul>
</nav>

Expand Down
2 changes: 1 addition & 1 deletion docs/schemas/Abbreviation.html
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h2>Description</h2>
<h1><a href=../index.html>Home</a></h1>
<h1>Schemas</h1>
<ul>
<li><a href="Abbreviation.html">Abbreviation</a></li><li><a href="Address.html">Address</a></li><li><a href="Access.html">Access Rights</a></li><li><a href="Bundle.html">Bundle</a></li><li><a href="Contributor.html">Contributor</a></li><li><a href="DateCreated.html">Date Created</a></li><li><a href="DateModified.html">Date Modified</a></li><li><a href="DateRecorded.html">Date Recorded</a></li><li><a href="Language.html">Language</a></li><li><a href="Lexeme.html">Lexeme</a></li><li><a href="LexemeReference.html">Lexeme Reference</a></li><li><a href="Lexicon.html">Lexicon</a></li><li><a href="Media.html">Media File</a></li><li><a href="Location.html">Location</a></li><li><a href="MultiLangString.html">Multi-Language Text / String</a></li><li><a href="Note.html">Note</a></li><li><a href="Morpheme.html">Morpheme</a></li><li><a href="Person.html">Person</a></li><li><a href="Orthography.html">Orthography</a></li><li><a href="Phrase.html">Phrase</a></li><li><a href="Phoneme.html">Phoneme</a></li><li><a href="Text.html">Text</a></li><li><a href="Reference.html">Bibliographic Reference</a></li><li><a href="Tags.html">Tags</a></li><li><a href="Url.html">URL</a></li><li><a href="Word.html">Word</a></li>
<li><a href="Abbreviation.html">Abbreviation</a></li><li><a href="Access.html">Access Rights</a></li><li><a href="Bundle.html">Bundle</a></li><li><a href="Contributor.html">Contributor</a></li><li><a href="Address.html">Address</a></li><li><a href="DateModified.html">Date Modified</a></li><li><a href="DateRecorded.html">Date Recorded</a></li><li><a href="DateCreated.html">Date Created</a></li><li><a href="Language.html">Language</a></li><li><a href="Lexeme.html">Lexeme</a></li><li><a href="LexemeReference.html">Lexeme Reference</a></li><li><a href="Lexicon.html">Lexicon</a></li><li><a href="Media.html">Media File</a></li><li><a href="MultiLangString.html">Multi-Language Text / String</a></li><li><a href="Morpheme.html">Morpheme</a></li><li><a href="Note.html">Note</a></li><li><a href="Orthography.html">Orthography</a></li><li><a href="Person.html">Person</a></li><li><a href="Phoneme.html">Phoneme</a></li><li><a href="Phrase.html">Phrase</a></li><li><a href="Reference.html">Bibliographic Reference</a></li><li><a href="Text.html">Text</a></li><li><a href="Tags.html">Tags</a></li><li><a href="Url.html">URL</a></li><li><a href="Word.html">Word</a></li><li><a href="Location.html">Location</a></li>
</ul>
</nav>

Expand Down
60 changes: 3 additions & 57 deletions docs/schemas/Access.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ <h1 class='title meta any prop'>Access Rights</h1>

<p class='$schema meta any prop'><strong>Validate against:</strong> <a href="http://json-schema.org/schema#">http://json-schema.org/schema#</a></p>

<p class='id meta any prop'><strong>Schema ID:</strong> <code>http://cdn.digitallinguistics.io/schemas/Access-1.0.0.json</code></p>
<p class='id meta any prop'><strong>Schema ID:</strong> <code>http://cdn.digitallinguistics.io/schemas/Access-2.0.0.json</code></p>


<div class='description meta any prop'>
<h2>Description</h2>
<p><p>The Access Rights object provides information for archives on who should be allowed to access the current resource. Some access protocols used by language archives are already supported, and a custom option is available as well. Additional access protocols may also be added by simply adding an attribute with the name of the relevant archive.</p>
<p><p>The Access Rights object provides information for archives on who should be allowed to access the current resource. Some access protocols used by language archives are already supported, and custom protocols may be used as, e.g. <code>online: false</code> or <code>permission: 'researcher only'</code>, etc..</p>
</p>
</div>

Expand Down Expand Up @@ -127,60 +127,6 @@ <h2>Description</h2>
</div>

<p class='$ref any prop'>Must be an instance of the <a href="MultiLangString.html">MultiLangString</a> schema.</p>


</details>

</section>
</li>
<li>
<section class=schema>

<details open>

<summary>
<h1 class='title meta any prop'>Custom Access Rights: <code>"custom"</code></h1>
</summary>





<div class='description meta any prop'>
<h2>Description</h2>
<p><p>Users can use their own access schema/protocol by adding a <code>custom</code> attribute to the Access Rights object.</p>
</p>
</div>

<p class='type any prop'><strong>Type:</strong> <code>string</code></p>






























</details>
Expand Down Expand Up @@ -333,7 +279,7 @@ <h2>Allowed Values (<code>enum</code>)</h2>
<h1><a href=../index.html>Home</a></h1>
<h1>Schemas</h1>
<ul>
<li><a href="Abbreviation.html">Abbreviation</a></li><li><a href="Address.html">Address</a></li><li><a href="Access.html">Access Rights</a></li><li><a href="Bundle.html">Bundle</a></li><li><a href="Contributor.html">Contributor</a></li><li><a href="DateCreated.html">Date Created</a></li><li><a href="DateModified.html">Date Modified</a></li><li><a href="DateRecorded.html">Date Recorded</a></li><li><a href="Language.html">Language</a></li><li><a href="Lexeme.html">Lexeme</a></li><li><a href="LexemeReference.html">Lexeme Reference</a></li><li><a href="Lexicon.html">Lexicon</a></li><li><a href="Media.html">Media File</a></li><li><a href="Location.html">Location</a></li><li><a href="MultiLangString.html">Multi-Language Text / String</a></li><li><a href="Note.html">Note</a></li><li><a href="Morpheme.html">Morpheme</a></li><li><a href="Person.html">Person</a></li><li><a href="Orthography.html">Orthography</a></li><li><a href="Phrase.html">Phrase</a></li><li><a href="Phoneme.html">Phoneme</a></li><li><a href="Text.html">Text</a></li><li><a href="Reference.html">Bibliographic Reference</a></li><li><a href="Tags.html">Tags</a></li><li><a href="Url.html">URL</a></li><li><a href="Word.html">Word</a></li>
<li><a href="Abbreviation.html">Abbreviation</a></li><li><a href="Access.html">Access Rights</a></li><li><a href="Bundle.html">Bundle</a></li><li><a href="Contributor.html">Contributor</a></li><li><a href="Address.html">Address</a></li><li><a href="DateModified.html">Date Modified</a></li><li><a href="DateRecorded.html">Date Recorded</a></li><li><a href="DateCreated.html">Date Created</a></li><li><a href="Language.html">Language</a></li><li><a href="Lexeme.html">Lexeme</a></li><li><a href="LexemeReference.html">Lexeme Reference</a></li><li><a href="Lexicon.html">Lexicon</a></li><li><a href="Media.html">Media File</a></li><li><a href="MultiLangString.html">Multi-Language Text / String</a></li><li><a href="Morpheme.html">Morpheme</a></li><li><a href="Note.html">Note</a></li><li><a href="Orthography.html">Orthography</a></li><li><a href="Person.html">Person</a></li><li><a href="Phoneme.html">Phoneme</a></li><li><a href="Phrase.html">Phrase</a></li><li><a href="Reference.html">Bibliographic Reference</a></li><li><a href="Text.html">Text</a></li><li><a href="Tags.html">Tags</a></li><li><a href="Url.html">URL</a></li><li><a href="Word.html">Word</a></li><li><a href="Location.html">Location</a></li>
</ul>
</nav>

Expand Down
2 changes: 1 addition & 1 deletion docs/schemas/Address.html
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ <h2>Description</h2>
<h1><a href=../index.html>Home</a></h1>
<h1>Schemas</h1>
<ul>
<li><a href="Abbreviation.html">Abbreviation</a></li><li><a href="Address.html">Address</a></li><li><a href="Access.html">Access Rights</a></li><li><a href="Bundle.html">Bundle</a></li><li><a href="Contributor.html">Contributor</a></li><li><a href="DateCreated.html">Date Created</a></li><li><a href="DateModified.html">Date Modified</a></li><li><a href="DateRecorded.html">Date Recorded</a></li><li><a href="Language.html">Language</a></li><li><a href="Lexeme.html">Lexeme</a></li><li><a href="LexemeReference.html">Lexeme Reference</a></li><li><a href="Lexicon.html">Lexicon</a></li><li><a href="Media.html">Media File</a></li><li><a href="Location.html">Location</a></li><li><a href="MultiLangString.html">Multi-Language Text / String</a></li><li><a href="Note.html">Note</a></li><li><a href="Morpheme.html">Morpheme</a></li><li><a href="Person.html">Person</a></li><li><a href="Orthography.html">Orthography</a></li><li><a href="Phrase.html">Phrase</a></li><li><a href="Phoneme.html">Phoneme</a></li><li><a href="Text.html">Text</a></li><li><a href="Reference.html">Bibliographic Reference</a></li><li><a href="Tags.html">Tags</a></li><li><a href="Url.html">URL</a></li><li><a href="Word.html">Word</a></li>
<li><a href="Abbreviation.html">Abbreviation</a></li><li><a href="Access.html">Access Rights</a></li><li><a href="Bundle.html">Bundle</a></li><li><a href="Contributor.html">Contributor</a></li><li><a href="Address.html">Address</a></li><li><a href="DateModified.html">Date Modified</a></li><li><a href="DateRecorded.html">Date Recorded</a></li><li><a href="DateCreated.html">Date Created</a></li><li><a href="Language.html">Language</a></li><li><a href="Lexeme.html">Lexeme</a></li><li><a href="LexemeReference.html">Lexeme Reference</a></li><li><a href="Lexicon.html">Lexicon</a></li><li><a href="Media.html">Media File</a></li><li><a href="MultiLangString.html">Multi-Language Text / String</a></li><li><a href="Morpheme.html">Morpheme</a></li><li><a href="Note.html">Note</a></li><li><a href="Orthography.html">Orthography</a></li><li><a href="Person.html">Person</a></li><li><a href="Phoneme.html">Phoneme</a></li><li><a href="Phrase.html">Phrase</a></li><li><a href="Reference.html">Bibliographic Reference</a></li><li><a href="Text.html">Text</a></li><li><a href="Tags.html">Tags</a></li><li><a href="Url.html">URL</a></li><li><a href="Word.html">Word</a></li><li><a href="Location.html">Location</a></li>
</ul>
</nav>

Expand Down
2 changes: 1 addition & 1 deletion docs/schemas/Bundle.html
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@ <h1 class='title meta any prop'>URL: <code>"url"</code></h1>
<h1><a href=../index.html>Home</a></h1>
<h1>Schemas</h1>
<ul>
<li><a href="Abbreviation.html">Abbreviation</a></li><li><a href="Address.html">Address</a></li><li><a href="Access.html">Access Rights</a></li><li><a href="Bundle.html">Bundle</a></li><li><a href="Contributor.html">Contributor</a></li><li><a href="DateCreated.html">Date Created</a></li><li><a href="DateModified.html">Date Modified</a></li><li><a href="DateRecorded.html">Date Recorded</a></li><li><a href="Language.html">Language</a></li><li><a href="Lexeme.html">Lexeme</a></li><li><a href="LexemeReference.html">Lexeme Reference</a></li><li><a href="Lexicon.html">Lexicon</a></li><li><a href="Media.html">Media File</a></li><li><a href="Location.html">Location</a></li><li><a href="MultiLangString.html">Multi-Language Text / String</a></li><li><a href="Note.html">Note</a></li><li><a href="Morpheme.html">Morpheme</a></li><li><a href="Person.html">Person</a></li><li><a href="Orthography.html">Orthography</a></li><li><a href="Phrase.html">Phrase</a></li><li><a href="Phoneme.html">Phoneme</a></li><li><a href="Text.html">Text</a></li><li><a href="Reference.html">Bibliographic Reference</a></li><li><a href="Tags.html">Tags</a></li><li><a href="Url.html">URL</a></li><li><a href="Word.html">Word</a></li>
<li><a href="Abbreviation.html">Abbreviation</a></li><li><a href="Access.html">Access Rights</a></li><li><a href="Bundle.html">Bundle</a></li><li><a href="Contributor.html">Contributor</a></li><li><a href="Address.html">Address</a></li><li><a href="DateModified.html">Date Modified</a></li><li><a href="DateRecorded.html">Date Recorded</a></li><li><a href="DateCreated.html">Date Created</a></li><li><a href="Language.html">Language</a></li><li><a href="Lexeme.html">Lexeme</a></li><li><a href="LexemeReference.html">Lexeme Reference</a></li><li><a href="Lexicon.html">Lexicon</a></li><li><a href="Media.html">Media File</a></li><li><a href="MultiLangString.html">Multi-Language Text / String</a></li><li><a href="Morpheme.html">Morpheme</a></li><li><a href="Note.html">Note</a></li><li><a href="Orthography.html">Orthography</a></li><li><a href="Person.html">Person</a></li><li><a href="Phoneme.html">Phoneme</a></li><li><a href="Phrase.html">Phrase</a></li><li><a href="Reference.html">Bibliographic Reference</a></li><li><a href="Text.html">Text</a></li><li><a href="Tags.html">Tags</a></li><li><a href="Url.html">URL</a></li><li><a href="Word.html">Word</a></li><li><a href="Location.html">Location</a></li>
</ul>
</nav>

Expand Down
2 changes: 1 addition & 1 deletion docs/schemas/Contributor.html
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ <h2>Description</h2>
<h1><a href=../index.html>Home</a></h1>
<h1>Schemas</h1>
<ul>
<li><a href="Abbreviation.html">Abbreviation</a></li><li><a href="Address.html">Address</a></li><li><a href="Access.html">Access Rights</a></li><li><a href="Bundle.html">Bundle</a></li><li><a href="Contributor.html">Contributor</a></li><li><a href="DateCreated.html">Date Created</a></li><li><a href="DateModified.html">Date Modified</a></li><li><a href="DateRecorded.html">Date Recorded</a></li><li><a href="Language.html">Language</a></li><li><a href="Lexeme.html">Lexeme</a></li><li><a href="LexemeReference.html">Lexeme Reference</a></li><li><a href="Lexicon.html">Lexicon</a></li><li><a href="Media.html">Media File</a></li><li><a href="Location.html">Location</a></li><li><a href="MultiLangString.html">Multi-Language Text / String</a></li><li><a href="Note.html">Note</a></li><li><a href="Morpheme.html">Morpheme</a></li><li><a href="Person.html">Person</a></li><li><a href="Orthography.html">Orthography</a></li><li><a href="Phrase.html">Phrase</a></li><li><a href="Phoneme.html">Phoneme</a></li><li><a href="Text.html">Text</a></li><li><a href="Reference.html">Bibliographic Reference</a></li><li><a href="Tags.html">Tags</a></li><li><a href="Url.html">URL</a></li><li><a href="Word.html">Word</a></li>
<li><a href="Abbreviation.html">Abbreviation</a></li><li><a href="Access.html">Access Rights</a></li><li><a href="Bundle.html">Bundle</a></li><li><a href="Contributor.html">Contributor</a></li><li><a href="Address.html">Address</a></li><li><a href="DateModified.html">Date Modified</a></li><li><a href="DateRecorded.html">Date Recorded</a></li><li><a href="DateCreated.html">Date Created</a></li><li><a href="Language.html">Language</a></li><li><a href="Lexeme.html">Lexeme</a></li><li><a href="LexemeReference.html">Lexeme Reference</a></li><li><a href="Lexicon.html">Lexicon</a></li><li><a href="Media.html">Media File</a></li><li><a href="MultiLangString.html">Multi-Language Text / String</a></li><li><a href="Morpheme.html">Morpheme</a></li><li><a href="Note.html">Note</a></li><li><a href="Orthography.html">Orthography</a></li><li><a href="Person.html">Person</a></li><li><a href="Phoneme.html">Phoneme</a></li><li><a href="Phrase.html">Phrase</a></li><li><a href="Reference.html">Bibliographic Reference</a></li><li><a href="Text.html">Text</a></li><li><a href="Tags.html">Tags</a></li><li><a href="Url.html">URL</a></li><li><a href="Word.html">Word</a></li><li><a href="Location.html">Location</a></li>
</ul>
</nav>

Expand Down
Loading

0 comments on commit 1c111c1

Please sign in to comment.