blockContainer

laws-africa · Nov 25, 2024 · 2615771 · 2615771
1 parent af6734f
commit 2615771
Show file tree

Hide file tree

Showing 8 changed files with 192 additions and 157 deletions.
diff --git a/bluebell/akn.peg b/bluebell/akn.peg
@@ -257,7 +257,7 @@ grammar akn
 
   nested_block_element <- indent content:block_element+ dedent <NestedBlockElement>
 
-  block_elements    <- block_list / bullet_list / generic_block / table / longtitle / footnote / block_quote / p / line
+  block_elements    <- block_list / bullet_list / table / longtitle / footnote / block_quote / blocks / p / line
 
   # ------------------------------------------------------------------------------
   # Speech blocks for debates
@@ -277,11 +277,6 @@ grammar akn
   # Actual block elements
   # ------------------------------------------------------------------------------
 
-  generic_block     <- 'BLOCK' attrs:block_attrs? eol
-                       indent
-                         content:block_element+
-                       dedent <GenericBlock>
-
   longtitle         <- 'LONGTITLE' body:(space content:inline+)? eol <Longtitle>
 
   subheading        <- 'SUBHEADING' body:(space content:inline+)? eol <Subheading>
@@ -297,6 +292,26 @@ grammar akn
                      # could start a line.
   line              <- !dedent content:inline+ eol <Line>
 
+  # ------------------------------------------------------------------------------
+  # Block container, which can contain other blocks
+  #
+  # Note: the intro and wrapUp contain blocks, which actually means they're not necessary because the blockContainer
+  #       can contain any block. So we just don't use them.
+  #
+  # BLOCKS
+  #   intro
+  #
+  #   ITEMS
+  #     ITEM 1
+  #
+  #   wrapUp
+
+                     # block container element, for grouping blocks
+  blocks            <- 'BLOCKS' attrs:block_attrs? eol
+                       indent
+                         content:block_element+
+                       dedent <BlockContainer>
+
 
   # ------------------------------------------------------------------------------
   # Block lists