Merge branch 'release/debian/6.9.6-1'debian/6.9.6-1

1 files changed, 43 insertions, 13 deletions

diff --git a/doc/API b/doc/API
index bb7b010..b13a503 100644
--- a/doc/API
+++ b/doc/API
@@ -1,4 +1,4 @@
-Oniguruma API  Version 6.9.5  2020/03/25
+Oniguruma API  Version 6.9.6  2020/07/12
 
 #include <oniguruma.h>
 
@@ -95,6 +95,10 @@ Oniguruma API  Version 6.9.5  2020/03/25
       ONIG_OPTION_TEXT_SEGMENT_EXTENDED_GRAPHEME_CLUSTER  Extended Grapheme Cluster mode
       ONIG_OPTION_TEXT_SEGMENT_WORD                       Word mode
 
+
+     * The ONIG_OPTION_FIND_LONGEST option doesn't work properly during backward search of onig_search().
+
+
   5 enc:        character encoding.
 
       ONIG_ENCODING_ASCII         ASCII
@@ -141,7 +145,6 @@ Oniguruma API  Version 6.9.5  2020/03/25
       ONIG_SYNTAX_JAVA              Java (Sun java.util.regex)
       ONIG_SYNTAX_PERL              Perl
       ONIG_SYNTAX_PERL_NG           Perl + named group
-      ONIG_SYNTAX_RUBY              Ruby
       ONIG_SYNTAX_ONIGURUMA         Oniguruma
       ONIG_SYNTAX_DEFAULT           default (== ONIG_SYNTAX_ONIGURUMA)
                                    onig_set_default_syntax()
@@ -331,9 +334,11 @@ Oniguruma API  Version 6.9.5  2020/03/25
   6 region: address for return group match range info (NULL is allowed)
   7 option: search time option
 
-    ONIG_OPTION_NOTBOL        string head(str) isn't considered as begin of line
-    ONIG_OPTION_NOTEOL        string end (end) isn't considered as end of line
-    ONIG_OPTION_POSIX_REGION  region argument is regmatch_t[] of POSIX API.
+    ONIG_OPTION_NOTBOL        (str) isn't considered as begin of line and begin of string (* ONIG_OPTION_NOT_BEGIN_STRING)
+    ONIG_OPTION_NOTEOL        (end) isn't considered as end of line and end of string (* ONIG_OPTION_NOT_END_STRING)
+    ONIG_OPTION_NOT_BEGIN_STRING    (str) isn't considered as begin of string (* fail \A)
+    ONIG_OPTION_NOT_END_STRING      (end) isn't considered as end of string (* fail \z, \Z)
+    ONIG_OPTION_NOT_BEGIN_POSITION  (start) isn't considered as start position of search (* fail \G)
 
 
 # int onig_search_with_param(regex_t* reg, const UChar* str, const UChar* end,
@@ -366,9 +371,11 @@ Oniguruma API  Version 6.9.5  2020/03/25
   5 region: address for return group match range info (NULL is allowed)
   6 option: search time option
 
-    ONIG_OPTION_NOTBOL       string head(str) isn't considered as begin of line
-    ONIG_OPTION_NOTEOL       string end (end) isn't considered as end of line
-    ONIG_OPTION_POSIX_REGION region argument is regmatch_t[] type of POSIX API.
+    ONIG_OPTION_NOTBOL        (str) isn't considered as begin of line and begin of string (* ONIG_OPTION_NOT_BEGIN_STRING)
+    ONIG_OPTION_NOTEOL        (end) isn't considered as end of line and end of string (* ONIG_OPTION_NOT_END_STRING)
+    ONIG_OPTION_NOT_BEGIN_STRING    (str) isn't considered as begin of string (* fail \A)
+    ONIG_OPTION_NOT_END_STRING      (end) isn't considered as end of string (* fail \z, \Z)
+    ONIG_OPTION_NOT_BEGIN_POSITION  (at) isn't considered as start position of search (* fail \G)
 
 
 # int onig_match_with_param(regex_t* reg, const UChar* str, const UChar* end,
@@ -500,8 +507,12 @@ Oniguruma API  Version 6.9.5  2020/03/25
       ONIG_REGSET_REGEX_LEAD    (returns most left position)
       ONIG_REGSET_PRIORITY_TO_REGEX_ORDER (returns first match regex)
   7 option: search time option
-      ONIG_OPTION_NOTBOL    string head(str) isn't considered as begin of line
-      ONIG_OPTION_NOTEOL    string end (end) isn't considered as end of line
+      ONIG_OPTION_NOTBOL        (str) isn't considered as begin of line and begin of string (* ONIG_OPTION_NOT_BEGIN_STRING)
+      ONIG_OPTION_NOTEOL        end (end) isn't considered as end of line and end of string (* ONIG_OPTION_NOT_END_STRING)
+      ONIG_OPTION_NOT_BEGIN_STRING    (str) isn't considered as begin of string (* fail \A)
+      ONIG_OPTION_NOT_END_STRING      (end) isn't considered as end of string (* fail \z, \Z)
+      ONIG_OPTION_NOT_BEGIN_POSITION  (start) isn't considered as start position of search (* fail \G)
+
   8 rmatch_pos: return address of match position (match_address - str)
 
   * ONIG_REGSET_POSITION_LEAD and ONIG_REGSET_REGEX_LEAD return the same result.
@@ -529,8 +540,12 @@ Oniguruma API  Version 6.9.5  2020/03/25
       ONIG_REGSET_REGEX_LEAD    (returns most left position)
       ONIG_REGSET_PRIORITY_TO_REGEX_ORDER (returns first match regex)
   7 option: search time option
-      ONIG_OPTION_NOTBOL    string head(str) isn't considered as begin of line
-      ONIG_OPTION_NOTEOL    string end (end) isn't considered as end of line
+      ONIG_OPTION_NOTBOL        (str) isn't considered as begin of line and begin of string (* ONIG_OPTION_NOT_BEGIN_STRING)
+      ONIG_OPTION_NOTEOL        (end) isn't considered as end of line and end of string (* ONIG_OPTION_NOT_END_STRING)
+      ONIG_OPTION_NOT_BEGIN_STRING    (str) isn't considered as begin of string (* fail \A)
+      ONIG_OPTION_NOT_END_STRING      (end) isn't considered as end of string (* fail \z, \Z)
+      ONIG_OPTION_NOT_BEGIN_POSITION  (start) isn't considered as start position of search (* fail \G)
+
   8 mps:    array of match-params
   9 rmatch_pos: return address of match position (match_address - str)
 
@@ -672,7 +687,7 @@ Oniguruma API  Version 6.9.5  2020/03/25
 
   Return the root node of capture history data tree.
 
-  This value is undefined if matching has faild.
+  This value is undefined if matching has failed.
 
   arguments
   1 region: matching result.
@@ -908,6 +923,21 @@ Oniguruma API  Version 6.9.5  2020/03/25
   normal return: ONIG_NORMAL
 
 
+# unsigned long onig_get_subexp_call_limit_in_search(void)
+
+  Return the limit of subexp call count.
+  (default: 0:unlimited)
+
+  normal return: current limit value
+
+
+# int onig_set_subexp_call_limit_in_search(unsigned long n)
+
+  Set a limit count of subexp call.
+
+  normal return: ONIG_NORMAL
+
+
 # int onig_get_subexp_call_max_nest_level(void)
 
   Return the limit of subexp call nest level.