table/col: metanorma/metanorma-standoc#251

metanorma · Dec 5, 2020 · ca8e20c · ca8e20c
1 parent 47d408a
commit ca8e20c
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 30 deletions.
diff --git a/images/StandardDoc_Blocks.png b/images/StandardDoc_Blocks.png
diff --git a/models/StandardDoc_Blocks.wsd b/models/StandardDoc_Blocks.wsd
@@ -26,6 +26,7 @@ Hystory of changes:
     - 07/09/2020: add to note contents
     - 09/09/2020: amend block
     - 06/11/2020: dl/@key
+    - 05/12/2020: table/colgroup
 '/
 
 '******* CONFIGURATION ************************************************
@@ -68,8 +69,8 @@ class DefinitionList <<BasicDocument>> {
 }
 
 class StandardNoteBlock {
-    +keep-lines-together: Boolean[0..1],
-    +keep-with-next: Boolean[0..1],
+    +keep-lines-together: Boolean[0..1]
+    +keep-with-next: Boolean[0..1]
     +number: String[0..1]
     +subsequence: String[0..1]
     +unnumbered: Boolean[0..1]
@@ -103,73 +104,78 @@ class TableBlock <<BasicDocument>> {
 class StandardTableBlock {
     +width: String[0..1]
     +number: String[0..1]
-    +keep-lines-together: Boolean[0..1],
-    +keep-with-next: Boolean[0..1],
+    +keep-lines-together: Boolean[0..1]
+    +keep-with-next: Boolean[0..1]
+    +colgroup: TableCol[0..*]
+}
+
+class TableCol {
+    +width: String[0..1]
 }
 
 class StandardFigureBlock {
     +number: String[0..1]
-    +keep-lines-together: Boolean[0..1],
-    +keep-with-next: Boolean[0..1],
+    +keep-lines-together: Boolean[0..1]
+    +keep-with-next: Boolean[0..1]
 }
 
 class StandardSourcecodeBlock {
     +number: String[0..1]
-    +keep-lines-together: Boolean[0..1],
-    +keep-with-next: Boolean[0..1],
+    +keep-lines-together: Boolean[0..1]
+    +keep-with-next: Boolean[0..1]
 }
 
 class StandardFormulaBlock {
     +number: String[0..1]
-    +keep-lines-together: Boolean[0..1],
-    +keep-with-next: Boolean[0..1],
+    +keep-lines-together: Boolean[0..1]
+    +keep-with-next: Boolean[0..1]
 }
 
 class StandardExampleBlock {
     +number: String[0..1]
-    +keep-lines-together: Boolean[0..1],
-    +keep-with-next: Boolean[0..1],
+    +keep-lines-together: Boolean[0..1]
+    +keep-with-next: Boolean[0..1]
 }
 
 class StandardParagraphBlock {
-    +keep-lines-together: Boolean[0..1],
-    +keep-with-next: Boolean[0..1],
+    +keep-lines-together: Boolean[0..1]
+    +keep-with-next: Boolean[0..1]
 }
 
 class StandardQuoteBlock {
-    +keep-lines-together: Boolean[0..1],
-    +keep-with-next: Boolean[0..1],
+    +keep-lines-together: Boolean[0..1]
+    +keep-with-next: Boolean[0..1]
 }
 
 class StandardAdmonitionBlock {
-    +keep-lines-together: Boolean[0..1],
-    +keep-with-next: Boolean[0..1],
+    +keep-lines-together: Boolean[0..1]
+    +keep-with-next: Boolean[0..1]
 }
 
 class StandardUnorderedList {
-    +keep-lines-together: Boolean[0..1],
-    +keep-with-next: Boolean[0..1],
+    +keep-lines-together: Boolean[0..1]
+    +keep-with-next: Boolean[0..1]
 }
 
 class StandardDefinitionList {
-    +keep-lines-together: Boolean[0..1],
-    +keep-with-next: Boolean[0..1],
+    +keep-lines-together: Boolean[0..1]
+    +keep-with-next: Boolean[0..1]
     +key: Boolean[0..1]
 }
 
 class AmendBlock {
-    +change: ChangeType,
-    +bibLocality: BibItemLocality[0..*],
-    +path: String[0..1],
-    +path_end: String[0..1],
-    +name: String[0..1],
-    +description: BasicBlock[0..*],
-    +autonumber: AutoNumber[0..*],
+    +change: ChangeType
+    +bibLocality: BibItemLocality[0..*]
+    +path: String[0..1]
+    +path_end: String[0..1]
+    +name: String[0..1]
+    +description: BasicBlock[0..*]
+    +autonumber: AutoNumber[0..*]
     +newcontent: BasicBlock[0..*]
 }
 
 class AutoNumber {
-    +type: ElementName,
+    +type: ElementName
     +value: String
 }
 
@@ -207,6 +213,7 @@ NoteBlock <|-- StandardNoteBlock
 UnorderedList <|-- StandardUnorderedList
 ListItem <|-- UnorderedCheckableListItem
 TableBlock <|-- StandardTableBlock
+StandardTableBlock <-- TableCol
 BasicDocument <-- FigureBlock
 FigureBlock <|-- StandardFigureBlock
 BasicDocument <-- SourcecodeBlock