fix(Figure, Table): Add or update caption and label properties

stencila · Mar 16, 2020 · 34858db · 34858db
1 parent 565c73c
commit 34858db
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/schema/Figure.schema.yaml b/schema/Figure.schema.yaml
@@ -6,18 +6,18 @@ status: unstable
 category: prose
 description: Encapsulates one or more images, videos, tables, etc, and provides captions and labels for them.
 properties:
-  label:
-    '@id': stencila:label
-    description: A short label for the figure.
-    type: string
   caption:
     '@id': schema:caption
-    description: A caption to display for the figure.
+    description: A caption for the figure.
     $comment: |
-      To be compatible with https://schema.org/caption,
-      can be a string.
+      An array of nodes or, to be compatible with https://schema.org/caption,
+      a string.
     anyOf:
       - type: string
       - type: array
         items:
           $ref: Node
+  label:
+    '@id': stencila:label
+    description: A short label for the figure.
+    type: string
diff --git a/schema/Table.schema.yaml b/schema/Table.schema.yaml
@@ -6,6 +6,21 @@ status: unstable
 category: prose
 description: A table.
 properties:
+  caption:
+    '@id': schema:caption
+    description: A caption for the table.
+    $comment: |
+      An array of nodes or, to be compatible with https://schema.org/caption,
+      a string.
+    anyOf:
+      - type: string
+      - type: array
+        items:
+          $ref: Node
+  label:
+    '@id': stencila:label
+    description: A short label for the table.
+    type: string
   rows:
     '@id': stencila:rows
     description: |