checkpoint

[sbp.git] / tests / tibdoc.g

diff --git a/tests/tibdoc.g b/tests/tibdoc.g
index f93c5dd..072c625 100644 (file)
--- a/tests/tibdoc.g
+++ b/tests/tibdoc.g
@@ -48,8 +48,9 @@
 //     [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\ ]
 
 //////////////////////////////////////////////////////////////////////////////
@@ -57,7 +58,7 @@ nw         = ~[\r\n\ ]
 s                   = Doc
 
 Doc                 = head:Header ws! body:Body
-Header              = { "header" { KeyVal */ ws } /ws }
+Header              = { "\\header" { KeyVal */ ws } /ws }
 Body                = { Section } */ws
 Section             = SectionHeader ws! Paragraph*
 SectionHeader       = "==" SectionHeaderBody "=="
@@ -79,29 +80,34 @@ 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 "\""             
              > (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 "))"      
@@ -117,18 +123,22 @@ styled       = Underline::     "__" text "__"
 
 block         = { text }
 
-link          = LinkText:: text:({ text })      "->" href:(url|email)
-              > LinkChars:: text:alphanum++  ws! "->" href:(url|email)
+link          = text:({ text }|word)  "->" href:(url|email)
 
 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 //////////////////////////////////////////////////////////////////////////////