X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=tests%2Ftibdoc.g;h=6287afa4e2e0d233b44f59fe5a016dd73ca1b9d8;hb=0ab024f487647f99eb000345c29c2f8e9b52a200;hp=1df3fb80ee6e86e142fe9fb181b3bc49c5f24aa8;hpb=92632cd2b60dc20e157128696edc81e3a07eaec6;p=sbp.git

diff --git a/tests/tibdoc.g b/tests/tibdoc.g
index 1df3fb8..6287afa 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,80 +12,126 @@ x::="x"
 // image
 // figures
 
+// "reference-style" links
+//
+//   this[1] is fun
+//
+//   [1] http://...
+//
+
+// consider ++bold++ and **italic**?
+// \br
+// nonbreaking text?
+// ellipsis detection (...)
+// 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)
+// today's date
+
+// 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 => section }
-SectionHeader     ::= "==" SectionHeaderBody "=="
-SectionHeaderBody ::=  "=" SectionHeaderBody "="
-                    >      ws text ws
-
-sp    !::= " "**
-blank  ::= sp "\n" sp "\n" ws
-
-kv         ::= word "=" text /ws => kv1
-wp !::= w++
-num !::= [0-9]++
-Paragraph  ::= { "\"\"" ws  text }  => "blockquote"
-             > uli+/ws              => "ul"
-             > { "# "       text }  => "ol"
-             > { num " " ws text }  => "ol"
-             > { "---" "-"*      }  => "hr"
-             > { text }             => "p"
-uli        ::= { "* " text } => "li"
-
-text       ::= Item => text
-Itemx      ::= ws Item
+s                   = top:: Doc
+
+Doc                 = doc::    {Header} Body                   /ws
+Header              = header:: "header" { kv */ ws }           /ws
+Body                = body::   Section*/ws
+Section             = { section:: SectionHeader Paragraph* /ws }
+SectionHeader       = "==" SectionHeaderBody "=="
+SectionHeaderBody   =  "=" SectionHeaderBody "="
+                    >      !ws text !ws
+
+sp       = " "**
+blank    = !sp "\n" !sp "\n" !ws
+
+kv           = kv1:: word "=" text /ws
+wp           = w++
+num          = [0-9]++
+Paragraph    = blockquote:: { "\"\"" !ws  text }
+             > hr::         { "---" "-"*      }
+             > p::          { text }
+
+onums        = nums !(". "|") ")
+any          = ~[]*
+
+uli          = li:: "* "          (!ws text &~ any (oli|uli))
+oli          = li:: ("# "|onums) (!ws text &~ any (oli|uli))
+
+//
+
+text         = text:: Item
+Itemx        = !ws Item
              | ()
-Item       ::= blockquote
-             > pre                       Itemx => []
-             > structured                Itemx => []
-             > structuredx               Itemx => []
-             > styled                    Itemx => []
-             > qtext                     Itemx => []
-             > (alphanum++ => stringify) Itemx => []
-             > symbol                    Itemx => []
-             > (sym++ => stringify)      Itemx => []
-             > Paragraph                       => ""
-             > Paragraph                 Itemx => []
-
-blockquote ::= "\"\"" text "\"\""        => "blockquote"
-             | "\"\"" block              => "blockquote"
+Item         = blockquote
+             > "[]":: { ul:: uli+/ws }          Itemx
+             | "[]":: { ol:: oli+/ws }          Itemx
+             > "[]":: pre                       Itemx
+             > "[]":: structured                Itemx
+             > "[]":: structuredx               Itemx
+             > "[]":: styled                    Itemx
+             > "[]":: qtext                     Itemx
+             > "[]":: (stringify:: alphanum++)  Itemx
+             > "[]":: symbol                    Itemx
+             > "[]":: (stringify:: sym++)       Itemx
+             > "[]":: Paragraph                 Itemx
+
+blockquote   = blockquote:: "\"\"" text "\"\""
+             | blockquote:: "\"\"" block
              
-qtext      ::= "\"" text "\""            => "quoted"
-pre        ::= "[verbatim]" { ~[]+ } /ws => "verbatim"   // FIXME doesn't work
+qtext        = quoted:: "\"" text "\""
+pre          = verbatim:: "[verbatim]" { ~[]+ } /ws   // FIXME doesn't work
 
-styled     ::= "__" text "__"      => underline
-             | "((" text "))"      => footnote
-             | ( "[[" text "]]"    => tt
-               >  "[" word "]"     => citation
+styled       = underline:: "__" text "__"      
+             | footnote:: "((" text "))"      
+             | ( tt:: "[[" text "]]"    
+             > citation::   "[" word "]"     
                )
-             | "!!" 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
+             | strikethrough:: "!!" text "!!"      
+             | superscript:: "^^" (word|block)   
+             | subscript:: ",," (word|block)   
+             | smallcap:: "\\sc" block        
+             | bold:: "**" text "**"      
+             | keyword:: "!" (word|block)    
+             > it:: "*" text "*"
+
+//
+
+block   = { text }
+structured   = link:: { text } "->" (url|email)
               //> alphanum++ "->" (url|email) => link
-structuredx ::= glyph
+structuredx   = glyph
               > email
               > url
 
-glyph      ::= "(r)" | "(c)" | "(tm)" | "--"  // euro symbol?
-             | "\\today" -> ~[a-z] => today
+glyph        = "(r)" | "(c)" | "(tm)" | "--"  // euro symbol?
+             | today:: "\\today" -> ~[a-z]
 
 
 // URLs //////////////////////////////////////////////////////////////////////////////
@@ -95,44 +140,44 @@ 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;/?:&=$\-_.+]++ => 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
+urlpath      = urlchar*
+username     = stringify:: [a-zA-Z0-9;/?:&=$\-_.+]++
+password     = stringify:: [a-zA-Z0-9;/?:&=$\-_.+]++
+urlchar      = [a-zA-Z0-9;/?:&=$\-_.+@]
+             | "%":: "%" [0-9] [0-9]
+url          = "mailto" ":"   email
+             > url::   method "://" url_login? host (":" nums)? ("/" urlpath)?
+url_login    = login:: username (":" password) "@"
+method       = stringify:: [+\-.a-z0-9]+
+domain       = domain:: (part +/ ".") -> ~"."
+part         = stringify:: [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"
+email        = emailaddr:: username "@" host -> ~[.]
+nums         = stringify:: [0-9]++
+host         = ip:: nums "." nums "." nums "." nums
              | domain
 
 
 
 // Tokens ///////////////////////////////////////////////////////////////////
 
-word     ::= alphanum++ => stringify
+word       = stringify:: alphanum++
            | quoted
 
-quoted   ::= "\"" ((~[\"\\] | escaped)+) "\""
-           | "\"\"" => ""
-escaped  ::= "\\n" => "\n"
-           | "\\r" => "\r"
+quoted     = "\"" ((~[\"\\] | escaped)+) "\""
+           | "":: "\"\""
+escaped    = "\n":: "\\n"
+           | "\r":: "\\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]
+//num        = [0-9]
+alphanum   = [a-zA-Z0-9]
+sym        = ~[a-zA-Z0-9\ \r\n=\">]