update list construction pattern so that sublists are added to actual…

… ListItems Signed-off-by: Panos Vagenas <[email protected]>
DS4SD · Feb 24, 2025 · 7aa36a0 · 7aa36a0
1 parent 78e211f
commit 7aa36a0
Show file tree

Hide file tree

Showing 13 changed files with 83 additions and 77 deletions.
diff --git a/test/data/doc/constructed_doc.dt b/test/data/doc/constructed_doc.dt
@@ -14,8 +14,8 @@ Affiliation 2</text>
 <ordered_list><list_item>list item 3.c.i</list_item>
 </ordered_list>
 </ordered_list>
-<list_item>list item 4</list_item>
 </unordered_list>
+<list_item>list item 4</list_item>
 <otsl><fcel>Product<fcel>Years<lcel><nl><ucel><fcel>2016<fcel>2017<nl><fcel>Apple<fcel>49823<fcel>695944<nl><caption>This is the caption of table 1.</caption></otsl>
 <picture><caption>This is the caption of figure 1.</caption></picture>
 <picture><caption>This is the caption of figure 2.</caption></picture>

diff --git a/test/data/doc/constructed_doc.dt.gt b/test/data/doc/constructed_doc.dt.gt
@@ -14,8 +14,8 @@ Affiliation 2</text>
 <ordered_list><list_item>list item 3.c.i</list_item>
 </ordered_list>
 </ordered_list>
-<list_item>list item 4</list_item>
 </unordered_list>
+<list_item>list item 4</list_item>
 <otsl><fcel>Product<fcel>Years<lcel><nl><ucel><fcel>2016<fcel>2017<nl><fcel>Apple<fcel>49823<fcel>695944<nl><caption>This is the caption of table 1.</caption></otsl>
 <picture><caption>This is the caption of figure 1.</caption></picture>
 <picture><caption>This is the caption of figure 2.</caption></picture>

diff --git a/test/data/doc/constructed_doc.embedded.html.gt b/test/data/doc/constructed_doc.embedded.html.gt
@@ -86,8 +86,8 @@
 <li>list item 3.c.i</li>
 </ol>
 </ol>
-<li>list item 4</li>
 </ul>
+<li>list item 4</li>
 <table><caption>This is the caption of table 1.</caption><tbody><tr><td rowspan="2">Product</td><td colspan="2">Years</td></tr><tr><td>2016</td><td>2017</td></tr><tr><td>Apple</td><td>49823</td><td>695944</td></tr></tbody></table>
 <figure><figcaption>This is the caption of figure 1.</figcaption></figure>
 <figure><figcaption>This is the caption of figure 2.</figcaption><img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAIAAAAlC+aJAAAAIklEQVR4nO3BAQ0AAADCoPdPbQ8HFAAAAAAAAAAAAAAA8G4wQAABiwCo9wAAAABJRU5ErkJggg=="></figure>

diff --git a/test/data/doc/constructed_doc.embedded.json.gt b/test/data/doc/constructed_doc.embedded.json.gt
@@ -104,9 +104,6 @@
         {
           "$ref": "#/texts/7"
         },
-        {
-          "$ref": "#/groups/2"
-        },
         {
           "$ref": "#/texts/12"
         }
