X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Ftibdoc.g;h=ec31d30dadd269c693174ffa0b21081719892537;hp=650b06e52e8c1b6439e11363fa37749005f6b6cb;hb=225993309e6183afa9a88fc13d39df56be54b992;hpb=86e7e1298601b60df964e3c0a71f3fe3cca230b8

diff --git a/tests/tibdoc.g b/tests/tibdoc.g
index 650b06e..ec31d30 100644
--- a/tests/tibdoc.g
+++ b/tests/tibdoc.g
@@ -1,4 +1,3 @@
-x  ="x"
 // interactions between !=> and &~ mean that I need to rethink the chartage
 // indentation styling...
 // literal blocks [[need to ignore bracing]] double-colon style?
@@ -13,84 +12,121 @@ x  ="x"
 // image
 // figures
 
+// "reference-style" links
+//
+//   this[1] is fun
+//
+//   [1] http://...
+//
+
+// nonbreaking text?
+// degree: 15^o
+// Arrows: <- -> => <= <->
+
+// textblocks:
+//  - attention, caution, danger, error, hint, important, note, tip, warning
+// definition
+// sidebar
+// figure-with-caption
+// epigraph (end-of-chapter note)
+// compound paragraph (??)
+// csv-table?
+// table of contents
+// header, footer
+// #include
+
+// simple macros (#define) (\define)
+
+// table representation
+//  
+//  \table
+//     a bbb c
+//     ddd   e
+//
+//     [a] ...
+//     [b] ...
+//     [c] ...
+
 // FIXME: these have to go at the top so they have their dropAll bit set before PreSequence.build...
-ws      !  = w**
-w       !  =  [\r\n\ ]
+ws         = w**
+w          =  [\r\n\ ]
 nw         = ~[\r\n\ ]
 
 //////////////////////////////////////////////////////////////////////////////
 
-s                   = Doc => top
+s                   = Doc
 
-Doc                 = {Header} Body                   /ws => doc
-Header              = "header" { kv */ ws }           /ws => header
-Body                = Section*/ws                         => body
-Section             = { SectionHeader Paragraph* /ws => section }
+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 }
 SectionHeader       = "==" SectionHeaderBody "=="
 SectionHeaderBody   =  "=" SectionHeaderBody "="
-                    >      ws text ws
+                    >      !ws (Chars:: text:alphanum++) !ws
 
-sp    !  = " "**
-blank    = sp "\n" sp "\n" ws
+sp       = " "**
+blank    = !sp "\n" !sp "\n" !ws
 
-kv           = word "=" text /ws => kv1
-wp !  = w++
-num !  = [0-9]++
-Paragraph    = { "\"\"" ws  text }  => "blockquote"
-             > { "---" "-"*      }  => "hr"
-             > { text }             => "p"
+kv           = kv:: key:word "=" val:text /ws
+wp           = w++
+num          = [0-9]++
+Paragraph    = Blockquote:: { "\"\" "    text }
+             > HR::         { "---" "-"*      }
+             >              { P:: t:text }
 
-onums     !  = nums (". "|") ")
-any       !  = ~[]*
+onums        = nums !(". "|") ")
+any          = ~[]*
 
-uli          = "* "         (ws text &~ any (oli|uli)) => "li"
-oli          = ("# "|onums) (ws text &~ any (oli|uli)) => "li"
+uli          =  "* "         (!ws text &~ any (oli|uli))
+oli          = !("# "|onums) (!ws text &~ any (oli|uli))
 
-text         = Item => text
-Itemx        = ws Item
+text         = Item
+Itemx        = !ws Item
              | ()
 Item         = blockquote
-             > { uli+/ws => "ul" }       Itemx  => []
-             | { oli+/ws => "ol" }       Itemx  => []
-             > pre                       Itemx  => []
-             > structured                Itemx  => []
-             > structuredx               Itemx  => []
-             > styled                    Itemx  => []
-             > qtext                     Itemx  => []
-             > (alphanum++ => stringify) Itemx  => []
-             > symbol                    Itemx  => []
-             > (sym++ => stringify)      Itemx  => []
-             > Paragraph                 Itemx  => []
-
-blockquote   = "\"\"" text "\"\""        => "blockquote"
-             | "\"\"" block              => "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
              
