Boost-Commit :

Subject: [Boost-commit] svn:boost r54360 - in sandbox/SOC/2009/unicode: boost/iterator boost/unicode boost/unicode/ucd boost/unicode/ucd/detail libs/unicode/data_parser libs/unicode/doc libs/unicode/example libs/unicode/src libs/unicode/src/ucd
From: loufoque_at_[hidden]
Date: 2009-06-25 23:15:38

• Next message: sohail_at_[hidden]: "[Boost-commit] svn:boost r54361 - in trunk/libs/spirit/doc: . html html/spirit html/spirit/abstracts html/spirit/karma html/spirit/karma/quick_reference html/spirit/karma/tutorials html/spirit/lex html/spirit/lex/abstracts html/spirit/lex/abstracts/lexer_primitives html/spirit/lex/reference html/spirit/lex/reference/concepts html/spirit/lex/tutorials html/spirit/notes html/spirit/qi html/spirit/qi/quick_reference html/spirit/qi/tutorials html/spirit/structure"
• Previous message: christian.schladetsch_at_[hidden]: "[Boost-commit] svn:boost r54359 - in sandbox/monotonic: boost/object_model boost/object_model/detail boost/object_model/generic boost/object_model/type libs/monotonic/test/Tests libs/object_model/src libs/object_model/src/generic libs/object_model/test"

Author: mgaunard
Date: 2009-06-25 23:15:27 EDT (Thu, 25 Jun 2009)
New Revision: 54360
URL: http://svn.boost.org/trac/boost/changeset/54360

Log:
updating ucd + landing graphemes
Added:
   sandbox/SOC/2009/unicode/boost/unicode/graphemes.hpp (contents, props changed)
   sandbox/SOC/2009/unicode/libs/unicode/src/unicode_graphemes.cpp (contents, props changed)
Text files modified:
   sandbox/SOC/2009/unicode/boost/iterator/consumer_iterator.hpp | 38
   sandbox/SOC/2009/unicode/boost/unicode/ucd/detail/unichar_data.hpp | 33
   sandbox/SOC/2009/unicode/boost/unicode/ucd/properties.hpp | 4
   sandbox/SOC/2009/unicode/boost/unicode/ucd/properties_types.hpp | 85
   sandbox/SOC/2009/unicode/libs/unicode/data_parser/read_character_properties.hpp | 62 +
   sandbox/SOC/2009/unicode/libs/unicode/data_parser/read_character_properties_grapheme_break.cpp | 30
   sandbox/SOC/2009/unicode/libs/unicode/data_parser/read_character_properties_linebreak.cpp | 4
   sandbox/SOC/2009/unicode/libs/unicode/data_parser/read_character_properties_sentence.cpp | 34
   sandbox/SOC/2009/unicode/libs/unicode/data_parser/read_character_properties_word_break.cpp | 33
   sandbox/SOC/2009/unicode/libs/unicode/doc/users_manual.qbk | 12
   sandbox/SOC/2009/unicode/libs/unicode/example/test.cpp | 60
   sandbox/SOC/2009/unicode/libs/unicode/src/Jamfile.v2 | 7
   sandbox/SOC/2009/unicode/libs/unicode/src/ucd/uni_ucd_interface_impl_data_1.ipp | 1764 ++++++++++++++++----------------
   sandbox/SOC/2009/unicode/libs/unicode/src/ucd/uni_ucd_interface_impl_data_2.ipp | 1230 +++++++++++-----------
   sandbox/SOC/2009/unicode/libs/unicode/src/ucd/uni_ucd_interface_impl_data_3.ipp | 894 ++++++++--------
   sandbox/SOC/2009/unicode/libs/unicode/src/ucd/uni_ucd_interface_impl_data_4.ipp | 162 +-
   sandbox/SOC/2009/unicode/libs/unicode/src/ucd/uni_ucd_interface_impl_data_5.ipp | 24
   sandbox/SOC/2009/unicode/libs/unicode/src/ucd/uni_ucd_interface_impl_data_6.ipp | 2184 ++++++++++++++++++++--------------------
   sandbox/SOC/2009/unicode/libs/unicode/src/ucd/uni_ucd_interface_impl_data_7.ipp | 190 +-
   sandbox/SOC/2009/unicode/libs/unicode/src/ucd/uni_ucd_interface_impl_data_8.ipp | 136 +-
   sandbox/SOC/2009/unicode/libs/unicode/src/ucd/uni_ucd_interface_impl_data_9.ipp | 960 ++++++++--------
   sandbox/SOC/2009/unicode/libs/unicode/src/unicode_properties.cpp | 121 -
   22 files changed, 4101 insertions(+), 3966 deletions(-)

Modified: sandbox/SOC/2009/unicode/boost/iterator/consumer_iterator.hpp
==============================================================================
--- sandbox/SOC/2009/unicode/boost/iterator/consumer_iterator.hpp (original)
+++ sandbox/SOC/2009/unicode/boost/iterator/consumer_iterator.hpp 2009-06-25 23:15:27 EDT (Thu, 25 Jun 2009)
@@ -36,6 +36,44 @@
 {
     return pipe_consumer<Pipe>(p);
 }
+
+template<typename Boundary>
+struct boundary_consumer : private Boundary
+{
+ boundary_consumer() {} // singular
+
+ boundary_consumer(Boundary b_) : Boundary(b_)
+ {
+ }
+
+ template<typename In>
+ In ltr(In begin, In end)
+ {
+ In pos = begin;
+ do
+ ++pos;
+ while(!Boundary::operator()(begin, end, pos));
+
+ return pos;
+ }
+
+ template<typename In>
+ In rtl(In begin, In end)
+ {
+ In pos = end;
+ do
+ --pos;
+ while(!Boundary::operator()(begin, end, pos));
+
+ return pos;
+ }
+};
+
+template<typename Boundary>
+boundary_consumer<Boundary> make_boundary_consumer(Boundary b)
+{
+ return boundary_consumer<Boundary>(b);
+}
     
 template<typename It, typename Consumer>
 struct consumer_iterator

Added: sandbox/SOC/2009/unicode/boost/unicode/graphemes.hpp
==============================================================================
--- (empty file)
+++ sandbox/SOC/2009/unicode/boost/unicode/graphemes.hpp 2009-06-25 23:15:27 EDT (Thu, 25 Jun 2009)
@@ -0,0 +1,52 @@
+#ifndef BOOST_UNICODE_GRAPHEMES_HPP
+#define BOOST_UNICODE_GRAPHEMES_HPP
+
+#include <boost/unicode/ucd/properties.hpp>
+#include <boost/utility.hpp>
+
+#include <boost/iterator/consumer_iterator.hpp>
+
+namespace boost
+{
+namespace unicode
+{
+
+namespace detail
+{
+ extern bool grapheme_is_break
+ [boost::unicode::ucd::grapheme_cluster_break::_count]
+ [boost::unicode::ucd::grapheme_cluster_break::_count];
+
+} // namespace detail
+
+struct grapheme_boundary
+{
+ template<typename Iterator>
+ bool operator()(Iterator begin, Iterator end, Iterator pos)
+ {
+ if(pos == begin || pos == end)
+ return true;
+
+ return detail::grapheme_is_break
+ [ucd::get_grapheme_cluster_break(*boost::prior(pos))]
+ [ucd::get_grapheme_cluster_break(*pos)];
+ }
+};
+
+} // unicode
+
+template<typename Range>
+iterator_range<
+ consumer_iterator<
+ typename range_iterator<const Range>::type,
+ boundary_consumer<unicode::grapheme_boundary>
+ >
+>
+grapheme_bounded(const Range& range)
+{
+ return consumed(range, make_boundary_consumer(unicode::grapheme_boundary()));
+}
+
+} // boost
+
+#endif

Modified: sandbox/SOC/2009/unicode/boost/unicode/ucd/detail/unichar_data.hpp
==============================================================================
--- sandbox/SOC/2009/unicode/boost/unicode/ucd/detail/unichar_data.hpp (original)
+++ sandbox/SOC/2009/unicode/boost/unicode/ucd/detail/unichar_data.hpp 2009-06-25 23:15:27 EDT (Thu, 25 Jun 2009)
@@ -3,10 +3,13 @@
 
 #include <boost/assert.hpp>
 #include <boost/mpl/int.hpp>
+#include <boost/integer/static_log2.hpp>
 
 #include <boost/cuchar.hpp>
 #include <boost/unicode/ucd/properties_types.hpp>
 
