Merge branch 'feature/upstream' into develop

1 files changed, 18 insertions, 5 deletions

diff --git a/doc/RE b/doc/RE
index 4bd0e7d..e75daad 100644
--- a/doc/RE
+++ b/doc/RE
@@ -1,4 +1,4 @@
-Oniguruma Regular Expressions Version 6.8.0    2018/03/08
+Oniguruma Regular Expressions Version 6.8.0    2018/04/13
 
 syntax: ONIG_SYNTAX_ONIGURUMA (default)
 
@@ -266,19 +266,32 @@ syntax: ONIG_SYNTAX_ONIGURUMA (default)
   <Callouts>
 
   * Callouts of contents
-  (?{...contents...})         callouts in progress
-  (?{...contents...}D)        D is a direction flag char. ('X' or '<' or '>')
-                              D = 'X': progress and retraction, '<': retraction only
-                              '>': progress only (default)
+  (?{...contents...})         callout in progress
+  (?{...contents...}D)        D is a direction flag char
+                              D = 'X': in progress and retraction
+                                  '<': in retraction only
+                                  '>': in progress only
   (?{...contents...}[tag])    tag assigned
   (?{...contents...}[tag]D)
 
+                              * Escape characters have no effects in contents.
+                              * contents is not allowed to start with '{'.
+
+  (?{{{...contents...}}})     n times continuations '}' in contents is allowed in
+                              (n+1) times continuations {{{...}}}.
+
+    Allowed tag string characters: _ A-Z a-z 0-9 (* first character: _ A-Z a-z)
+
+
   * Callouts of name
   (*name)
   (*name{args...})            with args
   (*name[tag])                tag assigned
   (*name[tag]{args...})
 
+    Allowed name string characters: _ A-Z a-z 0-9 (* first character: _ A-Z a-z)
+    Allowed tag  string characters: _ A-Z a-z 0-9 (* first character: _ A-Z a-z)
+
 
   <Absent functions>