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!
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 }
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
> (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 "))"
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 //////////////////////////////////////////////////////////////////////////////
// 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 = [,()]