@@ -118,7 +115,7 @@
     {
       "self_ref": "#/groups/2",
       "parent": {
-        "$ref": "#/groups/1"
+        "$ref": "#/texts/7"
       },
       "children": [
         {
@@ -129,9 +126,6 @@
         },
         {
           "$ref": "#/texts/10"
-        },
-        {
-          "$ref": "#/groups/3"
         }
       ],
       "content_layer": "body",
@@ -141,7 +135,7 @@
     {
       "self_ref": "#/groups/3",
       "parent": {
-        "$ref": "#/groups/2"
+        "$ref": "#/texts/10"
       },
       "children": [
         {
@@ -197,9 +191,6 @@
         },
         {
           "$ref": "#/texts/20"
-        },
-        {
-          "$ref": "#/groups/7"
         }
       ],
       "content_layer": "body",
@@ -209,7 +200,7 @@
     {
       "self_ref": "#/groups/7",
       "parent": {
-        "$ref": "#/groups/6"
+        "$ref": "#/texts/20"
       },
       "children": [
         {
@@ -369,7 +360,11 @@
       "parent": {
         "$ref": "#/groups/1"
       },
-      "children": [],
+      "children": [
+        {
+          "$ref": "#/groups/2"
+        }
+      ],
       "content_layer": "body",
       "label": "list_item",
       "prov": [],
@@ -411,7 +406,11 @@
       "parent": {
         "$ref": "#/groups/2"
       },
-      "children": [],
+      "children": [
+        {
+          "$ref": "#/groups/3"
+        }
+      ],
       "content_layer": "body",
       "label": "list_item",
       "prov": [],
@@ -545,7 +544,11 @@
       "parent": {
         "$ref": "#/groups/6"
       },
-      "children": [],
+      "children": [
+        {
+          "$ref": "#/groups/7"
+        }
+      ],
       "content_layer": "body",
       "label": "list_item",
       "prov": [],

diff --git a/test/data/doc/constructed_doc.embedded.yaml.gt b/test/data/doc/constructed_doc.embedded.yaml.gt
@@ -70,7 +70,6 @@ groups:
   - $ref: '#/texts/5'
   - $ref: '#/texts/6'
   - $ref: '#/texts/7'
-  - $ref: '#/groups/2'
   - $ref: '#/texts/12'
   content_layer: body
   label: list
@@ -82,20 +81,19 @@ groups:
   - $ref: '#/texts/8'
   - $ref: '#/texts/9'
   - $ref: '#/texts/10'
-  - $ref: '#/groups/3'
   content_layer: body
   label: ordered_list
   name: group
   parent:
-    $ref: '#/groups/1'
+    $ref: '#/texts/7'
   self_ref: '#/groups/2'
 - children:
   - $ref: '#/texts/11'
   content_layer: body
   label: ordered_list
   name: group
   parent:
-    $ref: '#/groups/2'
+    $ref: '#/texts/10'
   self_ref: '#/groups/3'
 - children:
   - $ref: '#/groups/5'
@@ -118,7 +116,6 @@ groups:
 - children:
   - $ref: '#/texts/19'
   - $ref: '#/texts/20'
-  - $ref: '#/groups/7'
   content_layer: body
   label: list
   name: group
@@ -133,7 +130,7 @@ groups:
   label: list
   name: group
   parent:
-    $ref: '#/groups/6'
+    $ref: '#/texts/20'
   self_ref: '#/groups/7'
 - children:
   - $ref: '#/texts/22'
@@ -474,7 +471,8 @@ texts:
   prov: []
   self_ref: '#/texts/6'
   text: list item 2
-- children: []
+- children:
+  - $ref: '#/groups/2'
   content_layer: body
   enumerated: false
   label: list_item
@@ -507,7 +505,8 @@ texts:
   prov: []
   self_ref: '#/texts/9'
   text: list item 3.b
-- children: []
+- children:
+  - $ref: '#/groups/3'
   content_layer: body
   enumerated: false
   label: list_item
@@ -611,7 +610,8 @@ texts:
   prov: []
   self_ref: '#/texts/19'
   text: item 1 of neighboring list
-- children: []
+- children:
+  - $ref: '#/groups/7'
   content_layer: body
   enumerated: false
   label: list_item

diff --git a/test/data/doc/constructed_doc.placeholder.html.gt b/test/data/doc/constructed_doc.placeholder.html.gt
@@ -86,8 +86,8 @@
 <li>list item 3.c.i</li>
 </ol>
 </ol>
-<li>list item 4</li>
 </ul>
+<li>list item 4</li>
 <table><caption>This is the caption of table 1.</caption><tbody><tr><td rowspan="2">Product</td><td colspan="2">Years</td></tr><tr><td>2016</td><td>2017</td></tr><tr><td>Apple</td><td>49823</td><td>695944</td></tr></tbody></table>
 <figure><figcaption>This is the caption of figure 1.</figcaption></figure>
 <figure><figcaption>This is the caption of figure 2.</figcaption></figure>

diff --git a/test/data/doc/constructed_doc.referenced.html.gt b/test/data/doc/constructed_doc.referenced.html.gt
@@ -86,8 +86,8 @@
 <li>list item 3.c.i</li>
 </ol>
 </ol>
-<li>list item 4</li>
 </ul>
+<li>list item 4</li>
 <table><caption>This is the caption of table 1.</caption><tbody><tr><td rowspan="2">Product</td><td colspan="2">Years</td></tr><tr><td>2016</td><td>2017</td></tr><tr><td>Apple</td><td>49823</td><td>695944</td></tr></tbody></table>
 <figure><figcaption>This is the caption of figure 1.</figcaption></figure>
 <figure><figcaption>This is the caption of figure 2.</figcaption><img src="constructed_images/image_000001_f3cc103136423a57975750907ebc1d367e2985ac6338976d4d5a439f50323f4a.png"></figure>

diff --git a/test/data/doc/constructed_doc.referenced.json.gt b/test/data/doc/constructed_doc.referenced.json.gt
@@ -104,9 +104,6 @@
         {
           "$ref": "#/texts/7"
         },
-        {
-          "$ref": "#/groups/2"
-        },
         {
           "$ref": "#/texts/12"
         }
@@ -118,7 +115,7 @@
     {
       "self_ref": "#/groups/2",
       "parent": {
-        "$ref": "#/groups/1"
+        "$ref": "#/texts/7"
       },
       "children": [
         {
@@ -129,9 +126,6 @@
         },
         {
           "$ref": "#/texts/10"
-        },
-        {
-          "$ref": "#/groups/3"
         }
       ],
       "content_layer": "body",
@@ -141,7 +135,7 @@
     {
       "self_ref": "#/groups/3",
       "parent": {
-        "$ref": "#/groups/2"
+        "$ref": "#/texts/10"
       },
       "children": [
         {
@@ -197,9 +191,6 @@
         },
         {
           "$ref": "#/texts/20"
-        },
-        {
-          "$ref": "#/groups/7"
         }
       ],
       "content_layer": "body",
@@ -209,7 +200,7 @@
     {
       "self_ref": "#/groups/7",
       "parent": {
-        "$ref": "#/groups/6"
+        "$ref": "#/texts/20"
       },
       "children": [
         {
@@ -369,7 +360,11 @@
       "parent": {
         "$ref": "#/groups/1"
       },
-      "children": [],
+      "children": [
+        {
+          "$ref": "#/groups/2"
+        }
+      ],
       "content_layer": "body",
       "label": "list_item",
       "prov": [],
@@ -411,7 +406,11 @@
       "parent": {
         "$ref": "#/groups/2"
       },
-      "children": [],
+      "children": [
+        {
+          "$ref": "#/groups/3"
+        }
+      ],
       "content_layer": "body",
       "label": "list_item",
       "prov": [],
@@ -545,7 +544,11 @@
       "parent": {
         "$ref": "#/groups/6"
       },
-      "children": [],
+      "children": [
+        {
+          "$ref": "#/groups/7"
+        }
+      ],
       "content_layer": "body",
       "label": "list_item",
       "prov": [],

diff --git a/test/data/doc/constructed_doc.referenced.yaml.gt b/test/data/doc/constructed_doc.referenced.yaml.gt
@@ -70,7 +70,6 @@ groups:
   - $ref: '#/texts/5'
   - $ref: '#/texts/6'
   - $ref: '#/texts/7'
-  - $ref: '#/groups/2'
   - $ref: '#/texts/12'
   content_layer: body
   label: list
@@ -82,20 +81,19 @@ groups:
   - $ref: '#/texts/8'
   - $ref: '#/texts/9'
   - $ref: '#/texts/10'
-  - $ref: '#/groups/3'
   content_layer: body
   label: ordered_list
   name: group
   parent:
-    $ref: '#/groups/1'
+    $ref: '#/texts/7'
   self_ref: '#/groups/2'
 - children:
   - $ref: '#/texts/11'
   content_layer: body
   label: ordered_list
   name: group
   parent:
-    $ref: '#/groups/2'
+    $ref: '#/texts/10'
   self_ref: '#/groups/3'
 - children:
   - $ref: '#/groups/5'
@@ -118,7 +116,6 @@ groups:
 - children:
   - $ref: '#/texts/19'
   - $ref: '#/texts/20'
-  - $ref: '#/groups/7'
   content_layer: body
   label: list
   name: group
@@ -133,7 +130,7 @@ groups:
   label: list
   name: group
   parent:
-    $ref: '#/groups/6'
+    $ref: '#/texts/20'
   self_ref: '#/groups/7'
 - children:
   - $ref: '#/texts/22'
@@ -474,7 +471,8 @@ texts:
   prov: []
   self_ref: '#/texts/6'
   text: list item 2
-- children: []
+- children:
+  - $ref: '#/groups/2'
   content_layer: body
   enumerated: false
   label: list_item
@@ -507,7 +505,8 @@ texts:
   prov: []
   self_ref: '#/texts/9'
   text: list item 3.b
-- children: []
+- children:
+  - $ref: '#/groups/3'
   content_layer: body
   enumerated: false
   label: list_item
@@ -611,7 +610,8 @@ texts:
   prov: []
   self_ref: '#/texts/19'
   text: item 1 of neighboring list
-- children: []
+- children:
+  - $ref: '#/groups/7'
   content_layer: body
   enumerated: false
   label: list_item