diff --git a/docs/index.html b/docs/index.html index eccba87a..39bac183 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 da3930c7..c38c9dda 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 85687ae3..b5500728 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 2e5086b1..e5cfa292 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 243b4be7..4ea8ee15 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 ad7c995f..8b07e1bb 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 057eae62..efc10018 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 5971a07a..8b33ca9e 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 f6d771cc..7fa8b51d 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 ba7fe5c6..f307aa72 100644 --- a/docs/schemas/Language.html +++ b/docs/schemas/Language.html @@ -689,7 +689,7 @@

Description

Home

Schemas

diff --git a/docs/schemas/Lexeme.html b/docs/schemas/Lexeme.html index 4de427f6..37f8189b 100644 --- a/docs/schemas/Lexeme.html +++ b/docs/schemas/Lexeme.html @@ -25,7 +25,7 @@

Lexeme

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

-

Schema ID: http://cdn.digitallinguistics.io/schemas/Lexeme-1.0.1.json

+

Schema ID: http://cdn.digitallinguistics.io/schemas/Lexeme-1.1.0.json

@@ -2007,6 +2007,91 @@

Description

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

    Media: "media"

    +     + + + + + +
    +

    Description

    +

    Media items associated with this lexeme, such as recordings of the word, pictures of the item the word refers to, or videos of the action being performed.

    +

    +
    + +

    Type: array

    + + + + + + + + + + + + + + + + + + + + + + + + + +

    + Unique items: true +

    + +
    + +

    Items

    + + +
    + +
    + + +

    Media Item

    +     + + +
    +

    Description

    +

    A media item associated with this lexeme.

    +

    +
    + +

    Must be an instance of the Media schema.

    + + +
    + +
    + +
    + + + +
    @@ -2626,7 +2711,7 @@

    Default Value

    Home

    Schemas

    diff --git a/docs/schemas/LexemeReference.html b/docs/schemas/LexemeReference.html index 07772aad..8bf6eb67 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 2cec4adb..119dbfd0 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 2244e60e..0a6df1fa 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 cb456679..d9cdabe5 100644 --- a/docs/schemas/Media.html +++ b/docs/schemas/Media.html @@ -25,7 +25,7 @@

    Media File

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

    -

    Schema ID: http://cdn.digitallinguistics.io/schemas/Media-1.0.1.json

    +

    Schema ID: http://cdn.digitallinguistics.io/schemas/Media-1.1.0.json

    @@ -57,8 +57,6 @@

    Required Properties

    • filename
    • format
      • -
    • languages
      • -
    • mediaUrl
    @@ -634,7 +632,7 @@

    Media URL: "mediaUrl"

    Description

    -

    The URL where the media file itself can be found.

    +

    The URL where the media file can be found.

    @@ -892,6 +890,11 @@

    Tags: "tags"

    +
    +

    Description

    +

    A set of tags for this media item

    +

    +

    Must be an instance of the Tags schema.

    @@ -912,7 +915,7 @@

    URL: "url"

    Description

    -

    The URL where this media object can be retrieved. NOT the URL of the media file itself (for that, see the mediaUrl attribute).

    +

    The URL where this media data can be retrieved. NOT the URL of the media file itself (for that, see the mediaUrl attribute).

    @@ -943,7 +946,7 @@

    Description

    Home

    Schemas

    diff --git a/docs/schemas/Morpheme.html b/docs/schemas/Morpheme.html index 4c54abd0..54dfebbb 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 17c4a5a3..f2851558 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 4579f90f..e00e4345 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 afa0ef4e..a251dafc 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 bd44e1ad..f187171e 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 196a1f8f..7ee5178c 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 887fa035..e72c5257 100644 --- a/docs/schemas/Phrase.html +++ b/docs/schemas/Phrase.html @@ -750,7 +750,7 @@

    Word

    Home

    Schemas

    diff --git a/docs/schemas/Reference.html b/docs/schemas/Reference.html index 37f73190..890b041f 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 b48f4e22..931abb92 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 a6580b1f..bd4aabfa 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 5ea0bda6..38f16e11 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 1a42b8bb..79346586 100644 --- a/docs/schemas/Word.html +++ b/docs/schemas/Word.html @@ -760,7 +760,7 @@

    Description

    Home

    Schemas

    diff --git a/package.json b/package.json index 36e78d6a..968cb86e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@digitallinguistics/spec", - "version": "0.14.1", + "version": "0.14.2", "description": "The DLx format for representing linguistic data in JSON", "keywords": [ "DLx", diff --git a/schemas/Lexeme.json b/schemas/Lexeme.json index f3d4ce05..52a8aa2f 100644 --- a/schemas/Lexeme.json +++ b/schemas/Lexeme.json @@ -1,7 +1,7 @@ { "$schema": "http://json-schema.org/schema#", - "id": "http://cdn.digitallinguistics.io/schemas/Lexeme-1.0.1.json", + "id": "http://cdn.digitallinguistics.io/schemas/Lexeme-1.1.0.json", "title": "Lexeme", "type": "object", @@ -380,6 +380,22 @@ }, + "media": { + + "title": "Media", + "type": "array", + "description": "Media items associated with this lexeme, such as recordings of the word, pictures of the item the word refers to, or videos of the action being performed.", + + "uniqueItems": true, + + "items": { + "title": "Media Item", + "description": "A media item associated with this lexeme.", + "$ref": "http://cdn.digitallinguistics.io/schemas/Media.json" + } + + }, + "notes": { "title": "Notes", diff --git a/schemas/Media.json b/schemas/Media.json index c9169ffd..1bc6ead9 100644 --- a/schemas/Media.json +++ b/schemas/Media.json @@ -1,6 +1,7 @@ { + "$schema": "http://json-schema.org/schema#", - "id": "http://cdn.digitallinguistics.io/schemas/Media-1.0.1.json", + "id": "http://cdn.digitallinguistics.io/schemas/Media-1.1.0.json", "title": "Media File", "type": "object", @@ -8,9 +9,7 @@ "required": [ "filename", - "format", - "languages", - "mediaUrl" + "format" ], "additionalProperties": true, @@ -106,7 +105,7 @@ "mediaUrl": { "title": "Media URL", - "description": "The URL where the media file itself can be found.", + "description": "The URL where the media file can be found.", "$ref": "http://cdn.digitallinguistics.io/schemas/Url.json" }, @@ -146,12 +145,13 @@ "tags": { "title": "Tags", + "description": "A set of tags for this media item", "$ref": "http://cdn.digitallinguistics.io/schemas/Tags.json" }, "url": { "title": "URL", - "description": "The URL where this media object can be retrieved. *NOT* the URL of the media file itself (for that, see the `mediaUrl` attribute).", + "description": "The URL where this media data can be retrieved. *NOT* the URL of the media file itself (for that, see the `mediaUrl` attribute).", "$ref": "http://cdn.digitallinguistics.io/schemas/Url.json" }