X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Ftibdoc.g;h=072c62501f3d7ac241399ad23e42298860c5756f;hp=a1414d0248177a60a3a583c0554a4142f3ec8db2;hb=d948b6363742aa34d9269cb4a49407e439ee896d;hpb=9773bb358e8010b24cc487f7cae19edcf8aea5d0

diff --git a/tests/tibdoc.g b/tests/tibdoc.g
index a1414d0..072c625 100644
--- a/tests/tibdoc.g
+++ b/tests/tibdoc.g
@@ -48,8 +48,9 @@
 //     [c] ...
 
 // FIXME: these have to go at the top so they have their dropAll bit set before PreSequence.build...
-ws         = w**
-w          =  [\r\n\ ]
+w          = " " | "\n" | "\r"
+ws         =  "()":: w**
+//           |  "()":: w** "#" (~[\n])* "\n" ws
 nw         = ~[\r\n\ ]
 
 //////////////////////////////////////////////////////////////////////////////
@@ -79,29 +80,34 @@ onums        = nums (". "|") ")!
 any          = ~[]*
 
 uli          =  "* "         (ws! text &~ any (oli|uli)!)
-oli          = ("# "|onums)! (ws! text &~ any (oli|uli)!)
+oli          = onums!        (ws! text &~ any (oli|uli)!)
 
 text         = Item
 
 Item*/ws     =
                blockquote
+//             > ^"#" ws! { ~[]* }
              > { UL:: uli+/ws }           
              | { OL:: oli+/ws }           
              > Verbatim
+             > InlineGrammar
              > link                       
              > structured                 
              > styled                     
              > (Chars:: alphanum++)       
              > "\"" text "\""             
              > (Symbol:: sym++)           
-             > { Block:: text }           
+             > { Block:: text }
 
 word = Chars:: bareword
 
 blockquote = "adsfafewag"
 //blockquote   = Blockquote:: "\"\"" (block | text "\"\"")
              
-Verbatim     = "[verbatim]" ws! { (~[])++ }
+Verbatim      = "[verbatim]" ws! { (~[])++ }
+
+#import meta.g as meta
+InlineGrammar = "\grammar"   ws! { meta.Grammar }
 
 styled       = Underline::     "__" text "__"      
              | Footnote::      "((" text "))"