s = Doc
-Doc = Doc:: head:{Header} body:Body /ws
-Header = Header:: "header" attrs:{ kv */ ws } /ws
-Body = Body:: sections:(Section*/ws)
-Section = { Section:: header:SectionHeader paragraphs:Paragraph* /ws }
+Doc = head:{Header} body:Body /ws
+Header = "header" attrs:{ KeyVal */ ws } /ws
+Body = {Section}*/ws
+Section = SectionHeader Paragraph* /ws
SectionHeader = "==" SectionHeaderBody "=="
SectionHeaderBody = "=" SectionHeaderBody "="
- > !ws (Chars:: text:alphanum++) !ws
+ > !ws alphanum++ !ws
sp = " "**
blank = !sp "\n" !sp "\n" !ws
-
-kv = kv:: key:word "=" val:text /ws
+KeyVal = key:word "=" val:text /ws
wp = w++
num = [0-9]++
-Paragraph = Blockquote:: { "\"\" " text }
- > HR:: { "---" "-"* }
- > { P:: t:text }
+
+Paragraph = Blockquote:: { "\"\" " text }
+ > HR:: { "---" "-"* }
+ > P:: { text }
onums = nums !(". "|") ")
any = ~[]*
-uli = "* " (!ws text &~ any (oli|uli))
-oli = !("# "|onums) (!ws text &~ any (oli|uli))
+uli = "* " (!ws text &~ any !(oli|uli))
+oli = !("# "|onums) (!ws text &~ any !(oli|uli))
text = Item
Itemx = !ws Item
| ()
-Item = blockquote
- > "[]":: { UL:: uli+/ws } Itemx
- | "[]":: { OL:: oli+/ws } Itemx
- > "[]":: pre Itemx
- > "[]":: link Itemx
- > "[]":: structured Itemx
- > "[]":: styled Itemx
- > "[]":: (Chars:: text:alphanum++) Itemx
- > "[]":: "\"" text "\"" Itemx
- > "[]":: symbol Itemx
- > "[]":: (Symbol:: sym++) Itemx
- > "[]":: Paragraph Itemx
-
-blockquote = Blockquote:: "\"\"" text "\"\""
- | Blockquote:: "\"\"" block
+Item = "[]":: blockquote Itemx
+ > "[]":: { UL:: uli+/ws } Itemx
+ | "[]":: { OL:: oli+/ws } Itemx
+ > "[]":: pre Itemx
+ > "[]":: link Itemx
+ > "[]":: structured Itemx
+ > "[]":: styled Itemx
+ > "[]":: (Chars:: alphanum++) Itemx
+ > "[]":: "\"" text "\"" Itemx
+ > "[]":: (Symbol:: sym++) Itemx
+ > "[]":: { Block:: text } Itemx
+
+blockquote = Blockquote:: "\"\"" (block | text "\"\"")
pre = Verbatim:: "[verbatim]" { ~[]+ } /ws // FIXME doesn't work
block = { text }
-link = Link:: text:({ text }) "->" href:(url|email)
- > Link:: text:alphanum++ !ws "->" href:(url|email)
+link = LinkText:: text:({ text }) "->" href:(url|email)
+ > LinkChars:: text:alphanum++ !ws "->" href:(url|email)
-structured = command & "\\" [a-zA-Z0-9]++ block?
+structured = command & "\\" !([a-zA-Z0-9]++) block?
> glyph
> email
> url
-glyph = Euro:: "(e)" | "(r)" | "(c)" | "(tm)" | "--" | "..."
+glyph = Euro:: "(e)" | "(r)" | "(c)" | "(tm)" | emdash:: "--" | "..."
command = Today:: "\\today"
| LineBreak:: "\\br"
urlv = urlc | [%]
urlchar = urlc
| urlescape:: "%" [0-9] [0-9]
-url = "mailto" ":" email -> ~urlv
- > URL:: method:method "://" login:url_login? host:host port:(":" nums)? path:("/" urlpath)? -> ~urlv
+url = Mailto:: "mailto" ":" email -> ~urlv
+ > URL::
+ method:method
+ "://"
+ login:url_login?
+ host:host
+ port:(":" nums)?
+ path:("/" urlpath)?
+ -> ~urlv
url_login = Login:: username:username password:(":" password) "@"
method = [+\-.a-z0-9]+
domain = (part +/ ".") -> ~"."
| quoted
quoted = "\"" ((~[\"\\] | escaped)+) "\""
- | "":: "\"\""
+ | "\"\"":: "\"\""
escaped = lf:: "\\n"
| cr:: "\\r"
| "\\" ~[nr]
// Chars ///////////////////////////////////////////////////////////////
alpha = [a-zA-Z]
-//num = [0-9]
alphanum = [a-zA-Z0-9]
sym = ~[a-zA-Z0-9\ \r\n=\">]