+#define BOOST_UNICODE_ENUM_SIZE(en) (boost::static_log2<boost::unicode::ucd::en::_count>::value + 1)
+
 namespace boost
 {
 namespace unicode
@@ -100,23 +103,21 @@
 
         struct
         {
- uint32_t category : 5;
- uint32_t join_type : 3;
- uint32_t word_break : 3;
- uint32_t unknown_char : 1;
+ unsigned category : BOOST_UNICODE_ENUM_SIZE(category);
+ unsigned join_type : BOOST_UNICODE_ENUM_SIZE(join_type);
+ unsigned word_break : BOOST_UNICODE_ENUM_SIZE(word_break);
+ unsigned unknown_char : 1;
             // first value for sort_variable
- uint32_t sort_variable : 1;
- uint32_t sort_data_type : 2;
- uint32_t sort_data2 : 16;
- uint32_t : 0; // alignment
-
- uint32_t bidi_class : 5;
- uint32_t decomposition_type : 5;
- uint32_t break_class : 6;
- uint32_t combining : 8;
- uint32_t sentence_break : 4;
- uint32_t grapheme_cluster_break : 4;
- uint32_t : 0; // alignment
+ unsigned sort_variable : 1;
+ unsigned sort_data_type : 2;
+ unsigned sort_data2 : 16;
+
+ unsigned bidi_class : BOOST_UNICODE_ENUM_SIZE(bidi_class);
+ unsigned decomposition_type : BOOST_UNICODE_ENUM_SIZE(decomposition_type);
+ unsigned break_class : BOOST_UNICODE_ENUM_SIZE(break_class);
+ unsigned combining : 8;
+ unsigned sentence_break : BOOST_UNICODE_ENUM_SIZE(sentence_break);
+ unsigned grapheme_cluster_break : BOOST_UNICODE_ENUM_SIZE(grapheme_cluster_break);
         };
         // the meaning of this is controlled by predefined_sort
         const uint16_t sort_index_or_data1;

Modified: sandbox/SOC/2009/unicode/boost/unicode/ucd/properties.hpp
==============================================================================
--- sandbox/SOC/2009/unicode/boost/unicode/ucd/properties.hpp (original)
+++ sandbox/SOC/2009/unicode/boost/unicode/ucd/properties.hpp 2009-06-25 23:15:27 EDT (Thu, 25 Jun 2009)
@@ -10,8 +10,8 @@
 #include <algorithm>
 #include <iostream>
 
-#define BOOST_UNICODE_UCD_VERSION_MAJOR 4
-#define BOOST_UNICODE_UCD_VERSION_MINOR 0
+#define BOOST_UNICODE_UCD_VERSION_MAJOR 5
+#define BOOST_UNICODE_UCD_VERSION_MINOR 1
 
 namespace boost
 {

Modified: sandbox/SOC/2009/unicode/boost/unicode/ucd/properties_types.hpp
==============================================================================
--- sandbox/SOC/2009/unicode/boost/unicode/ucd/properties_types.hpp (original)
+++ sandbox/SOC/2009/unicode/boost/unicode/ucd/properties_types.hpp 2009-06-25 23:15:27 EDT (Thu, 25 Jun 2009)
@@ -23,9 +23,10 @@
         
                 struct category
                 {
- enum type // maximum 32 values (5 bits)
+ enum type
                         {
- letter_uppercase = 0,
+ unknown,
+ letter_uppercase,
                                 letter_lowercase,
                                 letter_titlecase,
                                 letter_modifier,
@@ -57,7 +58,6 @@
                                 // Todo: collapse these values into one?
                                 // It seems too subtle a difference.
                                 other_not_assigned,
- unknown, // default value for unknown characters
 
                                 _count
                         };
@@ -66,14 +66,15 @@
 
                 struct join_type
                 {
- enum type // maximum 8 values (3 bits)
+ enum type
                         {
- none = 0, // default value for unknown characters
+ none, // default value for unknown characters
                                 right,
                                 left,
                                 dual,
                                 causing,
                                 transparent,
+
                                 _count
                         };
                 };
@@ -81,7 +82,7 @@
 
                 struct bidi_class
                 {
- enum type // maximum 32 values (5 bits)
+ enum type
                         {
                                 // default value for unknown characters
                                 strong_left_to_right = 1,
@@ -114,9 +115,10 @@
 
                 struct break_class
                 {
- enum type // maximum 64 values (6 bits)
+ enum type
                         {
- mandatory = 0,
+ unknown,
+ mandatory,
                                 carriage_return,
                                 line_feed,
                                 combining_mark,
@@ -151,23 +153,22 @@
                                 hangul_v_jamo,
                                 hangul_t_jamo,
                                 complex_context,
- unknown, // default value for unknown characters
 
                                 _count
                         };
                 };
                 const char* as_string(break_class::type);
                  
- struct break_action // maximum 8 values (3 bits)
+ struct break_action
                 {
                         enum type
                         {
- direct = 0,
- indirect = 1, // default value for unknown characters
- combining_indirect = 2,
- combining_prohibited = 3,
- prohibited = 4,
- always = 5,
+ direct,
+ indirect, // default value for unknown characters
+ combining_indirect,
+ combining_prohibited,
+ prohibited,
+ always,
 
                                 _count
                         };
@@ -176,9 +177,10 @@
 
                 struct decomposition_type
                 {
- enum type // maximum 32 values (5 bits)
+ enum type
                         {
- font = 0,
+ none, // default value for unknown characters
+ font,
                                 no_break,
                                 initial,
                                 medial,
@@ -195,7 +197,6 @@
                                 fraction,
                                 compat,
                                 canonical,
- none, // default value for unknown characters
 
                                 _count
                         };
@@ -204,19 +205,20 @@
 
         struct grapheme_cluster_break
         {
- enum type // maximum 16 values (4 bits)
+ enum type
             {
- cr = 0, // value fixed
- lf = 1, // value fixed
- control = 2, // value fixed
- l = 3, // value fixed
- v = 4, // value fixed
- t = 5, // value fixed
- lv = 6, // value fixed
- lvt = 7, // value fixed
- extend = 8, // value fixed
- // default value for unknown characters
- any = 9, // value fixed
+ any,
+ cr,
+ lf,
+ control,
+ l,
+ v,
+ t,
+ lv,
+ lvt,
+ extend,
+ prepend,
+ spacing_mark,
    
                                 _count
             };
@@ -225,16 +227,21 @@
 
         struct word_break
         {
- enum type // maximum 8 values (3 bits)
+ enum type
             {
- format = 0,
+ any,
+ format,
                 katakana,
                 aletter,
                 midletter,
                 midnum,
                 numeric,
                 extendnumlet,
- any, // default value for unknown characters
+ cr,
+ lf,
+ newline,
+ extend,
+ midnumlet,
    
                                 _count
             };
@@ -243,9 +250,10 @@
 
         struct sentence_break
         {
- enum type // maximum 16 values (4 bits)
+ enum type
             {
- sep = 0,
+ any,
+ sep,
                 format,
                 sp,
                 lower,
@@ -255,7 +263,10 @@
                 aterm,
                 sterm,
                 close,
- any, // default value for unknown characters
+ cr,
+ lf,
+ extend,
+ scontinue,
    
                                 _count
             };

Modified: sandbox/SOC/2009/unicode/libs/unicode/data_parser/read_character_properties.hpp
==============================================================================
--- sandbox/SOC/2009/unicode/libs/unicode/data_parser/read_character_properties.hpp (original)
+++ sandbox/SOC/2009/unicode/libs/unicode/data_parser/read_character_properties.hpp 2009-06-25 23:15:27 EDT (Thu, 25 Jun 2009)
@@ -14,6 +14,10 @@
 #include <string>
 #include <vector>
 #include <map>
+#include <iostream>
+#include <ostream>
+#include <iterator>
+#include <boost/spirit/include/classic.hpp>
 
 #include <boost/unicode/ucd/detail/unichar_data.hpp>
 
@@ -149,4 +153,62 @@
 
 } // namespace boost
 
+template<typename T>
+struct warning_assign_a_type
+{
+ warning_assign_a_type(T& name_, T value_) : name(name_), value(value_)
+ {
+ }
+
+ template<typename Iterator>
+ void operator()(Iterator begin, Iterator end) const
+ {
+ std::cout << "\nWarning: unsupported property value ";
+ std::copy(begin, end, std::ostream_iterator<char>(std::cout));
+ std::cout << std::flush;
+ name = value;
+ }
+
+ T& name;
+ T value;
+};
+
+template<typename T>
+warning_assign_a_type<T> warning_assign_a(T& name, T value)
+{
+ return warning_assign_a_type<T>(name, value);
+}
+
+struct identifier_p :
+ boost::spirit::classic::sequence<
+ boost::spirit::classic::strlit<char const*>,
+ boost::spirit::classic::empty_match_parser<
+ boost::spirit::classic::negated_char_parser<
+ boost::spirit::classic::alnum_parser
+ >
+ >
+ >
+{
+private:
+ typedef boost::spirit::classic::sequence<
+ boost::spirit::classic::strlit<char const*>,
+ boost::spirit::classic::empty_match_parser<
+ boost::spirit::classic::negated_char_parser<
+ boost::spirit::classic::alnum_parser
+ >
+ >
+ > base_t;
+
+ base_t definition(const char* name)
+ {
+ using namespace boost::spirit::classic;
+ return str_p(name) >> eps_p(~alnum_p);
+ }
+
+public:
+ identifier_p(char const* name) : base_t(definition(name))
+ {
+ }
+};
+
 #endif // BOOST_UNICODE_READ_CHARACTER_PROPERTIES_HPP_INCLUDED

Modified: sandbox/SOC/2009/unicode/libs/unicode/data_parser/read_character_properties_grapheme_break.cpp
==============================================================================
--- sandbox/SOC/2009/unicode/libs/unicode/data_parser/read_character_properties_grapheme_break.cpp (original)
+++ sandbox/SOC/2009/unicode/libs/unicode/data_parser/read_character_properties_grapheme_break.cpp 2009-06-25 23:15:27 EDT (Thu, 25 Jun 2009)
@@ -91,44 +91,44 @@
>> ';' >>
                         // block name
                         // type of break
- (str_p ("other")
+ (identifier_p ("other")
                             [assign_a (grapheme_break,
                                     grapheme_cluster_break::any)] |
- str_p ("CR")
+ identifier_p ("CR")
                             [assign_a (grapheme_break,
                                     grapheme_cluster_break::cr)] |
- str_p ("LF")
+ identifier_p ("LF")
                             [assign_a (grapheme_break,
                                     grapheme_cluster_break::lf)] |
- str_p ("Control")
+ identifier_p ("Control")
                             [assign_a (grapheme_break,
                                     grapheme_cluster_break::control)] |
- str_p ("Extend")
+ identifier_p ("Extend")
                             [assign_a (grapheme_break,
                                     grapheme_cluster_break::extend)] |
- /*str_p ("Prepend")
+ identifier_p ("Prepend")
                             [assign_a (grapheme_break,
                                     grapheme_cluster_break::prepend)] |
- str_p ("SpacingMark")
+ identifier_p ("SpacingMark")
                             [assign_a (grapheme_break,
- grapheme_cluster_break::spacing_mark)] | */
- str_p ("L")
+ grapheme_cluster_break::spacing_mark)] |
+ identifier_p ("L")
                             [assign_a (grapheme_break,
                                     grapheme_cluster_break::l)] |
- str_p ("V")
+ identifier_p ("V")
                             [assign_a (grapheme_break,
                                     grapheme_cluster_break::v)] |
- str_p ("T")
+ identifier_p ("T")
                             [assign_a (grapheme_break,
                                     grapheme_cluster_break::t)] |
- str_p ("LV")
+ identifier_p ("LV")
                             [assign_a (grapheme_break,
                                     grapheme_cluster_break::lv)] |
- str_p ("LVT")
+ identifier_p ("LVT")
                             [assign_a (grapheme_break,
                                     grapheme_cluster_break::lvt)] |
- +alnum_p
- [assign_a (grapheme_break,
+ (+alnum_p)
+ [warning_assign_a(grapheme_break,
                     grapheme_cluster_break::any)]) >>
                         // Skip any remaining entries, i.e., parse future versions
                         // of the table as well.

Modified: sandbox/SOC/2009/unicode/libs/unicode/data_parser/read_character_properties_linebreak.cpp
==============================================================================
--- sandbox/SOC/2009/unicode/libs/unicode/data_parser/read_character_properties_linebreak.cpp (original)
+++ sandbox/SOC/2009/unicode/libs/unicode/data_parser/read_character_properties_linebreak.cpp 2009-06-25 23:15:27 EDT (Thu, 25 Jun 2009)
@@ -162,7 +162,9 @@
                                 break_class::hangul_t_jamo)] |
                         str_p("SA") [assign_a (break_type,
                                 break_class::complex_context)] |
- /*str_p("XX")*/ +alnum_p [assign_a (break_type,
+ str_p("XX") [assign_a (break_type,
+ break_class::unknown)] |
+ (+alnum_p) [warning_assign_a (break_type,
                                 break_class::unknown)]
                         ) >>
                         // Skip any remaining entries, i.e., parse future versions

Modified: sandbox/SOC/2009/unicode/libs/unicode/data_parser/read_character_properties_sentence.cpp
==============================================================================
--- sandbox/SOC/2009/unicode/libs/unicode/data_parser/read_character_properties_sentence.cpp (original)
+++ sandbox/SOC/2009/unicode/libs/unicode/data_parser/read_character_properties_sentence.cpp 2009-06-25 23:15:27 EDT (Thu, 25 Jun 2009)
@@ -91,38 +91,50 @@
>> ';' >>
                         // block name
                         // type of break
- (str_p ("Sep")
+ (identifier_p ("Sep")
                             [assign_a (sentence,
                                     sentence_break::sep)] |
- str_p ("Format")
+ identifier_p ("Format")
                             [assign_a (sentence,
                                     sentence_break::format)] |
- str_p ("Sp")
+ identifier_p ("Sp")
                             [assign_a (sentence,
                                     sentence_break::sp)] |
- str_p ("Lower")
+ identifier_p ("Lower")
                             [assign_a (sentence,
                                     sentence_break::lower)] |
- str_p ("Upper")
+ identifier_p ("Upper")
                             [assign_a (sentence,
                                     sentence_break::upper)] |
- str_p ("OLetter")
+ identifier_p ("OLetter")
                             [assign_a (sentence,
                                     sentence_break::oletter)] |
- str_p ("Numeric")
+ identifier_p ("Numeric")
                             [assign_a (sentence,
                                     sentence_break::numeric)] |
- str_p ("ATerm")
+ identifier_p ("ATerm")
                             [assign_a (sentence,
                                     sentence_break::aterm)] |
- str_p ("STerm")
+ identifier_p ("STerm")
                             [assign_a (sentence,
                                     sentence_break::sterm)] |
- str_p ("Close")
+ identifier_p ("Close")
                             [assign_a (sentence,
                                     sentence_break::close)] |
- +alnum_p
+ identifier_p ("CR")
                             [assign_a (sentence,
+ sentence_break::cr)] |
+ identifier_p ("LF")
+ [assign_a (sentence,
+ sentence_break::lf)] |
+ identifier_p ("Extend")
+ [assign_a (sentence,
+ sentence_break::extend)] |
+ identifier_p ("SContinue")
+ [assign_a (sentence,
+ sentence_break::scontinue)] |
+ (+alnum_p)
+ [warning_assign_a (sentence,
                                     sentence_break::any)]) >>
                         // Skip any remaining entries, i.e., parse future versions
                         // of the table as well.

Modified: sandbox/SOC/2009/unicode/libs/unicode/data_parser/read_character_properties_word_break.cpp
==============================================================================
--- sandbox/SOC/2009/unicode/libs/unicode/data_parser/read_character_properties_word_break.cpp (original)
+++ sandbox/SOC/2009/unicode/libs/unicode/data_parser/read_character_properties_word_break.cpp 2009-06-25 23:15:27 EDT (Thu, 25 Jun 2009)
@@ -91,29 +91,44 @@
>> ';' >>
                         // block name
                         // type of break
- (str_p ("Format")
+ (identifier_p ("Format")
                             [assign_a (boundary,
                                     word_break::format)] |
- str_p ("Katakana")
+ identifier_p ("Katakana")
                             [assign_a (boundary,
                                     word_break::katakana)] |
- str_p ("ALetter")
+ identifier_p ("ALetter")
                             [assign_a (boundary,
                                     word_break::aletter)] |
- str_p ("MidLetter")
+ identifier_p ("MidLetter")
                             [assign_a (boundary,
                                     word_break::midletter)] |
- str_p ("MidNum")
+ identifier_p ("MidNum")
                             [assign_a (boundary,
                                     word_break::midnum)] |
- str_p ("Numeric")
+ identifier_p ("Numeric")
                             [assign_a (boundary,
                                     word_break::numeric)] |
- str_p ("ExtendNumLet")
+ identifier_p ("ExtendNumLet")
                             [assign_a (boundary,
                                     word_break::extendnumlet)] |
- +alnum_p
- [assign_a (boundary,
+ identifier_p ("CR")
+ [assign_a (boundary,
+ word_break::cr)] |
+ identifier_p ("LF")
+ [assign_a (boundary,
+ word_break::lf)] |
+ identifier_p ("Newline")
+ [assign_a (boundary,
+ word_break::newline)] |
+ identifier_p ("Extend")
+ [assign_a (boundary,
+ word_break::extend)] |
+ identifier_p ("MidNumLet")
+ [assign_a (boundary,
+ word_break::midnumlet)] |
+ (+alnum_p)
+ [warning_assign_a (boundary,
                                     word_break::any)]) >>
                         // Skip any remaining entries, i.e., parse future versions
                         // of the table as well.

Modified: sandbox/SOC/2009/unicode/libs/unicode/doc/users_manual.qbk
==============================================================================
--- sandbox/SOC/2009/unicode/libs/unicode/doc/users_manual.qbk (original)
+++ sandbox/SOC/2009/unicode/libs/unicode/doc/users_manual.qbk 2009-06-25 23:15:27 EDT (Thu, 25 Jun 2009)
@@ -185,6 +185,8 @@
 
 ``auto concept Pipe<typename T>
 {
+ T::T();
+
     typename output_type = T::output_type;
     static const int T::max_output; // optional
 
@@ -200,6 +202,8 @@
 
 ``auto concept OneManyPipe<typename T>
 {
+ T::T();
+
     typename Input;
 
     typename output_type = T::output_type;
@@ -239,8 +243,12 @@
     bool T::operator()(Iterator begin, Iterator end, Iterator pos);
 };``
 
+models: [classref boost::unicode::grapheme_boundary].
+
 ``auto concept Consumer<typename T>
 {
+ T::T();
+
     template<typename Iterator>
     Iterator T::ltr(Iterator begin, Iterator end);
     
@@ -248,11 +256,13 @@
     Iterator T::rtl(Iterator begin, Iterator end);
 }``
 
-Can be obtained by converting a =Pipe= with [classref boost::pipe_consumer] or a =BoundaryChecker= with =boost::boundary_consumer=.
+Can be obtained by converting a =Pipe= with [classref boost::pipe_consumer] or a =BoundaryChecker= with [classref boost::boundary_consumer].
 
 A =Consumer= may then be used with [classref boost::consumer_iterator] to generate iterator/range
 adapters with turns the range into a range of subranges, each subrange being one consumed input.
 
+See also: [funcref boost::grapheme_bounded].
+
 [endsect]
 
 [xinclude autodoc.xml]

Modified: sandbox/SOC/2009/unicode/libs/unicode/example/test.cpp
==============================================================================
--- sandbox/SOC/2009/unicode/libs/unicode/example/test.cpp (original)
+++ sandbox/SOC/2009/unicode/libs/unicode/example/test.cpp 2009-06-25 23:15:27 EDT (Thu, 25 Jun 2009)
@@ -2,6 +2,7 @@
 #include <boost/foreach.hpp>
 #include <boost/unicode/utf.hpp>
 #include <boost/unicode/ucd/properties.hpp>
+#include <boost/unicode/graphemes.hpp>
 
 #include <boost/typeof/typeof.hpp>
 
@@ -25,16 +26,29 @@
     std::copy(boost::begin(range), boost::end(range), out);
 }
 
-#define FOREACH_AUTO_BEGIN(name, range) \
+template<typename Range>
+size_t count(const Range& range)
+{
+ size_t count = 0;
+ for(typename boost::range_iterator<const Range>::type it = boost::begin(range); it != boost::end(range); ++it)
+ count++;
+
+ return count;
+}
+
+#define FOREACH_AUTO(name, range) \
+if(boost::begin(range) != boost::end(range)) \
+if(bool _once_##__LINE__ = 1) \
+for( \
+ BOOST_AUTO(name, *boost::begin(range)); \
+ _once_##__LINE__; \
+ _once_##__LINE__ = 0 \
+) \
 for( \
     BOOST_AUTO(_it_##__LINE__, boost::begin(range)); \
- _it_##__LINE__ != boost::end(range); \
+ name = *_it_##__LINE__, _it_##__LINE__ != boost::end(range); \
     ++_it_##__LINE__ \
 ) \
-{ \
- BOOST_AUTO(name, *_it_##__LINE__);
-
-#define FOREACH_AUTO_END }
 
 int main()
 {
@@ -69,13 +83,39 @@
     std::cout << std::endl;
     
     BOOST_AUTO(range, boost::u8_bounded( boost::u8_encoded(v) ) );
- FOREACH_AUTO_BEGIN(code_points, range)
- FOREACH_AUTO_BEGIN(cu, code_points)
+ FOREACH_AUTO(code_points, range)
+ {
+ FOREACH_AUTO(cu, code_points)
             std::cout << ' ' << std::hex << (int)(unsigned char)cu;
- FOREACH_AUTO_END
+
         std::cout << ',';
- FOREACH_AUTO_END
+ }
+
+ std::cout << "\n";
+
+ char foo[] = "eoaéôn";
+ FOREACH_AUTO(subrange, boost::u8_bounded(foo))
+ {
+ BOOST_FOREACH(unsigned char c, subrange)
+ std::cout << c;
+
+ std::cout << ' ';
+ }
+ std::cout << std::endl;
         
     std::cout << "\n" << boost::unicode::ucd::get_name(0xE9) << std::endl;
     std::cout << boost::unicode::ucd::as_string(boost::unicode::ucd::get_block(0xE9)) << std::endl;
+
+ boost::char32 grapheme_test[] = {
+ 'f', 'o', 'o', '\r', '\n', 275, 769, ' ', 0x1e17
+ };
+
+ FOREACH_AUTO(code_points, boost::grapheme_bounded(grapheme_test))
+ {
+ BOOST_FOREACH(unsigned char c, boost::u8_encoded(code_points))
+ std::cout << c;
+ std::cout << '(' << count(code_points) << ')';
+ }
+
+ std::cout << std::endl;
 }

Modified: sandbox/SOC/2009/unicode/libs/unicode/src/Jamfile.v2
==============================================================================
--- sandbox/SOC/2009/unicode/libs/unicode/src/Jamfile.v2 (original)
+++ sandbox/SOC/2009/unicode/libs/unicode/src/Jamfile.v2 2009-06-25 23:15:27 EDT (Thu, 25 Jun 2009)
@@ -12,4 +12,9 @@
       <include>$(BOOST_ROOT)
     ;
 
-lib boost-unicode : unicode_properties.cpp unicode_blocks.cpp ucd/uni_ucd_interface_impl_data.cpp ;
+lib boost-unicode
+ :
+ unicode_properties.cpp
+ unicode_blocks.cpp
+ unicode_graphemes.cpp
+ ucd/uni_ucd_interface_impl_data.cpp ;

Modified: sandbox/SOC/2009/unicode/libs/unicode/src/ucd/uni_ucd_interface_impl_data_1.ipp
==============================================================================
--- sandbox/SOC/2009/unicode/libs/unicode/src/ucd/uni_ucd_interface_impl_data_1.ipp (original)
+++ sandbox/SOC/2009/unicode/libs/unicode/src/ucd/uni_ucd_interface_impl_data_1.ipp 2009-06-25 23:15:27 EDT (Thu, 25 Jun 2009)
@@ -274,7 +274,7 @@
                 {
                         category::other_control,
                         join_type::none,
- word_break::any,
+ word_break::lf,
                         false,
                         true,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -283,7 +283,7 @@
                         decomposition_type::none,
                         break_class::line_feed,
                         0,
- sentence_break::any,
+ sentence_break::lf,
                         grapheme_cluster_break::lf,
                 },
                 514,
@@ -298,7 +298,7 @@
                 {
                         category::other_control,
                         join_type::none,
- word_break::any,
+ word_break::newline,
                         false,
                         true,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -322,7 +322,7 @@
                 {
                         category::other_control,
                         join_type::none,
- word_break::any,
+ word_break::newline,
                         false,
                         true,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -346,7 +346,7 @@
                 {
                         category::other_control,
                         join_type::none,
- word_break::any,
+ word_break::cr,
                         false,
                         true,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -355,7 +355,7 @@
                         decomposition_type::none,
                         break_class::carriage_return,
                         0,
- sentence_break::any,
+ sentence_break::cr,
                         grapheme_cluster_break::cr,
                 },
                 517,
@@ -970,7 +970,7 @@
                 {
                         category::punctuation_other,
                         join_type::none,
- word_break::midnum,
+ word_break::midnumlet,
                         false,
                         true,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -1099,7 +1099,7 @@
                         decomposition_type::none,
                         break_class::infix_separator,
                         0,
- sentence_break::any,
+ sentence_break::scontinue,
                         grapheme_cluster_break::any,
                 },
                 562,
@@ -1123,7 +1123,7 @@
                         decomposition_type::none,
                         break_class::hyphen,
                         0,
- sentence_break::any,
+ sentence_break::scontinue,
                         grapheme_cluster_break::any,
                 },
                 546,
@@ -1138,7 +1138,7 @@
                 {
                         category::punctuation_other,
                         join_type::none,
- word_break::midnum,
+ word_break::midnumlet,
                         false,
                         true,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -1435,7 +1435,7 @@
                         decomposition_type::none,
                         break_class::infix_separator,
                         0,
- sentence_break::any,
+ sentence_break::scontinue,
                         grapheme_cluster_break::any,
                 },
                 578,
@@ -3313,7 +3313,7 @@
                 {
                         category::other_control,
                         join_type::none,
- word_break::any,
+ word_break::newline,
                         false,
                         true,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -18875,7 +18875,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -18884,7 +18884,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 53,
@@ -18899,7 +18899,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -18908,7 +18908,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 50,
@@ -18923,7 +18923,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -18932,7 +18932,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 60,
@@ -18947,7 +18947,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -18956,7 +18956,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 78,
@@ -18971,7 +18971,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -18980,7 +18980,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 91,
@@ -18995,7 +18995,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19004,7 +19004,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 95,
@@ -19019,7 +19019,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19028,7 +19028,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 55,
@@ -19043,7 +19043,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19052,7 +19052,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 82,
@@ -19067,7 +19067,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19076,7 +19076,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 71,
@@ -19091,7 +19091,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19100,7 +19100,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 96,
@@ -19115,7 +19115,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19124,7 +19124,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 67,
@@ -19139,7 +19139,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19148,7 +19148,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 77,
@@ -19163,7 +19163,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19172,7 +19172,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 65,
@@ -19187,7 +19187,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19196,7 +19196,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 97,
@@ -19211,7 +19211,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19220,7 +19220,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 98,
@@ -19235,7 +19235,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19244,7 +19244,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 99,
@@ -19259,7 +19259,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19268,7 +19268,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 100,
@@ -19283,7 +19283,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19292,7 +19292,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 101,
@@ -19307,7 +19307,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19316,7 +19316,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 102,
@@ -19331,7 +19331,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19340,7 +19340,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 34,
@@ -19355,7 +19355,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19364,7 +19364,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 42,
@@ -19379,7 +19379,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19388,7 +19388,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         232,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 103,
@@ -19403,7 +19403,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19412,7 +19412,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 104,
@@ -19427,7 +19427,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19436,7 +19436,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 105,
@@ -19451,7 +19451,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19460,7 +19460,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 106,
@@ -19475,7 +19475,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19484,7 +19484,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 107,
@@ -19499,7 +19499,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19508,7 +19508,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         232,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 108,
@@ -19523,7 +19523,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19532,7 +19532,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         216,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 109,
@@ -19547,7 +19547,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19556,7 +19556,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 115,
@@ -19571,7 +19571,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19580,7 +19580,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 116,
@@ -19595,7 +19595,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19604,7 +19604,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 117,
@@ -19619,7 +19619,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19628,7 +19628,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 118,
@@ -19643,7 +19643,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19652,7 +19652,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 119,
@@ -19667,7 +19667,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19676,7 +19676,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         202,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 120,
@@ -19691,7 +19691,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19700,7 +19700,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         202,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 121,
@@ -19715,7 +19715,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19724,7 +19724,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 122,
@@ -19739,7 +19739,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19748,7 +19748,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 127,
@@ -19763,7 +19763,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19772,7 +19772,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 128,
@@ -19787,7 +19787,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19796,7 +19796,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 129,
@@ -19811,7 +19811,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19820,7 +19820,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         202,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 86,
@@ -19835,7 +19835,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19844,7 +19844,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         202,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 89,
@@ -19859,7 +19859,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19868,7 +19868,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 130,
@@ -19883,7 +19883,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19892,7 +19892,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 131,
@@ -19907,7 +19907,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19916,7 +19916,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 132,
@@ -19931,7 +19931,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19940,7 +19940,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 133,
@@ -19955,7 +19955,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19964,7 +19964,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 134,
@@ -19979,7 +19979,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -19988,7 +19988,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 135,
@@ -20003,7 +20003,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -20012,7 +20012,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 136,
@@ -20027,7 +20027,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -20036,7 +20036,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 137,
@@ -20051,7 +20051,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -20060,7 +20060,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 138,
@@ -20075,7 +20075,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -20084,7 +20084,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 33,
@@ -20099,7 +20099,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -20108,7 +20108,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 139,
@@ -20123,7 +20123,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -20132,7 +20132,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         1,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 140,
@@ -20147,7 +20147,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -20156,7 +20156,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         1,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 141,
@@ -20171,7 +20171,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -20180,7 +20180,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         1,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 142,
@@ -20195,7 +20195,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -20204,7 +20204,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         1,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 143,
@@ -20219,7 +20219,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -20228,7 +20228,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         1,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 84,
@@ -20243,7 +20243,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -20252,7 +20252,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 144,
@@ -20267,7 +20267,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -20276,7 +20276,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 145,
@@ -20291,7 +20291,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -20300,7 +20300,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 146,
@@ -20315,7 +20315,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -20324,7 +20324,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 147,
@@ -20339,7 +20339,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -20348,7 +20348,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 148,
@@ -20363,7 +20363,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -20372,7 +20372,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 149,
@@ -20387,7 +20387,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -20396,7 +20396,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 150,
@@ -20411,7 +20411,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::is_index,
@@ -20420,7 +20420,7 @@
                         decomposition_type::canonical,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 342,
@@ -20435,7 +20435,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::is_index,
@@ -20444,7 +20444,7 @@
                         decomposition_type::canonical,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 342,
@@ -20459,7 +20459,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -20468,7 +20468,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 69,
@@ -20483,7 +20483,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::is_index,
@@ -20492,7 +20492,7 @@
                         decomposition_type::canonical,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 342,
@@ -20507,7 +20507,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::is_index,
@@ -20516,7 +20516,7 @@
                         decomposition_type::canonical,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 342,
@@ -20531,7 +20531,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -20540,7 +20540,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         240,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 151,
@@ -20555,7 +20555,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -20564,7 +20564,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 152,
@@ -20579,7 +20579,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -20588,7 +20588,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 153,
@@ -20603,7 +20603,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -20612,7 +20612,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 154,
@@ -20627,7 +20627,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -20636,7 +20636,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 155,
@@ -20651,7 +20651,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -20660,7 +20660,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 156,
@@ -20675,7 +20675,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -20684,7 +20684,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 157,
@@ -20699,7 +20699,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -20708,7 +20708,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 158,
@@ -20723,7 +20723,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -20732,7 +20732,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 159,
@@ -20747,7 +20747,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -20756,7 +20756,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 160,
@@ -20771,7 +20771,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -20780,7 +20780,7 @@
                         decomposition_type::none,
                         break_class::non_breaking,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -20795,7 +20795,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -20804,7 +20804,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 161,
@@ -20819,7 +20819,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -20828,7 +20828,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 162,
@@ -20843,7 +20843,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -20852,7 +20852,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 163,
@@ -20867,7 +20867,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -20876,7 +20876,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 164,
@@ -20891,7 +20891,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -20900,7 +20900,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 165,
@@ -20915,7 +20915,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -20924,7 +20924,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 166,
@@ -20939,7 +20939,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -20948,7 +20948,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 167,
@@ -20963,7 +20963,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -20972,7 +20972,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 168,
@@ -20987,7 +20987,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -20996,7 +20996,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         232,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 169,
@@ -21011,7 +21011,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -21020,7 +21020,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 170,
@@ -21035,7 +21035,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -21044,7 +21044,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 171,
@@ -21059,7 +21059,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -21068,7 +21068,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 172,
@@ -21083,7 +21083,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -21092,7 +21092,7 @@
                         decomposition_type::none,
                         break_class::non_breaking,
                         233,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 173,
@@ -21107,7 +21107,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -21116,7 +21116,7 @@
                         decomposition_type::none,
                         break_class::non_breaking,
                         234,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 174,
@@ -21131,7 +21131,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -21140,7 +21140,7 @@
                         decomposition_type::none,
                         break_class::non_breaking,
                         234,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 175,
@@ -21155,7 +21155,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -21164,7 +21164,7 @@
                         decomposition_type::none,
                         break_class::non_breaking,
                         233,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 176,
@@ -21179,7 +21179,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -21188,7 +21188,7 @@
                         decomposition_type::none,
                         break_class::non_breaking,
                         234,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 177,
@@ -21203,7 +21203,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -21212,7 +21212,7 @@
                         decomposition_type::none,
                         break_class::non_breaking,
                         234,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 178,
@@ -21227,7 +21227,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -21236,7 +21236,7 @@
                         decomposition_type::none,
                         break_class::non_breaking,
                         233,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 179,
@@ -21251,7 +21251,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -21260,7 +21260,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 4417,
@@ -21275,7 +21275,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -21284,7 +21284,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 4509,
@@ -21299,7 +21299,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -21308,7 +21308,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 4638,
@@ -21323,7 +21323,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -21332,7 +21332,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 4800,
@@ -21347,7 +21347,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -21356,7 +21356,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 4997,
@@ -21371,7 +21371,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -21380,7 +21380,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 4463,
@@ -21395,7 +21395,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -21404,7 +21404,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 4482,
@@ -21419,7 +21419,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -21428,7 +21428,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 4613,
@@ -21443,7 +21443,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -21452,7 +21452,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 4753,
@@ -21467,7 +21467,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -21476,7 +21476,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 4876,
@@ -21491,7 +21491,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -21500,7 +21500,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 4965,
@@ -21515,7 +21515,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -21524,7 +21524,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 5037,
@@ -21539,7 +21539,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -21548,7 +21548,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 5065,
@@ -28300,7 +28300,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -28309,7 +28309,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 199,
@@ -28324,7 +28324,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -28333,7 +28333,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 200,
@@ -28348,7 +28348,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -28357,7 +28357,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 201,
@@ -28372,7 +28372,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -28381,7 +28381,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 202,
@@ -28396,7 +28396,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -28405,7 +28405,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 203,
@@ -28420,7 +28420,7 @@
                 {
                         category::mark_enclosing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -28429,7 +28429,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -28444,7 +28444,7 @@
                 {
                         category::mark_enclosing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -28453,7 +28453,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -33550,7 +33550,7 @@
                         decomposition_type::none,
                         break_class::ordinary_alpabetic_or_symbol_character,
                         0,
- sentence_break::any,
+ sentence_break::scontinue,
                         grapheme_cluster_break::any,
                 },
                 563,
@@ -34810,7 +34810,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -34819,7 +34819,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -34834,7 +34834,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -34843,7 +34843,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -34858,7 +34858,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -34867,7 +34867,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -34882,7 +34882,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -34891,7 +34891,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -34906,7 +34906,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -34915,7 +34915,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -34930,7 +34930,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -34939,7 +34939,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -34954,7 +34954,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -34963,7 +34963,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -34978,7 +34978,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -34987,7 +34987,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -35002,7 +35002,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35011,7 +35011,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -35026,7 +35026,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35035,7 +35035,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         222,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -35050,7 +35050,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35059,7 +35059,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -35074,7 +35074,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35083,7 +35083,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -35098,7 +35098,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35107,7 +35107,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -35122,7 +35122,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35131,7 +35131,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -35146,7 +35146,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35155,7 +35155,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -35170,7 +35170,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35179,7 +35179,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -35194,7 +35194,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35203,7 +35203,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -35218,7 +35218,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35227,7 +35227,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -35242,7 +35242,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35251,7 +35251,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -35266,7 +35266,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35275,7 +35275,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -35290,7 +35290,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35299,7 +35299,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -35314,7 +35314,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35323,7 +35323,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -35338,7 +35338,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35347,7 +35347,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -35362,7 +35362,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35371,7 +35371,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -35386,7 +35386,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35395,7 +35395,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -35410,7 +35410,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35419,7 +35419,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -35434,7 +35434,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35443,7 +35443,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -35458,7 +35458,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35467,7 +35467,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -35482,7 +35482,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35491,7 +35491,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         222,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -35506,7 +35506,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35515,7 +35515,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         228,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -35530,7 +35530,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35539,7 +35539,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -35554,7 +35554,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35563,7 +35563,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         10,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 207,
@@ -35578,7 +35578,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35587,7 +35587,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         11,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 208,
@@ -35602,7 +35602,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35611,7 +35611,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         12,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 209,
@@ -35626,7 +35626,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35635,7 +35635,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         13,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 210,
@@ -35650,7 +35650,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35659,7 +35659,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         14,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 211,
@@ -35674,7 +35674,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35683,7 +35683,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         15,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 212,
@@ -35698,7 +35698,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35707,7 +35707,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         16,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 213,
@@ -35722,7 +35722,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35731,7 +35731,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         17,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 214,
@@ -35746,7 +35746,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35755,7 +35755,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         18,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 215,
@@ -35770,7 +35770,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35779,7 +35779,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         19,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 217,
@@ -35794,7 +35794,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35803,7 +35803,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         19,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 218,
@@ -35818,7 +35818,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35827,7 +35827,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         20,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 219,
@@ -35842,7 +35842,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35851,7 +35851,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         21,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 222,
@@ -35866,7 +35866,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35875,7 +35875,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         22,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -35914,7 +35914,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35923,7 +35923,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         23,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 225,
@@ -35962,7 +35962,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35971,7 +35971,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         24,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 221,
@@ -35986,7 +35986,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -35995,7 +35995,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         25,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 220,
@@ -36034,7 +36034,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -36043,7 +36043,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -36058,7 +36058,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -36067,7 +36067,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -36106,7 +36106,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -36115,7 +36115,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         18,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 216,
@@ -37789,7 +37789,7 @@
                         decomposition_type::none,
                         break_class::infix_separator,
                         0,
- sentence_break::any,
+ sentence_break::scontinue,
                         grapheme_cluster_break::any,
                 },
                 564,
@@ -37813,7 +37813,7 @@
                         decomposition_type::none,
                         break_class::infix_separator,
                         0,
- sentence_break::any,
+ sentence_break::scontinue,
                         grapheme_cluster_break::any,
                 },
                 565,
@@ -37876,7 +37876,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -37885,7 +37885,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -37900,7 +37900,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -37909,7 +37909,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -37924,7 +37924,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -37933,7 +37933,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -37948,7 +37948,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -37957,7 +37957,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -37972,7 +37972,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -37981,7 +37981,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -37996,7 +37996,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -38005,7 +38005,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -38020,7 +38020,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -38029,7 +38029,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -38044,7 +38044,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -38053,7 +38053,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -38068,7 +38068,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -38077,7 +38077,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         30,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -38092,7 +38092,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -38101,7 +38101,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         31,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -38116,7 +38116,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -38125,7 +38125,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         32,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -39292,7 +39292,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -39301,7 +39301,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         27,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 227,
@@ -39316,7 +39316,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -39325,7 +39325,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         28,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 228,
@@ -39340,7 +39340,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -39349,7 +39349,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         29,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 230,
@@ -39364,7 +39364,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -39373,7 +39373,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         30,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 232,
@@ -39388,7 +39388,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -39397,7 +39397,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         31,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 234,
@@ -39412,7 +39412,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -39421,7 +39421,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         32,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 236,
@@ -39436,7 +39436,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -39445,7 +39445,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         33,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 238,
@@ -39460,7 +39460,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -39469,7 +39469,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         34,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 240,
@@ -39484,7 +39484,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -39493,7 +39493,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 241,
@@ -39508,7 +39508,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -39517,7 +39517,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 242,
@@ -39532,7 +39532,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -39541,7 +39541,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 243,
@@ -39556,7 +39556,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -39565,7 +39565,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 244,
@@ -39580,7 +39580,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -39589,7 +39589,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 245,
@@ -39604,7 +39604,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -39613,7 +39613,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 246,
@@ -39628,7 +39628,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -39637,7 +39637,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 247,
@@ -39652,7 +39652,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -39661,7 +39661,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 248,
@@ -39676,7 +39676,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -39685,7 +39685,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 249,
@@ -39700,7 +39700,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -39709,7 +39709,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 250,
@@ -39724,7 +39724,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -39733,7 +39733,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 251,
@@ -39748,7 +39748,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -39757,7 +39757,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 252,
@@ -40180,7 +40180,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -40189,7 +40189,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         35,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 253,
@@ -42640,7 +42640,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -42649,7 +42649,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -42664,7 +42664,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -42673,7 +42673,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -42688,7 +42688,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -42697,7 +42697,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -42712,7 +42712,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -42721,7 +42721,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -42736,7 +42736,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -42745,7 +42745,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -42760,7 +42760,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -42769,7 +42769,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -42784,7 +42784,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -42793,7 +42793,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -42832,7 +42832,7 @@
                 {
                         category::mark_enclosing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -42841,7 +42841,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -42856,7 +42856,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -42865,7 +42865,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -42880,7 +42880,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -42889,7 +42889,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -42904,7 +42904,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -42913,7 +42913,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -42928,7 +42928,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -42937,7 +42937,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -42952,7 +42952,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -42961,7 +42961,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -42976,7 +42976,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -42985,7 +42985,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -43048,7 +43048,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -43057,7 +43057,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -43072,7 +43072,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -43081,7 +43081,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -43120,7 +43120,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -43129,7 +43129,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -43144,7 +43144,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -43153,7 +43153,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -43168,7 +43168,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -43177,7 +43177,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -43192,7 +43192,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -43201,7 +43201,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 0,
@@ -44065,7 +44065,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -44074,7 +44074,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         36,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 254,
@@ -44809,7 +44809,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -44818,7 +44818,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 255,
@@ -44833,7 +44833,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -44842,7 +44842,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 256,
@@ -44857,7 +44857,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -44866,7 +44866,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 257,
@@ -44881,7 +44881,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -44890,7 +44890,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 258,
@@ -44905,7 +44905,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -44914,7 +44914,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 259,
@@ -44929,7 +44929,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -44938,7 +44938,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 260,
@@ -44953,7 +44953,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -44962,7 +44962,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 261,
@@ -44977,7 +44977,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -44986,7 +44986,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 262,
@@ -45001,7 +45001,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -45010,7 +45010,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 263,
@@ -45025,7 +45025,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -45034,7 +45034,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 264,
@@ -45049,7 +45049,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -45058,7 +45058,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 265,
@@ -45073,7 +45073,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -45082,7 +45082,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 266,
@@ -45097,7 +45097,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -45106,7 +45106,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 267,
@@ -45121,7 +45121,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -45130,7 +45130,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 268,
@@ -45145,7 +45145,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -45154,7 +45154,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 269,
@@ -45169,7 +45169,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -45178,7 +45178,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 270,
@@ -45193,7 +45193,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -45202,7 +45202,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 271,
@@ -45217,7 +45217,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -45226,7 +45226,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 272,
@@ -45241,7 +45241,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -45250,7 +45250,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 273,
@@ -45265,7 +45265,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -45274,7 +45274,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 274,
@@ -45289,7 +45289,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -45298,7 +45298,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 275,
@@ -45313,7 +45313,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -45322,7 +45322,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 276,
@@ -45337,7 +45337,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -45346,7 +45346,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 277,
@@ -45361,7 +45361,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -45370,7 +45370,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 278,
@@ -45385,7 +45385,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -45394,7 +45394,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 279,
@@ -45409,7 +45409,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -45418,7 +45418,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 280,
@@ -45433,7 +45433,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -45442,7 +45442,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 281,
@@ -47650,7 +47650,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -47659,7 +47659,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 6326,
@@ -47674,7 +47674,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -47683,7 +47683,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 6327,
@@ -47698,7 +47698,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -47707,7 +47707,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 6328,
@@ -47722,7 +47722,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -47731,7 +47731,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 6329,
@@ -47746,7 +47746,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -47755,7 +47755,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 6330,
@@ -47770,7 +47770,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -47779,7 +47779,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 6331,
@@ -47794,7 +47794,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -47803,7 +47803,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 6332,
@@ -47818,7 +47818,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -47827,7 +47827,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 6333,
@@ -47842,7 +47842,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -47851,7 +47851,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 6334,
@@ -47866,7 +47866,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -47875,7 +47875,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 6335,
@@ -47890,7 +47890,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -47899,7 +47899,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 6336,
@@ -49306,7 +49306,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -49315,7 +49315,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 282,
@@ -49330,7 +49330,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -49339,7 +49339,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 283,
@@ -49354,7 +49354,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -49363,7 +49363,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 284,
@@ -49378,7 +49378,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -49387,7 +49387,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 285,
@@ -49402,7 +49402,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -49411,7 +49411,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 286,
@@ -49426,7 +49426,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -49435,7 +49435,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 287,
@@ -49450,7 +49450,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -49459,7 +49459,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 288,
@@ -49474,7 +49474,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -49483,7 +49483,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 289,
@@ -49498,7 +49498,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -49507,7 +49507,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 290,
@@ -49627,7 +49627,7 @@
                         decomposition_type::none,
                         break_class::infix_separator,
                         0,
- sentence_break::any,
+ sentence_break::scontinue,
                         grapheme_cluster_break::any,
                 },
                 568,
@@ -52935,7 +52935,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -52944,7 +52944,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 292,
@@ -52959,7 +52959,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -52968,7 +52968,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 293,
@@ -52983,7 +52983,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -52992,8 +52992,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 294,
                 0x0,
@@ -54351,7 +54351,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -54360,7 +54360,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         7,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 291,
@@ -54399,7 +54399,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -54408,8 +54408,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 6906,
                 0x0,
@@ -54423,7 +54423,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -54432,8 +54432,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 6907,
                 0x0,
@@ -54447,7 +54447,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -54456,8 +54456,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 6908,
                 0x0,
@@ -54471,7 +54471,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -54480,7 +54480,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 6909,
@@ -54495,7 +54495,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -54504,7 +54504,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 6910,
@@ -54519,7 +54519,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -54528,7 +54528,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 6911,
@@ -54543,7 +54543,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -54552,7 +54552,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 6912,
@@ -54567,7 +54567,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -54576,7 +54576,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 6915,
@@ -54591,7 +54591,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -54600,7 +54600,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 6916,
@@ -54615,7 +54615,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -54624,7 +54624,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 6917,
@@ -54639,7 +54639,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -54648,7 +54648,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 6918,
@@ -54663,7 +54663,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -54672,8 +54672,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 6919,
                 0x0,
@@ -54687,7 +54687,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -54696,8 +54696,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 6920,
                 0x0,
@@ -54711,7 +54711,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -54720,8 +54720,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 6921,
                 0x0,
@@ -54735,7 +54735,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -54744,8 +54744,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 6922,
                 0x0,
@@ -54759,7 +54759,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -54768,7 +54768,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         9,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 6923,
@@ -54855,7 +54855,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -54864,7 +54864,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 295,
@@ -54879,7 +54879,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -54888,7 +54888,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         220,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 296,
@@ -54903,7 +54903,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -54912,7 +54912,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 297,
@@ -54927,7 +54927,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -54936,7 +54936,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         230,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 298,
@@ -55263,7 +55263,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -55272,7 +55272,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 6913,
@@ -55287,7 +55287,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -55296,7 +55296,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 6914,
@@ -56021,7 +56021,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -56030,7 +56030,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 300,
@@ -56045,7 +56045,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -56054,8 +56054,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 301,
                 0x0,
@@ -56069,7 +56069,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -56078,8 +56078,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 302,
                 0x0,
@@ -57437,7 +57437,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -57446,7 +57446,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         7,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 299,
@@ -57485,7 +57485,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -57494,7 +57494,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 6973,
@@ -57509,7 +57509,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -57518,8 +57518,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 6974,
                 0x0,
@@ -57533,7 +57533,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -57542,8 +57542,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 6975,
                 0x0,
@@ -57557,7 +57557,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -57566,7 +57566,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 6976,
@@ -57581,7 +57581,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -57590,7 +57590,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 6977,
@@ -57605,7 +57605,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -57614,7 +57614,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 6978,
@@ -57629,7 +57629,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -57638,7 +57638,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 6979,
@@ -57701,7 +57701,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::is_index,
@@ -57710,8 +57710,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 583,
                 0x0,
@@ -57725,7 +57725,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -57734,8 +57734,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 6983,
                 0x0,
@@ -57797,7 +57797,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::is_index,
@@ -57806,8 +57806,8 @@
                         decomposition_type::canonical,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 586,
                 0x0,
@@ -57821,7 +57821,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::is_index,
@@ -57830,8 +57830,8 @@
                         decomposition_type::canonical,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 587,
                 0x0,
@@ -57845,7 +57845,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -57854,7 +57854,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         9,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 6986,
@@ -58085,7 +58085,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -58094,7 +58094,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 6987,
@@ -58349,7 +58349,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -58358,7 +58358,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 6980,
@@ -58373,7 +58373,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -58382,7 +58382,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 6981,
@@ -59108,7 +59108,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -59117,7 +59117,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 304,
@@ -59132,7 +59132,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -59141,7 +59141,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 305,
@@ -59156,7 +59156,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -59165,8 +59165,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 306,
                 0x0,
@@ -60524,7 +60524,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -60533,7 +60533,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         7,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 303,
@@ -60572,7 +60572,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -60581,8 +60581,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 7035,
                 0x0,
@@ -60596,7 +60596,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -60605,8 +60605,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 7036,
                 0x0,
@@ -60620,7 +60620,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -60629,8 +60629,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 7037,
                 0x0,
@@ -60644,7 +60644,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -60653,7 +60653,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7038,
@@ -60668,7 +60668,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -60677,7 +60677,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7039,
@@ -60788,7 +60788,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -60797,7 +60797,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7040,
@@ -60812,7 +60812,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -60821,7 +60821,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7041,
@@ -60884,7 +60884,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -60893,7 +60893,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7042,
@@ -60908,7 +60908,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -60917,7 +60917,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7043,
@@ -60932,7 +60932,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -60941,7 +60941,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         9,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7044,
@@ -61028,7 +61028,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -61037,7 +61037,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7003,
@@ -61772,7 +61772,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -61781,7 +61781,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 307,
@@ -61796,7 +61796,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -61805,7 +61805,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 308,
@@ -61892,7 +61892,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -61901,7 +61901,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7030,
@@ -62189,7 +62189,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -62198,7 +62198,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 310,
@@ -62213,7 +62213,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -62222,7 +62222,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 311,
@@ -62237,7 +62237,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -62246,8 +62246,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 312,
                 0x0,
@@ -63605,7 +63605,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -63614,7 +63614,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         7,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 309,
@@ -63653,7 +63653,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -63662,8 +63662,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 7097,
                 0x0,
@@ -63677,7 +63677,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -63686,8 +63686,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 7098,
                 0x0,
@@ -63701,7 +63701,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -63710,8 +63710,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 7099,
                 0x0,
@@ -63725,7 +63725,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -63734,7 +63734,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7100,
@@ -63749,7 +63749,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -63758,7 +63758,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7101,
@@ -63773,7 +63773,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -63782,7 +63782,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7102,
@@ -63797,7 +63797,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -63806,7 +63806,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7103,
@@ -63821,7 +63821,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -63830,7 +63830,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7106,
@@ -63869,7 +63869,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -63878,7 +63878,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7107,
@@ -63893,7 +63893,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -63902,7 +63902,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7108,
@@ -63917,7 +63917,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -63926,8 +63926,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 7109,
                 0x0,
@@ -63965,7 +63965,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -63974,8 +63974,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 7110,
                 0x0,
@@ -63989,7 +63989,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -63998,8 +63998,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 7111,
                 0x0,
@@ -64013,7 +64013,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -64022,7 +64022,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         9,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7112,
@@ -64517,7 +64517,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -64526,7 +64526,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7104,
@@ -64541,7 +64541,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -64550,7 +64550,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7105,
@@ -65275,7 +65275,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -65284,7 +65284,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 314,
@@ -65299,7 +65299,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -65308,8 +65308,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 315,
                 0x0,
@@ -65323,7 +65323,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -65332,8 +65332,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 316,
                 0x0,
@@ -66691,7 +66691,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -66700,7 +66700,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         7,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 313,
@@ -66739,7 +66739,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -66748,7 +66748,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7164,
@@ -66763,7 +66763,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -66772,7 +66772,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7165,
@@ -66787,7 +66787,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -66796,8 +66796,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 7166,
                 0x0,
@@ -66811,7 +66811,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -66820,7 +66820,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7167,
@@ -66835,7 +66835,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -66844,7 +66844,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7168,
@@ -66859,7 +66859,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -66868,7 +66868,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7169,
@@ -66883,7 +66883,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -66892,7 +66892,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7170,
@@ -66955,7 +66955,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::is_index,
@@ -66964,8 +66964,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 631,
                 0x0,
@@ -66979,7 +66979,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::is_index,
@@ -66988,8 +66988,8 @@
                         decomposition_type::canonical,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 635,
                 0x0,
@@ -67051,7 +67051,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::is_index,
@@ -67060,8 +67060,8 @@
                         decomposition_type::canonical,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 636,
                 0x0,
@@ -67075,7 +67075,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::is_index,
@@ -67084,8 +67084,8 @@
                         decomposition_type::canonical,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 637,
                 0x0,
@@ -67099,7 +67099,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -67108,7 +67108,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         9,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7177,
@@ -67315,7 +67315,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -67324,7 +67324,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7178,
@@ -67339,7 +67339,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -67348,7 +67348,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7179,
@@ -67603,7 +67603,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -67612,7 +67612,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7171,
@@ -67627,7 +67627,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -67636,7 +67636,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7172,
@@ -68384,7 +68384,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -68393,7 +68393,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 317,
@@ -69824,7 +69824,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -69833,7 +69833,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7217,
@@ -69848,7 +69848,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -69857,8 +69857,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 7218,
                 0x0,
@@ -69872,7 +69872,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -69881,7 +69881,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7219,
@@ -69896,7 +69896,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -69905,8 +69905,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 7220,
                 0x0,
@@ -69920,7 +69920,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -69929,8 +69929,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 7221,
                 0x0,
@@ -70016,7 +70016,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::is_index,
@@ -70025,8 +70025,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 653,
                 0x0,
@@ -70040,7 +70040,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::is_index,
@@ -70049,8 +70049,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 656,
                 0x0,
@@ -70064,7 +70064,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -70073,8 +70073,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 7224,
                 0x0,
@@ -70112,7 +70112,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::is_index,
@@ -70121,8 +70121,8 @@
                         decomposition_type::canonical,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 658,
                 0x0,
@@ -70136,7 +70136,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::is_index,
@@ -70145,8 +70145,8 @@
                         decomposition_type::canonical,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 659,
                 0x0,
@@ -70160,7 +70160,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::is_index,
@@ -70169,8 +70169,8 @@
                         decomposition_type::canonical,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 660,
                 0x0,
@@ -70184,7 +70184,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -70193,7 +70193,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         9,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7228,
@@ -70424,7 +70424,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -70433,7 +70433,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7229,
@@ -71442,7 +71442,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -71451,8 +71451,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 318,
                 0x0,
@@ -71466,7 +71466,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -71475,8 +71475,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 319,
                 0x0,
@@ -71490,7 +71490,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::zero_data1_data2_cp,
@@ -71499,8 +71499,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 320,
                 0x0,
@@ -72906,7 +72906,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -72915,7 +72915,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7284,
@@ -72930,7 +72930,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -72939,7 +72939,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7285,
@@ -72954,7 +72954,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -72963,7 +72963,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7286,
@@ -72978,7 +72978,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -72987,8 +72987,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 7287,
                 0x0,
@@ -73002,7 +73002,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -73011,8 +73011,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 7288,
                 0x0,
@@ -73026,7 +73026,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -73035,8 +73035,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 7289,
                 0x0,
@@ -73050,7 +73050,7 @@
                 {
                         category::mark_spacing_combining,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -73059,8 +73059,8 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
- grapheme_cluster_break::any,
+ sentence_break::extend,
+ grapheme_cluster_break::spacing_mark,
                 },
                 7290,
                 0x0,
@@ -73098,7 +73098,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::is_index,
@@ -73107,7 +73107,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 671,
@@ -73122,7 +73122,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -73131,7 +73131,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7294,
@@ -73146,7 +73146,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::is_index,
@@ -73155,7 +73155,7 @@
                         decomposition_type::canonical,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 673,
@@ -73194,7 +73194,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -73203,7 +73203,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7296,
@@ -73218,7 +73218,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -73227,7 +73227,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7297,
@@ -73242,7 +73242,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -73251,7 +73251,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7298,
@@ -73266,7 +73266,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -73275,7 +73275,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         9,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7299,
@@ -73458,7 +73458,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -73467,7 +73467,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         84,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7300,
@@ -73482,7 +73482,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -73491,7 +73491,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         91,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7301,
@@ -73770,7 +73770,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -73779,7 +73779,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7291,
@@ -73794,7 +73794,7 @@
                 {
                         category::mark_nonspacing,
                         join_type::none,
- word_break::any,
+ word_break::extend,
                         false,
                         false,
                         ucd::sort_type::data1_0x0020_data2_cp,
@@ -73803,7 +73803,7 @@
                         decomposition_type::none,
                         break_class::combining_mark,
                         0,
- sentence_break::any,
+ sentence_break::extend,
                         grapheme_cluster_break::extend,
                 },
                 7292,