-qtext        = "\"" text "\""            => "quoted"
-pre          = "[verbatim]" { ~[]+ } /ws => "verbatim"   // FIXME doesn't work
-
-styled       = "__" text "__"      => underline
-             | "((" text "))"      => footnote
-             | ( "[[" text "]]"    => tt
-               >  "[" word "]"     => citation
-               )
-             | "!!" text "!!"      => strikethrough
-             | "^^" (word|block)   => superscript
-             | ",," (word|block)   => subscript
-             | "\\sc" block        => smallcap
-             | "**" text "**"      => bold
-             | "!" (word|block)    => keyword
-             >  "*" text "*"       => it
-
-block   = { text }
-structured   = { text } "->" (url|email) => link
-              //> alphanum++ "->" (url|email) => link
-structuredx   = glyph
+pre          = Verbatim:: "[verbatim]" { ~[]+ } /ws   // FIXME doesn't work
+
+styled       = Underline::     "__" text "__"      
+             | Footnote::      "((" text "))"      
+             | TT::            "[[" text "]]"
+             | Citation::       "[" word "]"
+             | Strikethrough:: "!!" text "!!"      
+             | Superscript::   "^^" (word|block)   
+             | Subscript::     ",," (word|block)   
+             | Smallcap::      "\\sc" block        
+             | Bold::           "++" text "++"
+             | Keyword::         "!" (word|block)    
+             | Italic::         "**" text "**"
+
+block         = { text }
+
+link          = Link:: text:({ text })      "->" href:(url|email)
+              > Link:: text:alphanum++  !ws "->" href:(url|email)
+
+structured    = command & "\\" [a-zA-Z0-9]++ block?
+              > glyph
               > email
               > url
 
-glyph        = "(r)" | "(c)" | "(tm)" | "--"  // euro symbol?
-             | "\\today" -> ~[a-z] => today
+glyph        = Euro:: "(e)" | "(r)" | "(c)" | "(tm)" | emdash:: "--" | "..."
 
+command      = Today::     "\\today"
+             | LineBreak:: "\\br"
 
 // URLs //////////////////////////////////////////////////////////////////////////////
 
@@ -99,35 +135,37 @@ glyph        = "(r)" | "(c)" | "(tm)" | "--"  // euro symbol?
 // only gets parsed once
 
 urlpath      = urlchar*
-username     = [a-zA-Z0-9;/?:&=$\-_.+]++ => stringify
-password     = [a-zA-Z0-9;/?:&=$\-_.+]++ => stringify
-urlchar      = [a-zA-Z0-9;/?:&=$\-_.+@]
-             | "%" [0-9] [0-9]       => "%"
-url          = "mailto" ":"   email
-             > method "://" url_login? host (":" nums)? ("/" urlpath)?     => "url"
-url_login    = username (":" password) "@"                                 => "login"
-method       = [+\-.a-z0-9]+ => stringify
-domain       = (part +/ ".") -> ~"." => domain
-part         = [a-zA-Z0-9\-]++  => stringify
+username     = [a-zA-Z0-9;/?:&=$\-_.+]++
+password     = [a-zA-Z0-9;/?:&=$\-_.+]++
+urlc         = [a-zA-Z0-9;/?:&=$\-_.+@]
+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_login    = Login:: username:username password:(":" password) "@"
+method       = [+\-.a-z0-9]+
+domain       = (part +/ ".") -> ~"."
+part         = [a-zA-Z0-9\-]++
 // interesting use of boolean grammars
 //            &~ ([\-0-9] ~[]* | ~[]* [\-0-9])
 
-email        = username "@" host -> ~[.] => emailaddr
-nums         = [0-9]++ => stringify
-host         = nums "." nums "." nums "." nums => "ip"
-             | domain
+email        = Email:: user:username "@" host:host -> ~[.]
+nums         = [0-9]++
+host         = IP::  nums "." nums "." nums "." nums
+             | DNS:: domain
 
 
 
 // Tokens ///////////////////////////////////////////////////////////////////
 
-word       = alphanum++ => stringify
+word       = alphanum++
            | quoted
 
 quoted     = "\"" ((~[\"\\] | escaped)+) "\""
-           | "\"\"" => ""
-escaped    = "\\n" => "\n"
-           | "\\r" => "\r"
+           | "":: "\"\""
+escaped    = lf:: "\\n"
+           | cr:: "\\r"
            | "\\" ~[nr]