X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Ftibdoc.g;fp=tests%2Ftibdoc.g;h=b3b107eb01a52e48a89e53ebdef0b148172a7b1c;hp=f851d985859c763306b31a57b8e43203e836d637;hb=4b5b35b9dbcf29da663c72d12aaf6ac3d2083d27;hpb=5ae7d4fd7c53dab6df9aae2e42579efabf66f49e

diff --git a/tests/tibdoc.g b/tests/tibdoc.g
index f851d98..b3b107e 100644
--- 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
@@ -165,7 +163,7 @@ url          = Mailto:: "mailto" ":"   email -> ~urlv
                   port:(":" nums)?
                   path:("/" urlpath)?
                   ref:("#" urlpath)?
-//                     -> ~(urlv|[\#])
+                     -> ~(urlv|[\#])
 url_login    = Login:: username:username password:(":" password) "@"
 method       = [+\-.a-z0-9]+
 domain       = (part +/ ".") -> ~"."