checkpoint

[sbp.git] / tests / tibdoc.g

diff --git a/tests/tibdoc.g b/tests/tibdoc.g
index 51e66e1..80c8cef 100644 (file)
--- a/tests/tibdoc.g
+++ b/tests/tibdoc.g
@@ -59,7 +59,7 @@ s                   = Doc
 Doc                 = head:Header body:Body  /ws
 Header              = H:: { "header" { KeyVal */ ws } /ws }
 Body                = B:: {Section}*/ws
-Section             = SectionHeader Paragraph* /ws
+Section             = SectionHeader ws! (Paragraph Paragraph)
 SectionHeader       = "==" SectionHeaderBody "=="
 SectionHeaderBody   =  "=" SectionHeaderBody "="
                     >      ws! alphanum++ ws!
@@ -82,25 +82,21 @@ uli          =  "* "         (ws! text &~ any (oli|uli)!)
 oli          = ("# "|onums)! (ws! text &~ any (oli|uli)!)
 
 text         = Item
-Itemx        = ws! Item
-             | ()
-Item
-//*/ws
-     =
-// "[]":: blockquote                 ((ws! Item) | ())
-//             >
- "[]":: { UL:: uli+/ws }           ((ws! Item) | ())
-             | "[]":: { OL:: oli+/ws }           ((ws! Item) | ())
-             > "[]":: pre                        ((ws! Item) | ())
-             > "[]":: link                       ((ws! Item) | ())
-             > "[]":: structured                 ((ws! Item) | ())
-             > "[]":: styled                     ((ws! Item) | ())
-             > "[]":: (Chars:: alphanum++)       ((ws! Item) | ())
-             > "[]":: "\"" text "\""             ((ws! Item) | ())
-             > "[]":: (Symbol:: sym++)           ((ws! Item) | ())
-             > "[]":: { Block:: text }           ((ws! Item) | ())
-
 
+Item*/ws     =
+               blockquote
+             > { UL:: uli+/ws }           
+             | { OL:: oli+/ws }           
+             > pre                        
+             > link                       
+             > structured                 
+             > styled                     
+             > (Chars:: alphanum++)       
+             > "\"" text "\""             
+             > (Symbol:: sym++)           
+//             > { Block:: text }           
+
+blockquote = "adsfafewag"
 //blockquote   = Blockquote:: "\"\"" (block | text "\"\"")
              
 pre          = Verbatim:: "[verbatim]" { ~[]+ } /ws   // FIXME doesn't work