fix: fully remove Text node

stencila · Mar 28, 2019 · 0242947 · 0242947
1 parent a6a3af9
commit 0242947
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 22 deletions.
diff --git a/examples/emphasis/simple.emphasis.yaml b/examples/emphasis/simple.emphasis.yaml
@@ -1,4 +1,4 @@
 type: Emphasis
 content:
   - Some emphasied text
-
+  
diff --git a/examples/paragraph/invalid.paragraph.yaml b/examples/paragraph/invalid.paragraph.yaml
@@ -1,3 +1,5 @@
 type: Paragraph
 content:
   - type: Paragraph
+    content:
+      - This paragraph should not be here
diff --git a/examples/table/invalid.table.yaml b/examples/table/invalid.table.yaml
@@ -0,0 +1,6 @@
+type: Table
+cells:
+  - true
+  - []
+  - type: Paragraph
+
diff --git a/schema/Include.schema.yaml b/schema/Include.schema.yaml
@@ -28,7 +28,6 @@ properties:
     oneOf:
       - $ref: Datatable.schema.yaml
       - $ref: Table.schema.yaml
-      - $ref: Text.schema.yaml
 additionalProperties: false
 required:
   - type

diff --git a/schema/Sheet.schema.yaml b/schema/Sheet.schema.yaml
@@ -18,7 +18,6 @@ allOf:
           - $ref: Include.schema.yaml
           - $ref: Datatable.schema.yaml
           - $ref: Table.schema.yaml
-          - $ref: Text.schema.yaml
 additionalProperties: false
 required:
   - type
diff --git a/schema/TableCell.schema.yaml b/schema/TableCell.schema.yaml
@@ -4,6 +4,7 @@ title: TableCell
 '@id': stencila:TableCell
 description: |
   A cell within a `Table`.
+type: object
 properties:
   type:
     enum: [TableCell]
@@ -49,8 +50,9 @@ properties:
     '@id': schema:content
     description: |
       Contents of the table cell.
-    allOf:
-      - $ref: inlineContent.schema.yaml
+    type: array
+    items:
+      $ref: inlineContent.schema.yaml
 additionalProperties: false
 required:
   - type

diff --git a/schema/Text.schema.yaml b/schema/Text.schema.yaml
diff --git a/schema/index.schema.yaml b/schema/index.schema.yaml
@@ -23,6 +23,5 @@ anyOf:
   - $ref: SoftwareSourceCode.schema.yaml
   - $ref: Table.schema.yaml
   - $ref: TableCell.schema.yaml
-  - $ref: Text.schema.yaml
   - $ref: Thing.schema.yaml
   - $ref: URL.schema.yaml