X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=tests%2Ftibdoc.g;h=1c02f111e14568f55fe8e8cdf31b48d64582a793;hp=2d026e878487351c3874af6c9f90b49a0eb585a3;hb=df76fcb56242a90011500ab89092d2108350a8ab;hpb=b409afa0cf6d72a23703d9172812ab4fcd6a969b

diff --git a/tests/tibdoc.g b/tests/tibdoc.g
index 2d026e8..1c02f11 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,77 +12,122 @@ 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\ ]
-nw       ::= ~[\r\n\ ]
+ws         = w**
+w          =  [\r\n\ ]
+nw         = ~[\r\n\ ]
 
 //////////////////////////////////////////////////////////////////////////////
 
-s                 ::= {Doc} => top
-
-Doc               ::= Header Body                         /ws => doc
-Header            ::= "header" { kv */ ws }               /ws => header
-Body              ::= Section*/ws                             => body
-Section           ::= SectionHeader Paragraph*/ws         /ws => section
-SectionHeader     ::= "==" SectionHeaderBody "=="
-SectionHeaderBody ::=  "=" SectionHeaderBody "="
-                    >      ws text ws
-
-kv         ::= word "=" text /ws => kv1
-
-num !::= [0-9]++
-Paragraph  ::= { "\"\"" ws text }        => "blockquote"
-             > { "*" " " ws text }       => "ul"
-             > { "#" " " ws text }       => "ol"
-             > { num " " ws text }       => "ol"
-             > { "---" "-"* }            => "hr"
-             > { text }                  => "p"
-
-text       ::= item
-itemx      ::= ws item | ()
-item       ::= blockquote
-             > pre         itemx => []
-             > structured  itemx => []
-             > structuredx itemx => []
-             > styled      itemx => []
-             > qtext       itemx => []
-             > alphanum++  itemx => []
-             > symbol      itemx => []
-//             > sym++       itemx => []
-             > Paragraph   itemx => []
-
-symbol     ::= sym++
-
-blockquote ::= "\"\"" text "\"\""        => "blockquote"
-             | "\"\"" block              => "blockquote"
+s                   = Doc
+
+Doc                 = head:Header body:Body  /ws
+Header              = H:: { "header" { KeyVal */ ws } /ws }
+Body                = B:: {Section}*/ws
+Section             = SectionHeader Paragraph* /ws
+SectionHeader       = "==" SectionHeaderBody "=="
+SectionHeaderBody   =  "=" SectionHeaderBody "="
+                    >      ws! alphanum++ ws!
+
+sp       = " "**
+blank    = sp! "\n" sp! "\n" ws!
+
+KeyVal       = key:word "=" val:text /ws
+wp           = w++
+num          = [0-9]++
+
+Paragraph   = Blockquote:: { "\"\" "    text }
+            > HR::         { "---" "-"*      }
+            > P::          { text            }
+
+onums        = nums (". "|") ")!
+any          = ~[]*
+
+uli          =  "* "         (ws! text &~ any (oli|uli)!)
+oli          = ("# "|onums)! (ws! text &~ any (oli|uli)!)
+
+text         = Item
+Itemx        = ws! Item
+             | ()
+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 "\"\"")
              
-qtext      ::= "\"" text "\""            => "quoted"
-pre        ::= "[verbatim]" { ~[]+ } /ws => "verbatim"   // FIXME doesn't work
-
-styled     ::= "__" text "__"      => ul
-             | "((" 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          = LinkText:: text:({ text })      "->" href:(url|email)
+              > LinkChars:: 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 //////////////////////////////////////////////////////////////////////////////
 
@@ -91,44 +135,52 @@ glyph      ::= "(r)" | "(c)" | "(tm)" | "--"  // euro symbol?
 // subtypes of url (ftp, etc) as conjunctions, but the "master pattern"
 // only gets parsed once
 
-urlpath    ::= urlchar*
-username   ::= [a-zA-Z0-9;/?:&=$\-_.+]++
-password   ::= [a-zA-Z0-9;/?:&=$\-_.+]++
-urlchar    ::= [a-zA-Z0-9;/?:&=$\-_.+@]
-             | "%" [0-9] [0-9]       => "%"
-url        ::= "mailto" ":"   email
-             > method "://" url_login? host (":" port)? ("/" urlpath)?     => "url"
-url_login  ::= username (":" password) "@" => "login"
-method     ::= [+\-.a-z0-9]+ 
-port       ::= [0-9]+
-
-domain     ::= (part +/ ".") -> ~"."
-part       ::= [a-zA-Z0-9\-]++    // interesting use of boolean grammars
+urlpath      = urlchar*
+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:: "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
-host       ::= [0-9]+ "." [0-9]+ "." [0-9]+ "." [0-9]+ => "ip"
-             | domain
+email        = user:username "@" host:host -> ~[.]
+nums         = [0-9]++
+host         = IP::  nums "." nums "." nums "." nums
+             | DNS:: domain
 
 
 
 // Tokens ///////////////////////////////////////////////////////////////////
 
-word     ::= alphanum++
+word       = alphanum++
            | quoted
 
-quoted   ::= "\"" ((~[\"\\] | escaped)+) "\""
-           | "\"\"" => ""
-escaped  ::= "\\n" => "\n"
-           | "\\r" => "\r"
+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=\">]
+alpha      = [a-zA-Z]
+alphanum   = [a-zA-Z0-9]
+sym        = ~[a-zA-Z0-9\ \r\n=\">]