s = Doc
-Doc = head:Header body:Body /ws
+Doc = head:Header ws! body:Body
Header = { "header" { KeyVal */ ws } /ws }
-Body = {Section}*/ws
+Body = { Section } */ws
Section = SectionHeader ws! Paragraph*
SectionHeader = "==" SectionHeaderBody "=="
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 }
> (Chars:: alphanum++)
> "\"" text "\""
> (Symbol:: sym++)
-// > { Block:: text }
+ > { Block:: text }
+
+word = Chars:: bareword
blockquote = "adsfafewag"
//blockquote = Blockquote:: "\"\"" (block | text "\"\"")
// 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;/?:&=$\-_.+@]
// Tokens ///////////////////////////////////////////////////////////////////
-word = alphanum++
+bareword = alphanum++
| quoted
quoted = "\"" ((~[\"\\] | escaped)+) "\""
alpha = [a-zA-Z]
alphanum = [a-zA-Z0-9]
sym = ~[a-zA-Z0-9\ \r\n=\">]
+//sym = [,()]