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

diff --git a/tests/tibdoc.g b/tests/tibdoc.g
index 02fefcb..a1414d0 100644
--- a/tests/tibdoc.g
+++ b/tests/tibdoc.g
@@ -56,10 +56,10 @@ nw         = ~[\r\n\ ]
 
 s                   = Doc
 
-Doc                 = head:Header body:Body  /ws
-Header              = H:: { "header" { KeyVal */ ws } /ws }
-Body                = B:: {Section}*/ws
-Section             = SectionHeader Paragraph* /ws
+Doc                 = head:Header ws! body:Body
+Header              = { "\\header" { KeyVal */ ws } /ws }
+Body                = { Section } */ws
+Section             = SectionHeader ws! Paragraph*
 SectionHeader       = "==" SectionHeaderBody "=="
 SectionHeaderBody   =  "=" SectionHeaderBody "="
                     >      ws! alphanum++ ws!
@@ -67,11 +67,11 @@ SectionHeaderBody   =  "=" SectionHeaderBody "="
 sp       = " "**
 blank    = sp! "\n" sp! "\n" ws!
 
-KeyVal       = key:word "=" val:text /ws
+KeyVal       = key:bareword "=" val:text /ws
 wp           = w++
 num          = [0-9]++
 
-Paragraph   = Blockquote:: { "\"\" "    text }
+Paragraph   = { Blockquote:: "\"\" "    text }
             > HR::         { "---" "-"*      }
             > P::          { text            }
 
@@ -82,15 +82,12 @@ uli          =  "* "         (ws! text &~ any (oli|uli)!)
 oli          = ("# "|onums)! (ws! text &~ any (oli|uli)!)
 
 text         = Item
-Itemx        = ws! Item
-             | ()
-Item*/ws
-     =
-// "[]":: blockquote                 ((ws! Item) | ())
-//             >
-               { UL:: uli+/ws }           
+
+Item*/ws     =
+               blockquote
+             > { UL:: uli+/ws }           
              | { OL:: oli+/ws }           
-             > pre                        
+             > Verbatim
              > link                       
              > structured                 
              > styled                     
@@ -99,10 +96,12 @@ Item*/ws
              > (Symbol:: sym++)           
              > { Block:: text }           
 
+word = Chars:: bareword
 
+blockquote = "adsfafewag"
 //blockquote   = Blockquote:: "\"\"" (block | text "\"\"")
              
-pre          = Verbatim:: "[verbatim]" { ~[]+ } /ws   // FIXME doesn't work
+Verbatim     = "[verbatim]" ws! { (~[])++ }
 
 styled       = Underline::     "__" text "__"      
              | Footnote::      "((" text "))"      
@@ -118,18 +117,22 @@ styled       = Underline::     "__" text "__"
 
 block         = { text }
 
-link          = LinkText:: text:({ text })      "->" href:(url|email)
-              > LinkChars:: text:alphanum++  ws! "->" href:(url|email)
+link          = text:({ text }|word)  "->" href:(url|email)
 
 structured    = command & "\\" ([a-zA-Z0-9]++)! block?
               > glyph
               > email
               > url
 
-glyph        = Euro:: "(e)" | "(r)" | "(c)" | "(tm)" | emdash:: "--" | "..."
+glyph        = euro::     "(e)"
+             | r::        "(r)"
+             | c::        "(c)"
+             | tm::       "(tm)"
+             | emdash::   "--"
+             | ellipses:: "..."
+             | cent::     "\\cent"
 
-command      = Today::     "\\today"
-             | LineBreak:: "\\br"
+command      = "\\" [a-z]++
 
 // URLs //////////////////////////////////////////////////////////////////////////////
 
@@ -137,7 +140,7 @@ command      = Today::     "\\today"
 // subtypes of url (ftp, etc) as conjunctions, but the "master pattern"
 // only gets parsed once
 
-urlpath      = urlchar*
+urlpath      = urlchar* -> ~urlv           // this ~urlv should be handled by url! bug!
 username     = [a-zA-Z0-9;/?:&=$\-_.+]++
 password     = [a-zA-Z0-9;/?:&=$\-_.+]++
 urlc         = [a-zA-Z0-9;/?:&=$\-_.+@]
@@ -169,7 +172,7 @@ host         = IP::  nums "." nums "." nums "." nums
 
 // Tokens ///////////////////////////////////////////////////////////////////
 
-word       = alphanum++
+bareword   = alphanum++
            | quoted
 
 quoted     = "\"" ((~[\"\\] | escaped)+) "\""
@@ -184,5 +187,6 @@ escaped    = lf:: "\\n"
 alpha      = [a-zA-Z]
 alphanum   = [a-zA-Z0-9]
 sym        = ~[a-zA-Z0-9\ \r\n=\">]
+//sym        = [,()]