X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Ftibdoc.g;h=56a84c60136705e8486406452a2635a95354be0d;hp=ec31d30dadd269c693174ffa0b21081719892537;hb=bb4357ee026741cacecdfbfdcdd2d44699306536;hpb=03f91bd299c8c8724fe966f527b7410d2cea675d

diff --git a/tests/tibdoc.g b/tests/tibdoc.g
index ec31d30..56a84c6 100644
--- a/tests/tibdoc.g
+++ b/tests/tibdoc.g
@@ -56,9 +56,9 @@ nw         = ~[\r\n\ ]
 
 s                   = Doc
 
-Doc                 = Doc:: head:{Header} body:Body   /ws
-Header              = Header:: "header" attrs:{ kv */ ws }     /ws
-Body                = Body:: sections:(Section*/ws)
+Doc                 = head:{Header} body:Body  /ws
+Header              = "header" attrs:{ kv */ ws }  /ws
+Body                = Section*/ws
 Section             = { Section:: header:SectionHeader paragraphs:Paragraph* /ws }
 SectionHeader       = "==" SectionHeaderBody "=="
 SectionHeaderBody   =  "=" SectionHeaderBody "="
@@ -67,7 +67,7 @@ SectionHeaderBody   =  "=" SectionHeaderBody "="
 sp       = " "**
 blank    = !sp "\n" !sp "\n" !ws
 
-kv           = kv:: key:word "=" val:text /ws
+kv           = key:word "=" val:text /ws
 wp           = w++
 num          = [0-9]++
 Paragraph    = Blockquote:: { "\"\" "    text }
@@ -77,8 +77,8 @@ Paragraph    = Blockquote:: { "\"\" "    text }
 onums        = nums !(". "|") ")
 any          = ~[]*
 
-uli          =  "* "         (!ws text &~ any (oli|uli))
-oli          = !("# "|onums) (!ws text &~ any (oli|uli))
+uli          =  "* "         (!ws text &~ any !(oli|uli))
+oli          = !("# "|onums) (!ws text &~ any !(oli|uli))
 
 text         = Item
 Itemx        = !ws Item
@@ -92,7 +92,7 @@ Item         = blockquote
              > "[]":: styled                     Itemx
              > "[]":: (Chars:: text:alphanum++)  Itemx
              > "[]":: "\"" text "\""             Itemx
-             > "[]":: symbol                     Itemx
+//           > "[]":: symbol                     Itemx
              > "[]":: (Symbol:: sym++)           Itemx
              > "[]":: Paragraph                  Itemx
 
@@ -118,7 +118,7 @@ block         = { text }
 link          = Link:: text:({ text })      "->" href:(url|email)
               > Link:: text:alphanum++  !ws "->" href:(url|email)
 
-structured    = command & "\\" [a-zA-Z0-9]++ block?
+structured    = command & "\\" !([a-zA-Z0-9]++) block?
               > glyph
               > email
               > url