// [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\ ]
//////////////////////////////////////////////////////////////////////////////
s = Doc
-Doc = head:Header body:Body /ws
-Header = { "header" { KeyVal */ ws } /ws }
-Body = {Section}*/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!
+ > ws! text 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:: { UL:: uli+/ws }
+ > P:: { OL:: oli+/ws }
> 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
+// > ^"#" ws! { ~[]* }
> { UL:: uli+/ws }
| { OL:: oli+/ws }
- > pre
+ > 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 "\"\"")
-pre = Verbatim:: "[verbatim]" { ~[]+ } /ws // FIXME doesn't work
+Verbatim = "[verbatim]" ws! { (~[])++ }
+
+#import meta.g as meta
+InlineGrammar = "\grammar" ws! { meta.Grammar }
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) "->" ws! href:href
+href = url | email | {href}
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;/?:&=$\-_.+@]
host:host
port:(":" nums)?
path:("/" urlpath)?
- -> ~urlv
+ ref:("#" urlpath)?
+ -> ~(urlv|[\#])
url_login = Login:: username:username password:(":" password) "@"
method = [+\-.a-z0-9]+
domain = (part +/ ".") -> ~"."
// 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 = [,()]