X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Ftibdoc.g;h=b3b107eb01a52e48a89e53ebdef0b148172a7b1c;hp=a1414d0248177a60a3a583c0554a4142f3ec8db2;hb=22a2ca7685dcf29e9ddcc6e26443ea0277385fca;hpb=92d14ef4956f39a591363709ed95bfa2999dc319

diff --git a/tests/tibdoc.g b/tests/tibdoc.g
index a1414d0..b3b107e 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\ ]
 
 //////////////////////////////////////////////////////////////////////////////
@@ -62,7 +63,7 @@ Body                = { Section } */ws
 Section             = SectionHeader ws! Paragraph*
 SectionHeader       = "==" SectionHeaderBody "=="
 SectionHeaderBody   =  "=" SectionHeaderBody "="
-                    >      ws! alphanum++ ws!
+                    >      ws! text ws!
 
 sp       = " "**
 blank    = sp! "\n" sp! "\n" ws!
@@ -73,35 +74,39 @@ num          = [0-9]++
 
 Paragraph   = { Blockquote:: "\"\" "    text }
             > HR::         { "---" "-"*      }
-            > P::          { text            }
+            >         { OL:: (text &~ (text! ws! {oli}+)) ws! {oli}+  }
+            > P::          { text          }
 
 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
-             > { UL:: uli+/ws }           
-             | { OL:: oli+/ws }           
+//             > ^"#" ws! { ~[]* }
              > Verbatim
+             > InlineGrammar
              > link                       
              > structured                 
              > styled                     
              > (Chars:: alphanum++)       
-             > "\"" text "\""             
+             > Quotes:: "\"" 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 "))"      
@@ -117,7 +122,8 @@ styled       = Underline::     "__" text "__"
 
 block         = { text }
 
-link          = text:({ text }|word)  "->" href:(url|email)
+link          = text:({ text }|word)  "->" ws! href:href
+href          = url | email | {href}
 
 structured    = command & "\\" ([a-zA-Z0-9]++)! block?
               > glyph
@@ -134,6 +140,7 @@ glyph        = euro::     "(e)"
 
 command      = "\\" [a-z]++
 
+
 // URLs //////////////////////////////////////////////////////////////////////////////
 
 // interesting opportunity to show off boolean grammars here: define other
@@ -155,7 +162,8 @@ url          = Mailto:: "mailto" ":"   email -> ~urlv
                   host:host
                   port:(":" nums)?
                   path:("/" urlpath)?
-                     -> ~urlv
+                  ref:("#" urlpath)?
+                     -> ~(urlv|[\#])
 url_login    = Login:: username:username password:(":" password) "@"
 method       = [+\-.a-z0-9]+
 domain       = (part +/ ".") -> ~"."