fix(Inline Content): Add audio, media and video objects; reorder prim…

…itives
stencila · Apr 12, 2021 · de6cfd5 · de6cfd5
1 parent 4acc3ba
commit de6cfd5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/py/stencila/schema/types.py b/py/stencila/schema/types.py
@@ -3973,7 +3973,7 @@ def __init__(
 """
 Union type for valid inline content.
 """
-InlineContent = Union["Cite", "CiteGroup", "CodeExpression", "CodeFragment", "Delete", "Emphasis", "ImageObject", "Link", "MathFragment", "NontextualAnnotation", "Note", "Quote", "Strong", "Subscript", "Superscript", int, float, bool, None, str]
+InlineContent = Union["AudioObject", "Cite", "CiteGroup", "CodeExpression", "CodeFragment", "Delete", "Emphasis", "ImageObject", "Link", "MathFragment", "MediaObject", "NontextualAnnotation", "Note", "Quote", "Strong", "Subscript", "Superscript", "VideoObject", None, bool, int, float, str]
 
 
 """

diff --git a/r/R/types.R b/r/R/types.R
@@ -4303,7 +4303,7 @@ GrantTypes <- Union(Grant, MonetaryGrant)
 #'
 #' @return A `list` of class `Union` describing valid subtypes of this type
 #' @export
-InlineContent <- Union(Cite, CiteGroup, CodeExpression, CodeFragment, Delete, Emphasis, ImageObject, Link, MathFragment, NontextualAnnotation, Note, Quote, Strong, Subscript, Superscript, "numeric", "logical", "NULL", "character")
+InlineContent <- Union(AudioObject, Cite, CiteGroup, CodeExpression, CodeFragment, Delete, Emphasis, ImageObject, Link, MathFragment, MediaObject, NontextualAnnotation, Note, Quote, Strong, Subscript, Superscript, VideoObject, "NULL", "logical", "numeric", "character")
 
 
 #' All type schemas that are derived from Mark

diff --git a/schema/InlineContent.schema.yaml b/schema/InlineContent.schema.yaml
@@ -9,6 +9,7 @@ $comment: |
   order of attempted coercion (particularly important for primitive types).
 anyOf:
   # Entity types in alphabetical order
+  - $ref: AudioObject
   - $ref: Cite
   - $ref: CiteGroup
   - $ref: CodeExpression
@@ -18,16 +19,18 @@ anyOf:
   - $ref: ImageObject
   - $ref: Link
   - $ref: MathFragment
+  - $ref: MediaObject
   - $ref: NontextualAnnotation
   - $ref: Note
   - $ref: Quote
   - $ref: Strong
   - $ref: Subscript
   - $ref: Superscript
-  # Primitive types in the order that coersion from
+  - $ref: VideoObject
+  # Primitive types in the order that coercion from
   # string should be attempted (for example by Ajv, or by serde_json).
+  - type: 'null'
+  - type: boolean
   - type: integer
   - type: number
-  - type: boolean
-  - type: 'null'
   - type: string