checkpoint

[sbp.git] / tests / tibdoc.g

diff --git a/tests/tibdoc.g b/tests/tibdoc.g
index ed71ad3..88ee6f8 100644 (file)
--- a/tests/tibdoc.g
+++ b/tests/tibdoc.g
@@ -115,8 +115,8 @@ styled       = Underline::     "__" text "__"
 
 block         = { text }
 
-link          = Link:: text:({ text })      "->" href:(url|email)
-              > Link:: text:alphanum++  !ws "->" href:(url|email)
+link          = LinkText:: text:({ text })      "->" href:(url|email)
+              > LinkChars:: text:alphanum++  !ws "->" href:(url|email)
 
 structured    = command & "\\" !([a-zA-Z0-9]++) block?
               > glyph
@@ -141,8 +141,15 @@ 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          = 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 +/ ".") -> ~"."
@@ -163,7 +170,7 @@ word       = alphanum++
            | quoted
 
 quoted     = "\"" ((~[\"\\] | escaped)+) "\""
-           | "":: "\"\""
+           | "\"\"":: "\"\""
 escaped    = lf:: "\\n"
            | cr:: "\\r"
            | "\\" ~[nr]
@@ -172,7 +179,6 @@ escaped    = lf:: "\\n"
 // Chars ///////////////////////////////////////////////////////////////
 
 alpha      = [a-zA-Z]
-//num        = [0-9]
 alphanum   = [a-zA-Z0-9]
 sym        = ~[a-zA-Z0-9\ \r\n=\">]