From 49dc86a9d74e96747ea64f94566861764363d9cd Mon Sep 17 00:00:00 2001 From: "Daniel W. Hieber" Date: Sun, 12 Mar 2017 14:03:51 -0500 Subject: [PATCH] add autonym property to Language schema (#73) * add autonym property to Language schema * update docs --- docs/index.html | 2 +- docs/schemas/Abbreviation.html | 2 +- docs/schemas/Access.html | 2 +- docs/schemas/Address.html | 2 +- docs/schemas/Bundle.html | 2 +- docs/schemas/Contributor.html | 2 +- docs/schemas/DateCreated.html | 2 +- docs/schemas/DateModified.html | 2 +- docs/schemas/DateRecorded.html | 2 +- docs/schemas/Language.html | 35 +++++++++++++++++++++++++------ docs/schemas/Lexeme.html | 2 +- docs/schemas/LexemeReference.html | 2 +- docs/schemas/Lexicon.html | 2 +- docs/schemas/Location.html | 2 +- docs/schemas/Media.html | 2 +- docs/schemas/Morpheme.html | 2 +- docs/schemas/MultiLangString.html | 2 +- docs/schemas/Note.html | 2 +- docs/schemas/Orthography.html | 2 +- docs/schemas/Person.html | 2 +- docs/schemas/Phoneme.html | 2 +- docs/schemas/Phrase.html | 2 +- docs/schemas/Reference.html | 2 +- docs/schemas/Tags.html | 2 +- docs/schemas/Text.html | 2 +- docs/schemas/Url.html | 2 +- docs/schemas/Word.html | 4 ++-- package.json | 2 +- schemas/Language.json | 16 +++++++++----- schemas/Word.json | 2 +- 30 files changed, 69 insertions(+), 40 deletions(-) diff --git a/docs/index.html b/docs/index.html index dea7baef..1cb29882 100644 --- a/docs/index.html +++ b/docs/index.html @@ -244,7 +244,7 @@

Non-Linguistic Schemas

diff --git a/docs/schemas/Abbreviation.html b/docs/schemas/Abbreviation.html index c7a7801e..94eeb39b 100644 --- a/docs/schemas/Abbreviation.html +++ b/docs/schemas/Abbreviation.html @@ -75,7 +75,7 @@

Description

Home

Schemas

diff --git a/docs/schemas/Access.html b/docs/schemas/Access.html index 54c99823..d4ea1263 100644 --- a/docs/schemas/Access.html +++ b/docs/schemas/Access.html @@ -279,7 +279,7 @@

Allowed Values (enum)

Home

Schemas

diff --git a/docs/schemas/Address.html b/docs/schemas/Address.html index 3d1ff1b5..d341cac8 100644 --- a/docs/schemas/Address.html +++ b/docs/schemas/Address.html @@ -460,7 +460,7 @@

Description

Home

Schemas

diff --git a/docs/schemas/Bundle.html b/docs/schemas/Bundle.html index 7a4fbc7d..68dbe72d 100644 --- a/docs/schemas/Bundle.html +++ b/docs/schemas/Bundle.html @@ -624,7 +624,7 @@

URL: "url"

Home

Schemas

diff --git a/docs/schemas/Contributor.html b/docs/schemas/Contributor.html index 4235161e..3d21063d 100644 --- a/docs/schemas/Contributor.html +++ b/docs/schemas/Contributor.html @@ -274,7 +274,7 @@

Description

Home

Schemas

diff --git a/docs/schemas/DateCreated.html b/docs/schemas/DateCreated.html index 9b563432..8a78bdfa 100644 --- a/docs/schemas/DateCreated.html +++ b/docs/schemas/DateCreated.html @@ -75,7 +75,7 @@

Description

Home

Schemas

diff --git a/docs/schemas/DateModified.html b/docs/schemas/DateModified.html index c48abaea..e23fcf27 100644 --- a/docs/schemas/DateModified.html +++ b/docs/schemas/DateModified.html @@ -75,7 +75,7 @@

Description

Home

Schemas

diff --git a/docs/schemas/DateRecorded.html b/docs/schemas/DateRecorded.html index e87c0e60..cf87c18b 100644 --- a/docs/schemas/DateRecorded.html +++ b/docs/schemas/DateRecorded.html @@ -75,7 +75,7 @@

Description

Home

Schemas

diff --git a/docs/schemas/Language.html b/docs/schemas/Language.html index b18ddb99..caa27ad3 100644 --- a/docs/schemas/Language.html +++ b/docs/schemas/Language.html @@ -25,7 +25,7 @@

Language

Validate against: http://json-schema.org/schema#

-

Schema ID: http://cdn.digitallinguistics.io/schemas/Language-2.0.0.json

+

Schema ID: http://cdn.digitallinguistics.io/schemas/Language-2.1.0.json

@@ -106,7 +106,7 @@

Additional Names: "additionalNames"

Description

-

An array of additional names for this language.

+

An array of additional names or spellings for this language. Only use this property if the 'name' property is not sufficent to describe the various names for this language.

@@ -203,6 +203,29 @@

Description

+ + + + +
  • +
    + +
    + + +

    Autonym: "autonym"

    +     + + +
    +

    Description

    +

    The autonym for this language, optionally in multiple orthographies.

    +

    +
    + +

    Must be an instance of the MultiLangString schema.

    + +
    @@ -285,7 +308,7 @@

    Description

    -

    Regular expression pattern: [a-z]{4}[0-9]{4}

    +

    Regular expression pattern: ^[a-z]{4}[0-9]{4}$

    @@ -340,7 +363,7 @@

    Description

    -

    Regular expression pattern: [a-z]{3}

    +

    Regular expression pattern: ^[a-z]{3}$

    @@ -455,7 +478,7 @@

    Language Name: "name"

    Description

    -

    The name of this language, optionally in multiple orthographies.

    +

    The name of this language, optionally in multiple languages.

    @@ -666,7 +689,7 @@

    Description

    Home

    Schemas

    diff --git a/docs/schemas/Lexeme.html b/docs/schemas/Lexeme.html index 85a1fe07..a4cec927 100644 --- a/docs/schemas/Lexeme.html +++ b/docs/schemas/Lexeme.html @@ -2626,7 +2626,7 @@

    Default Value

    Home

    Schemas

    diff --git a/docs/schemas/LexemeReference.html b/docs/schemas/LexemeReference.html index d2f05dd8..c22f50f4 100644 --- a/docs/schemas/LexemeReference.html +++ b/docs/schemas/LexemeReference.html @@ -312,7 +312,7 @@

    Description

    Home

    Schemas

    diff --git a/docs/schemas/Lexicon.html b/docs/schemas/Lexicon.html index 4f0ae5dd..a56eb0f0 100644 --- a/docs/schemas/Lexicon.html +++ b/docs/schemas/Lexicon.html @@ -636,7 +636,7 @@

    Default Value

    Home

    Schemas

    diff --git a/docs/schemas/Location.html b/docs/schemas/Location.html index b4875711..1a27ab34 100644 --- a/docs/schemas/Location.html +++ b/docs/schemas/Location.html @@ -435,7 +435,7 @@

    Description

    Home

    Schemas

    diff --git a/docs/schemas/Media.html b/docs/schemas/Media.html index 3bfadd43..90fb4d48 100644 --- a/docs/schemas/Media.html +++ b/docs/schemas/Media.html @@ -943,7 +943,7 @@

    Description

    Home

    Schemas

    diff --git a/docs/schemas/Morpheme.html b/docs/schemas/Morpheme.html index c17d78eb..e7637f62 100644 --- a/docs/schemas/Morpheme.html +++ b/docs/schemas/Morpheme.html @@ -268,7 +268,7 @@

    Default Value

    Home

    Schemas

    diff --git a/docs/schemas/MultiLangString.html b/docs/schemas/MultiLangString.html index 9e3017a3..f55bf157 100644 --- a/docs/schemas/MultiLangString.html +++ b/docs/schemas/MultiLangString.html @@ -140,7 +140,7 @@

    Description

    Home

    Schemas

    diff --git a/docs/schemas/Note.html b/docs/schemas/Note.html index 610dc941..aea99ef3 100644 --- a/docs/schemas/Note.html +++ b/docs/schemas/Note.html @@ -333,7 +333,7 @@

    Allowed Values (enum)

    Home

    Schemas

    diff --git a/docs/schemas/Orthography.html b/docs/schemas/Orthography.html index d3b264fa..4691bf02 100644 --- a/docs/schemas/Orthography.html +++ b/docs/schemas/Orthography.html @@ -774,7 +774,7 @@

    Tags: "tags"

    Home

    Schemas

    diff --git a/docs/schemas/Person.html b/docs/schemas/Person.html index 9651e3c5..a5f46f2c 100644 --- a/docs/schemas/Person.html +++ b/docs/schemas/Person.html @@ -1170,7 +1170,7 @@

    URL: "url"

    Home

    Schemas

    diff --git a/docs/schemas/Phoneme.html b/docs/schemas/Phoneme.html index d4c705db..dcae1c5a 100644 --- a/docs/schemas/Phoneme.html +++ b/docs/schemas/Phoneme.html @@ -1209,7 +1209,7 @@

    Allowed Values (enum)

    Home

    Schemas

    diff --git a/docs/schemas/Phrase.html b/docs/schemas/Phrase.html index db726c16..cf3948f9 100644 --- a/docs/schemas/Phrase.html +++ b/docs/schemas/Phrase.html @@ -727,7 +727,7 @@

    Word

    Home

    Schemas

    diff --git a/docs/schemas/Reference.html b/docs/schemas/Reference.html index c4497201..51bd29c4 100644 --- a/docs/schemas/Reference.html +++ b/docs/schemas/Reference.html @@ -1300,7 +1300,7 @@

    Description

    Home

    Schemas

    diff --git a/docs/schemas/Tags.html b/docs/schemas/Tags.html index b3a66360..9a964b52 100644 --- a/docs/schemas/Tags.html +++ b/docs/schemas/Tags.html @@ -273,7 +273,7 @@

    Validates Against (oneOf)

    Home

    Schemas

    diff --git a/docs/schemas/Text.html b/docs/schemas/Text.html index d9af61fc..7d24c3e2 100644 --- a/docs/schemas/Text.html +++ b/docs/schemas/Text.html @@ -749,7 +749,7 @@

    URL: "url"

    Home

    Schemas

    diff --git a/docs/schemas/Url.html b/docs/schemas/Url.html index a2e6cc05..a3431696 100644 --- a/docs/schemas/Url.html +++ b/docs/schemas/Url.html @@ -75,7 +75,7 @@

    Description

    Home

    Schemas

    diff --git a/docs/schemas/Word.html b/docs/schemas/Word.html index e227bb86..9958fb67 100644 --- a/docs/schemas/Word.html +++ b/docs/schemas/Word.html @@ -322,7 +322,7 @@

    Phonemes: "phonemes"

    Description

    -

    An array of the phonemes in this word, in IPA.

    +

    An array of the phones (phoneme tokens) in this word, in IPA.

    @@ -760,7 +760,7 @@

    Description

    Home

    Schemas

    diff --git a/package.json b/package.json index 2c599c46..17802858 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@digitallinguistics/spec", - "version": "0.14.0", + "version": "0.14.1", "description": "The DLx format for representing linguistic data in JSON", "keywords": [ "DLx", diff --git a/schemas/Language.json b/schemas/Language.json index 285beb7a..d47cfcc9 100644 --- a/schemas/Language.json +++ b/schemas/Language.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/schema#", - "id": "http://cdn.digitallinguistics.io/schemas/Language-2.0.0.json", + "id": "http://cdn.digitallinguistics.io/schemas/Language-2.1.0.json", "title": "Language", "type": "object", @@ -22,7 +22,7 @@ "additionalNames": { "title": "Additional Names", "type": "array", - "description": "An array of additional names for this language.", + "description": "An array of additional names or spellings for this language. Only use this property if the 'name' property is not sufficent to describe the various names for this language.", "uniqueItems": true, "items": { "title": "Additional Name", @@ -31,6 +31,12 @@ } }, + "autonym": { + "title": "Autonym", + "description": "The autonym for this language, optionally in multiple orthographies.", + "$ref": "http://cdn.digitallinguistics.io/schemas/MultiLangString.json" + }, + "dateCreated": { "title": "Date Created", "description": "The date and optionally time that this Language object was created.", @@ -47,14 +53,14 @@ "title": "Glottolog Code", "type": "string", "description": "The Glottolog code for this language variety, as a String in the format abcd1234.", - "pattern": "[a-z]{4}[0-9]{4}" + "pattern": "^[a-z]{4}[0-9]{4}$" }, "iso": { "title": "ISO 639-3 Code", "type": "string", "description": "The ISO 639-3 code for this language variety, as a 3-letter String.", - "pattern": "[a-z]{3}" + "pattern": "^[a-z]{3}$" }, "locations": { @@ -70,7 +76,7 @@ "name": { "title": "Language Name", - "description": "The name of this language, optionally in multiple orthographies.", + "description": "The name of this language, optionally in multiple languages.", "$ref": "http://cdn.digitallinguistics.io/schemas/MultiLangString.json" }, diff --git a/schemas/Word.json b/schemas/Word.json index 8c74fc03..4a5e588f 100644 --- a/schemas/Word.json +++ b/schemas/Word.json @@ -54,7 +54,7 @@ "phonemes": { "title": "Phonemes", "type": "array", - "description": "An array of the phonemes in this word, in IPA.", + "description": "An array of the phones (phoneme tokens) in this word, in IPA.", "uniqueItems": false, "items": { "title": "Phone (Phoneme Token)",