update metagrammar

[sbp.git] / tests / tibdoc.g

diff --git a/tests/tibdoc.g b/tests/tibdoc.g
index 8a0928a..b3b107e 100644 (file)
--- a/tests/tibdoc.g
+++ b/tests/tibdoc.g
@@ -74,9 +74,8 @@ num          = [0-9]++
 
 Paragraph   = { Blockquote:: "\"\" "    text }
             > HR::         { "---" "-"*      }
-            > P::          { UL:: uli+/ws }
-            > P::          { OL:: oli+/ws }
-            > P::          { text            }
+            >         { OL:: (text &~ (text! ws! {oli}+)) ws! {oli}+  }
+            > P::          { text          }
 
 onums        = nums (". "|") ")!
 any          = ~[]*
@@ -89,8 +88,6 @@ text         = Item
 Item*/ws     =
                blockquote
 //             > ^"#" ws! { ~[]* }
-             > { UL:: uli+/ws }           
-             | { OL:: oli+/ws }           
              > Verbatim
              > InlineGrammar
              > link                       
@@ -143,6 +140,7 @@ glyph        = euro::     "(e)"
 
 command      = "\\" [a-z]++
 
+
 // URLs //////////////////////////////////////////////////////////////////////////////
 
 // interesting opportunity to show off boolean grammars here: define other